diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..f2fa4ef02d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve Element
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. Samsung S6]
+ - OS: [e.g. Android 6.0]
+
+**Additional context**
+ - App version and store [e.g. 1.0.0 - F-Droid]
+ - Homeserver: [e.g. matrix.org]
+
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..73c93186d7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: type:suggestion
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 547837228b..77dffb43d2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,9 +2,9 @@
 
 <!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/riotX-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
 
-- [ ] Changes has been tested on an Android device or Android emulator with API 16
+- [ ] Changes has been tested on an Android device or Android emulator with API 21
 - [ ] UI change has been tested on both light and dark themes
 - [ ] Pull request is based on the develop branch
-- [ ] Pull request updates [CHANGES.md](https://github.com/vector-im/riotX-android/blob/develop/CHANGES.md)
+- [ ] Pull request updates [CHANGES.md](https://github.com/vector-im/element-android/blob/develop/CHANGES.md)
 - [ ] Pull request includes screenshots or videos if containing UI changes
 - [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md#sign-off)
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
new file mode 100644
index 0000000000..405a2b3065
--- /dev/null
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b3719669fd..89a7c466fd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,7 +4,16 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
diff --git a/.idea/dictionaries/bmarty.xml b/.idea/dictionaries/bmarty.xml
index 9d601bff14..5c27da044e 100644
--- a/.idea/dictionaries/bmarty.xml
+++ b/.idea/dictionaries/bmarty.xml
@@ -14,6 +14,7 @@
       <w>gplay</w>
       <w>hmac</w>
       <w>homeserver</w>
+      <w>jitsi</w>
       <w>ktlint</w>
       <w>linkified</w>
       <w>linkify</w>
diff --git a/CHANGES.md b/CHANGES.md
index f4f631decd..fb404b971e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,52 @@
+Changes in Element 1.0.5 (2020-08-21)
+===================================================
+
+Features ✨:
+ - Protect access to the app by a pin code (#1700)
+ - Conference with Jitsi support (#43)
+
+Improvements 🙌:
+ - Share button in rooms gives room ID link without via parameters (#1927)
+ - Give user the possibility to prevent accidental call (#1869)
+ - Display device information (name, id and key) in Cryptography setting screen (#1784)
+ - Ensure users do not accidentally ignore other users (#1890)
+ - Better handling DM creation when invitees cannot be inviting due to denied federation
+ - Support new config.json format and config.domain.json files (#1682)
+ - Increase Font size on Calling screen (#1643)
+ - Make the user's Avatar live in the general settings
+
+Bugfix 🐛:
+ - Fix incorrect date format for some Asian languages (#1928)
+ - Fix invisible toolbar (Status.im theme) (#1746)
+ - Fix relative date time formatting (#822)
+ - Fix crash reported by RageShake
+ - Fix refreshing of sessions list when another session is logged out
+ - Fix IllegalArgumentException: Receiver not registered: NetworkInfoReceiver (#1960)
+ - Failed to build unique file (#1954)
+ - Highlighted Event when opening a permalink from another room (#1033)
+ - A Kick appears has "someone has made no change" (#1959)
+ - Avoid NetworkOnMainThreadException when setting a user avatar
+ - Renew turnserver credentials when ttl runs out
+
+Translations 🗣:
+ - Add PlayStore description resources in the Triple-T format, to let Weblate handle them
+
+SDK API changes ⚠️:
+ - Rename package `im.vector.matrix.android` to `org.matrix.android.sdk`
+ - Rename package `im.vector.matrix.rx` to `org.matrix.android.sdk.rx`
+
+Build 🧱:
+ - Fix RtlHardcoded issues (use `Start` and `End` instead of `Left` and `Right` layout attributes)
+
+Other changes:
+ - Use `Context#getSystemService` extension function provided by `core-ktx` (#1702)
+ - Hide Flair settings, this is not implemented yet.
+ - Rename package `im.vector.riotx.attachmentviewer` to `im.vector.lib.attachmentviewer`
+ - Rename package `im.vector.riotx.multipicker` to `im.vector.lib.multipicker`
+ - Rename package `im.vector.riotx` to `im.vector.app`
+ - Remove old code that was used on devices with api level <21
+ - Add Official Gradle Wrapper Validation Action
+
 Changes in Element 1.0.4 (2020-08-03)
 ===================================================
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e57b5d92fb..f10c87cdbe 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ For now, the Matrix SDK and the Element application are in the same project. So
 ## I want to help translating Element
 
 If you want to fix an issue with an English string, please submit a PR.
-If you want to fix an issue in other languages, or add a missing translation, or even add a new language, please use [Weblate](https://translate.riot.im/projects/riot-android/).
+If you want to fix an issue in other languages, or add a missing translation, or even add a new language, please use [Weblate](https://translate.riot.im/projects/element-android/).
 
 ## I want to submit a PR to fix an issue
 
diff --git a/README.md b/README.md
index 3d5c88ada3..1ec425793f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
-[![Weblate](https://translate.riot.im/widgets/riot-android/-/svg-badge.svg)](https://translate.riot.im/engage/riot-android/?utm_source=widget)
+[![Weblate](https://translate.riot.im/widgets/element-android/-/svg-badge.svg)](https://translate.riot.im/engage/element-android/?utm_source=widget)
 [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
 [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=alert_status)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
diff --git a/attachment-viewer/src/main/AndroidManifest.xml b/attachment-viewer/src/main/AndroidManifest.xml
index ff8ec394d2..8970b47178 100644
--- a/attachment-viewer/src/main/AndroidManifest.xml
+++ b/attachment-viewer/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.riotx.attachmentviewer" />
+<manifest package="im.vector.lib.attachmentviewer" />
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AnimatedImageViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
similarity index 96%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AnimatedImageViewHolder.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
index f00a4eff30..6b7818c612 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AnimatedImageViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.view.View
 import android.widget.ImageView
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentEvents.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt
similarity index 96%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentEvents.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt
index b2b6c9fe16..eb2249e033 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentEvents.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 sealed class AttachmentEvents {
     data class VideoEvent(val isPlaying: Boolean, val progress: Int, val duration: Int) : AttachmentEvents()
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentSourceProvider.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt
similarity index 97%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentSourceProvider.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt
index 92a4f1d9e4..b5de38fed3 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentSourceProvider.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.content.Context
 import android.view.View
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentViewerActivity.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
similarity index 99%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentViewerActivity.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
index 8c2d4e9833..71ce436cf2 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentViewerActivity.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.graphics.Color
 import android.os.Bundle
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentsAdapter.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt
similarity index 99%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentsAdapter.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt
index 27bdfdc91d..99c7777220 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentsAdapter.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/BaseViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt
similarity index 97%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/BaseViewHolder.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt
index 49b47c11ff..86f1945e53 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/BaseViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ImageLoaderTarget.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
similarity index 98%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ImageLoaderTarget.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
index bb59c9e01e..1e5e88d91f 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ImageLoaderTarget.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirection.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt
similarity index 96%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirection.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt
index ebe8784e15..7948f37ae8 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirection.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 sealed class SwipeDirection {
     object NotDetected : SwipeDirection()
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirectionDetector.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt
similarity index 98%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirectionDetector.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt
index 0cf9a19ab1..6575248b2d 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirectionDetector.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.content.Context
 import android.view.MotionEvent
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeToDismissHandler.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
similarity index 99%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeToDismissHandler.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
index ca93d4f73a..ca2c28b498 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeToDismissHandler.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoLoaderTarget.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
similarity index 98%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoLoaderTarget.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
index 548c6431e5..78f46a320f 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoLoaderTarget.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
similarity index 99%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoViewHolder.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
index e1a5a9864f..32f449d6fe 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.view.View
 import android.widget.ImageView
diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ZoomableImageViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
similarity index 97%
rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ZoomableImageViewHolder.kt
rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
index 3eb06e4c27..019cd3202d 100644
--- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ZoomableImageViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.view.View
 import android.widget.ProgressBar
diff --git a/build.gradle b/build.gradle
index 47b3ab240d..fdaef6a2f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,6 +41,8 @@ allprojects {
                 includeGroupByRegex 'com\\.github\\.BillCarsonFr'
                 // PhotoView
                 includeGroupByRegex 'com\\.github\\.chrisbanes'
+                // PFLockScreen-Android
+                includeGroupByRegex 'com\\.github\\.vector-im'
             }
         }
         maven {
@@ -50,6 +52,12 @@ allprojects {
             }
         }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        // Jitsi repo
+        maven {
+            url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-2.9.3"
+            // Note: to test Jitsi release you can use a local file like this:
+            // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-2.9.3"
+        }
         google()
         jcenter()
     }
diff --git a/docs/jitsi.md b/docs/jitsi.md
new file mode 100644
index 0000000000..071470b040
--- /dev/null
+++ b/docs/jitsi.md
@@ -0,0 +1,82 @@
+# Jitsi in Element Android
+
+Native Jitsi support has been added to Element Android by the PR [#1914](https://github.com/vector-im/element-android/pull/1914). The description of the PR contains some documentation about the behaviour in each possible room configuration.
+
+Also, ensure to have a look on [the documentation from Element Web](https://github.com/vector-im/element-web/blob/develop/docs/jitsi.md)
+
+The official documentation about how to integrate the Jitsi SDK in an Android app is available here: https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk.
+
+# Native Jitsi SDK
+
+The Jitsi SDK is built by ourselves with the flag LIBRE_BUILD, to be able to be integrated on the F-Droid version of Element Android.
+
+The generated maven repository is then host in the project https://github.com/vector-im/jitsi_libre_maven
+
+## How to build the Jitsi Meet SDK
+
+### Jitsi version
+
+Update the script `./tools/jitsi/build_jisti_libs.sh` with the tag of the project `https://github.com/jitsi/jitsi-meet`.
+
+Currently we are building the version with the tag `android-sdk-2.9.3`.
+
+### Run the build script
+
+At the root of the Element Android, run the following script:
+
+```shell script
+./tools/jitsi/build_jisti_libs.sh
+```
+
+It will build the Jitsi Meet Android library and put every generated files in the folder `/tmp/jitsi`
+
+### Link with the new generated library
+
+- Update the file `./build.gradle` to use the previously created local Maven repository. Currently we have this line:
+
+```groovy
+url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-2.9.3"
+```
+
+You can uncomment and update the line starting with `// url "file://...` and comment the line starting with `url`, to test the library using the locally generated Maven repository.
+
+- Update the dependency of the WebRTC library in the file `./matrix-sdk-android/build.gradle`. Currently we have this line:
+
+```groovy
+implementation('com.facebook.react:react-native-webrtc:1.84.0-jitsi-5112273@aar')
+```
+
+- Update the dependency of the Jitsi Meet library in the file `./vector/build.gradle`. Currently we have this line:
+
+```groovy
+implementation('org.jitsi.react:jitsi-meet-sdk:2.9.3') { transitive = true }
+```
+
+- Perform a gradle sync and build the project
+- Perform test
+
+### Sanity tests
+
+In order to validate that the upgrade of the Jitsi and WebRTC dependency does not break anything, the following sanity tests have to be performed, using two devices:
+- Make 1-1 audio call (so using WebRTC)
+- Make 1-1 video call (so using WebRTC)
+- Create and join a conference call with audio only (so using Jitsi library). Leave the conference. Join it again.
+- Create and join a conference call with audio and video (so using Jitsi library) Leave the conference. Join it again.
+
+### Export the build library
+
+If all the tests are passed, you can export the generated Jitsi library to our Maven repository.
+
+- Clone the project https://github.com/vector-im/jitsi_libre_maven.
+- Create a new folder with the version name.
+- Copy every generated files form `/tmp/jitsi` to the folder you have just created.
+- Commit and push the change on https://github.com/vector-im/jitsi_libre_maven.
+- Update the file `./build.gradle` to use the previously created Maven repository. Currently we have this line:
+
+```groovy
+url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-2.9.3"
+```
+
+- Build the project and perform the sanity tests again.
+
+- Update the file `/CANGES.md` to notify about the library upgrade, and create a regular PR for project Element Android.
\ No newline at end of file
diff --git a/matrix-sdk-android-rx/src/main/AndroidManifest.xml b/matrix-sdk-android-rx/src/main/AndroidManifest.xml
index b04927ec5a..f1bb42638f 100644
--- a/matrix-sdk-android-rx/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android-rx/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.matrix.rx" />
+    package="org.matrix.android.sdk.rx" />
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/LiveDataObservable.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/LiveDataObservable.kt
similarity index 94%
rename from matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/LiveDataObservable.kt
rename to matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/LiveDataObservable.kt
index 60ec3c8c7d..ec0d0cd288 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/LiveDataObservable.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/LiveDataObservable.kt
@@ -1,11 +1,12 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.rx
+package org.matrix.android.sdk.rx
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/OptionalRx.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/OptionalRx.kt
similarity index 82%
rename from matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/OptionalRx.kt
rename to matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/OptionalRx.kt
index a8503ba428..551e277353 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/OptionalRx.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/OptionalRx.kt
@@ -1,11 +1,12 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.rx
+package org.matrix.android.sdk.rx
 
-import im.vector.matrix.android.api.util.Optional
+import org.matrix.android.sdk.api.util.Optional
 import io.reactivex.Observable
 
 fun <T : Any> Observable<Optional<T>>.unwrap(): Observable<T> {
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxCallbackBuilders.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
similarity index 86%
rename from matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxCallbackBuilders.kt
rename to matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
index 92886777af..793d4694ce 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxCallbackBuilders.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
@@ -1,11 +1,12 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.rx
+package org.matrix.android.sdk.rx
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 import io.reactivex.Completable
 import io.reactivex.Single
 
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
similarity index 79%
rename from matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt
rename to matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
index e945a52650..0717a10d03 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,24 +15,24 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.rx
+package org.matrix.android.sdk.rx
 
 import android.net.Uri
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.members.RoomMemberQueryParams
-import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary
-import im.vector.matrix.android.api.session.room.model.ReadReceipt
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
-import im.vector.matrix.android.api.session.room.send.UserDraft
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toOptional
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.members.RoomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
+import org.matrix.android.sdk.api.session.room.model.ReadReceipt
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+import org.matrix.android.sdk.api.session.room.send.UserDraft
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
 import io.reactivex.Completable
 import io.reactivex.Observable
 import io.reactivex.Single
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
similarity index 80%
rename from matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt
rename to matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index f09015e80d..45efd125ee 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,35 +15,35 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.rx
+package org.matrix.android.sdk.rx
 
 import androidx.paging.PagedList
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
-import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.group.GroupSummaryQueryParams
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.pushers.Pusher
-import im.vector.matrix.android.api.session.room.RoomSummaryQueryParams
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
-import im.vector.matrix.android.api.session.sync.SyncState
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.android.internal.crypto.store.PrivateKeysInfo
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.group.GroupSummaryQueryParams
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.pushers.Pusher
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.session.sync.SyncState
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.functions.Function3
@@ -70,7 +71,7 @@ class RxSession(private val session: Session) {
                 }
     }
 
-    fun liveMyDeviceInfo(): Observable<List<DeviceInfo>> {
+    fun liveMyDevicesInfo(): Observable<List<DeviceInfo>> {
         return session.cryptoService().getLiveMyDevicesInfo().asObservable()
                 .startWithCallable {
                     session.cryptoService().getMyDevicesInfo()
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/SecretsSynchronisationInfo.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/SecretsSynchronisationInfo.kt
similarity index 91%
rename from matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/SecretsSynchronisationInfo.kt
rename to matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/SecretsSynchronisationInfo.kt
index 616783706b..e80bca1d7d 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/SecretsSynchronisationInfo.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/SecretsSynchronisationInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.rx
+package org.matrix.android.sdk.rx
 
 data class SecretsSynchronisationInfo(
         val isBackupSetup: Boolean,
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index a96e0690dc..d98533e4bc 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -132,8 +132,13 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version"
-    implementation 'com.squareup.okhttp3:okhttp:4.2.2'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
+
+
+    implementation(platform("com.squareup.okhttp3:okhttp-bom:4.8.1"))
+    implementation 'com.squareup.okhttp3:okhttp'
+    implementation 'com.squareup.okhttp3:logging-interceptor'
+    implementation 'com.squareup.okhttp3:okhttp-urlconnection'
+
     implementation "com.squareup.moshi:moshi-adapters:$moshi_version"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
 
@@ -174,8 +179,10 @@ dependencies {
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.10.23'
 
     // Web RTC
-    // TODO meant for development purposes only. See http://webrtc.github.io/webrtc-org/native-code/android/
-    implementation 'org.webrtc:google-webrtc:1.0.+'
+    // org.webrtc:google-webrtc is for development purposes only. See http://webrtc.github.io/webrtc-org/native-code/android/
+    // implementation 'org.webrtc:google-webrtc:1.0.+'
+    // Use the same WebRTC library than the one used by Jitsi library
+    implementation('com.facebook.react:react-native-webrtc:1.84.0-jitsi-5112273@aar')
 
     debugImplementation 'com.airbnb.okreplay:okreplay:1.5.0'
     releaseImplementation 'com.airbnb.okreplay:noop:1.5.0'
diff --git a/matrix-sdk-android/lint.xml b/matrix-sdk-android/lint.xml
index 3e4078d7d9..134aba822b 100644
--- a/matrix-sdk-android/lint.xml
+++ b/matrix-sdk-android/lint.xml
@@ -29,5 +29,6 @@
     <issue id="SetTextI18n" severity="error" />
     <issue id="ViewConstructor" severity="error" />
     <issue id="UseValueOf" severity="error" />
+    <issue id="ObsoleteSdkInt" severity="error" />
 
 </lint>
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/InstrumentedTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
similarity index 83%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/InstrumentedTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
index 374a1fc399..cb6e624bce 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/InstrumentedTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android
+package org.matrix.android.sdk
 
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
-import im.vector.matrix.android.test.shared.createTimberTestRule
+import org.matrix.android.sdk.test.shared.createTimberTestRule
 import org.junit.Rule
 import java.io.File
 
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/LiveDataTestObserver.java b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java
similarity index 98%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/LiveDataTestObserver.java
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java
index 10d251350e..a09a655008 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/LiveDataTestObserver.java
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android;
+package org.matrix.android.sdk;
 
 import androidx.annotation.Nullable;
 import androidx.lifecycle.LiveData;
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/MainThreadExecutor.java b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/MainThreadExecutor.java
similarity index 87%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/MainThreadExecutor.java
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/MainThreadExecutor.java
index 7eb119ce7d..d26782d538 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/MainThreadExecutor.java
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/MainThreadExecutor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android;
+package org.matrix.android.sdk;
 
 import android.os.Handler;
 import android.os.Looper;
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/OkReplayRuleChainNoActivity.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/OkReplayRuleChainNoActivity.kt
similarity index 96%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/OkReplayRuleChainNoActivity.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/OkReplayRuleChainNoActivity.kt
index 098e927a9f..372ef95be8 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/OkReplayRuleChainNoActivity.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/OkReplayRuleChainNoActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android
+package org.matrix.android.sdk
 
 import okreplay.OkReplayConfig
 import okreplay.PermissionRule
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
similarity index 89%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
index d8f24ee416..4316b09b89 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android
+package org.matrix.android.sdk
 
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.asCoroutineDispatcher
 import java.util.concurrent.Executors
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/AccountCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt
similarity index 85%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/AccountCreationTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt
index 679ea8f3fe..cbb5af5911 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/AccountCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.account
+package org.matrix.android.sdk.account
 
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.SessionTestParams
-import im.vector.matrix.android.common.TestConstants
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.TestConstants
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/ChangePasswordTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
similarity index 85%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/ChangePasswordTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
index 2574700d49..e2140328e6 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/ChangePasswordTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.account
+package org.matrix.android.sdk.account
 
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.failure.isInvalidPassword
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.SessionTestParams
-import im.vector.matrix.android.common.TestConstants
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.failure.isInvalidPassword
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.TestConstants
 import org.amshove.kluent.shouldBeTrue
 import org.junit.FixMethodOrder
 import org.junit.Test
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/DeactivateAccountTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
similarity index 84%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/DeactivateAccountTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
index 17ff984bc8..36d09fb497 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/account/DeactivateAccountTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.account
+package org.matrix.android.sdk.account
 
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.auth.data.LoginFlowResult
-import im.vector.matrix.android.api.auth.registration.RegistrationResult
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.SessionTestParams
-import im.vector.matrix.android.common.TestConstants
-import im.vector.matrix.android.common.TestMatrixCallback
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.auth.data.LoginFlowResult
+import org.matrix.android.sdk.api.auth.registration.RegistrationResult
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.common.TestMatrixCallback
 import org.junit.Assert.assertTrue
 import org.junit.FixMethodOrder
 import org.junit.Test
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/api/Matrix.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
similarity index 81%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/api/Matrix.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
index d61bb15adb..df359f2adc 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/api/Matrix.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
@@ -14,21 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api
+package org.matrix.android.sdk.api
 
 import android.content.Context
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.Configuration
 import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.common.DaggerTestMatrixComponent
-import im.vector.matrix.android.internal.SessionManager
-import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
-import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments
-import im.vector.matrix.android.internal.network.UserAgentHolder
-import im.vector.matrix.android.internal.util.BackgroundDetectionObserver
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.common.DaggerTestMatrixComponent
+import org.matrix.android.sdk.api.legacy.LegacySessionImporter
+import org.matrix.android.sdk.internal.SessionManager
+import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
+import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
+import org.matrix.android.sdk.internal.network.UserAgentHolder
+import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
 import org.matrix.olm.OlmManager
 import java.io.InputStream
 import java.util.concurrent.Executors
@@ -39,8 +40,9 @@ import javax.inject.Inject
  * This is the main entry point to the matrix sdk.
  * To get the singleton instance, use getInstance static method.
  */
-class Matrix private constructor(context: Context, matrixConfiguration: MatrixConfiguration)  {
+class Matrix private constructor(context: Context, matrixConfiguration: MatrixConfiguration) {
 
+    @Inject internal lateinit var legacySessionImporter: LegacySessionImporter
     @Inject internal lateinit var authenticationService: AuthenticationService
     @Inject internal lateinit var userAgentHolder: UserAgentHolder
     @Inject internal lateinit var backgroundDetectionObserver: BackgroundDetectionObserver
@@ -62,6 +64,10 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         return authenticationService
     }
 
+    fun legacySessionImporter(): LegacySessionImporter {
+        return legacySessionImporter
+    }
+
     companion object {
 
         private lateinit var instance: Matrix
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
similarity index 92%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CommonTestHelper.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index bee2815c0a..fdbfa57b5c 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -15,27 +15,27 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
 import android.content.Context
 import android.net.Uri
 import androidx.lifecycle.Observer
-import im.vector.matrix.android.api.Matrix
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.MatrixConfiguration
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.auth.data.LoginFlowResult
-import im.vector.matrix.android.api.auth.registration.RegistrationResult
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.TimelineSettings
-import im.vector.matrix.android.api.session.sync.SyncState
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.LoginFlowResult
+import org.matrix.android.sdk.api.auth.registration.RegistrationResult
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.api.session.sync.SyncState
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestData.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
similarity index 91%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestData.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
index 7eea832160..283ddd6fde 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestData.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
-import im.vector.matrix.android.api.session.Session
+import org.matrix.android.sdk.api.session.Session
 
 data class CryptoTestData(val firstSession: Session,
                           val roomId: String,
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
similarity index 90%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index 08c24227be..9765d35bc5 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -14,32 +14,32 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
 import android.os.SystemClock
 import android.util.Log
 import androidx.lifecycle.Observer
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.verification.IncomingSasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.OutgoingSasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
-import im.vector.matrix.android.api.session.room.roomSummaryQueryParams
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.TimelineSettings
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupAuthData
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.OutgoingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupAuthData
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/MockOkHttpInterceptor.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
similarity index 96%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/MockOkHttpInterceptor.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
index 6747e52e73..a9bd9403d2 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/MockOkHttpInterceptor.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
-import im.vector.matrix.android.internal.session.TestInterceptor
+import org.matrix.android.sdk.internal.session.TestInterceptor
 import okhttp3.Interceptor
 import okhttp3.Protocol
 import okhttp3.Request
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/SessionTestParams.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/SessionTestParams.kt
similarity index 94%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/SessionTestParams.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/SessionTestParams.kt
index 7d1d23e951..287cafcdfd 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/SessionTestParams.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/SessionTestParams.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
 data class SessionTestParams @JvmOverloads constructor(val withInitialSync: Boolean = false)
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestAssertUtil.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestAssertUtil.kt
similarity index 98%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestAssertUtil.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestAssertUtil.kt
index 287a80db72..d972ad621c 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestAssertUtil.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestAssertUtil.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestConstants.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
similarity index 97%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestConstants.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
index deaa721e40..cbfc9bbbf6 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestConstants.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
 import android.os.Debug
 
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestMatrixCallback.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt
similarity index 94%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestMatrixCallback.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt
index c04777440b..800c6ae7e0 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestMatrixCallback.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
 import androidx.annotation.CallSuper
-import im.vector.matrix.android.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixCallback
 import org.junit.Assert.fail
 import timber.log.Timber
 import java.util.concurrent.CountDownLatch
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestMatrixComponent.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
similarity index 74%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestMatrixComponent.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
index 27d00e5896..50290e1d63 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestMatrixComponent.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
 import android.content.Context
 import dagger.BindsInstance
 import dagger.Component
-import im.vector.matrix.android.api.MatrixConfiguration
-import im.vector.matrix.android.internal.auth.AuthModule
-import im.vector.matrix.android.internal.di.MatrixComponent
-import im.vector.matrix.android.internal.di.MatrixModule
-import im.vector.matrix.android.internal.di.MatrixScope
-import im.vector.matrix.android.internal.di.NetworkModule
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.internal.auth.AuthModule
+import org.matrix.android.sdk.internal.di.MatrixComponent
+import org.matrix.android.sdk.internal.di.MatrixModule
+import org.matrix.android.sdk.internal.di.MatrixScope
+import org.matrix.android.sdk.internal.di.NetworkModule
 
 @Component(modules = [TestModule::class, MatrixModule::class, NetworkModule::class, AuthModule::class, TestNetworkModule::class])
 @MatrixScope
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestModule.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestModule.kt
similarity index 88%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestModule.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestModule.kt
index 4290df3973..c3b11d65cc 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestModule.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestModule.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
 import dagger.Binds
 import dagger.Module
-import im.vector.matrix.android.internal.di.MatrixComponent
+import org.matrix.android.sdk.internal.di.MatrixComponent
 
 @Module
 internal abstract class TestModule {
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestNetworkModule.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestNetworkModule.kt
similarity index 86%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestNetworkModule.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestNetworkModule.kt
index f6190441dd..80467d91f4 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestNetworkModule.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestNetworkModule.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.common
+package org.matrix.android.sdk.common
 
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.internal.session.MockHttpInterceptor
-import im.vector.matrix.android.internal.session.TestInterceptor
+import org.matrix.android.sdk.internal.session.MockHttpInterceptor
+import org.matrix.android.sdk.internal.session.TestInterceptor
 
 @Module
 internal object TestNetworkModule {
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/AttachmentEncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
similarity index 94%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/AttachmentEncryptionTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
index 6041114777..05dbc40e1e 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/AttachmentEncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import android.os.MemoryFile
 import android.util.Base64
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileKey
+import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileKey
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNotNull
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
similarity index 74%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreHelper.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
index 7b4020bf04..261c0903f0 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStore
-import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreModule
-import im.vector.matrix.android.internal.crypto.store.db.mapper.CrossSigningKeysMapper
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStore
+import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreModule
+import org.matrix.android.sdk.internal.crypto.store.db.mapper.CrossSigningKeysMapper
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import io.realm.RealmConfiguration
 import kotlin.random.Random
 
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
similarity index 94%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
index 5df05766ff..79477e3a4d 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.internal.crypto.model.OlmSessionWrapper
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import io.realm.Realm
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/ExportEncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
similarity index 99%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/ExportEncryptionTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
index f873e7a809..0ee79c2e1e 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/ExportEncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/UnwedgingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
similarity index 90%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/UnwedgingTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
index 6391c0392c..e5e71f3944 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/UnwedgingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.TimelineSettings
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.TestConstants
-import im.vector.matrix.android.internal.crypto.model.OlmSessionWrapper
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.android.internal.crypto.store.db.deserializeFromRealm
-import im.vector.matrix.android.internal.crypto.store.db.serializeForRealm
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
+import org.matrix.android.sdk.internal.crypto.store.db.serializeForRealm
 import org.amshove.kluent.shouldBe
 import org.junit.Assert
 import org.junit.Before
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/crosssigning/ExtensionsKtTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/ExtensionsKtTest.kt
similarity index 94%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/crosssigning/ExtensionsKtTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/ExtensionsKtTest.kt
index 84da654c4c..9467e861db 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/crosssigning/ExtensionsKtTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/ExtensionsKtTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.crosssigning
+package org.matrix.android.sdk.internal.crypto.crosssigning
 
 import org.amshove.kluent.shouldBeNull
 import org.amshove.kluent.shouldBeTrue
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
similarity index 93%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/crosssigning/XSigningTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index da3bbdc23c..09f14032d0 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -1,14 +1,14 @@
-package im.vector.matrix.android.internal.crypto.crosssigning
+package org.matrix.android.sdk.internal.crypto.crosssigning
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.SessionTestParams
-import im.vector.matrix.android.common.TestConstants
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
similarity index 87%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/KeyShareTests.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index a5c0913909..7c1a88dc75 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -14,33 +14,33 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.gossiping
+package org.matrix.android.sdk.internal.crypto.gossiping
 
 import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.session.crypto.verification.IncomingSasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.SasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.SessionTestParams
-import im.vector.matrix.android.common.TestConstants
-import im.vector.matrix.android.internal.crypto.GossipingRequestState
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestState
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.internal.crypto.GossipingRequestState
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestState
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNotNull
 import junit.framework.TestCase.assertTrue
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
similarity index 92%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/WithHeldTests.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index 16bd97a975..7154487219 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.gossiping
+package org.matrix.android.sdk.internal.crypto.gossiping
 
 import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.MockOkHttpInterceptor
-import im.vector.matrix.android.common.SessionTestParams
-import im.vector.matrix.android.common.TestConstants
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.MockOkHttpInterceptor
+import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
 import org.junit.Assert
 import org.junit.FixMethodOrder
 import org.junit.Test
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPasswordTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
similarity index 96%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
index b1b111babf..f38b55beba 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup
+package org.matrix.android.sdk.internal.crypto.keysbackup
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.common.assertByteArrayNotEqual
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.common.assertByteArrayNotEqual
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupScenarioData.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
similarity index 79%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupScenarioData.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
index 0270c34a37..29a0b5ffd6 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupScenarioData.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup
+package org.matrix.android.sdk.internal.crypto.keysbackup
 
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestData
-import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper2
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestData
+import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
 
 /**
  * Data class to store result of [KeysBackupTestHelper.createKeysBackupScenarioWithPassword]
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
similarity index 97%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
index 2e698a929e..aef97d5687 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup
+package org.matrix.android.sdk.internal.crypto.keysbackup
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.listeners.StepProgressListener
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.TestConstants
-import im.vector.matrix.android.common.TestMatrixCallback
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.listeners.StepProgressListener
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.common.TestMatrixCallback
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.KeysBackupVersionTrust
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTestConstants.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestConstants.kt
similarity index 87%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTestConstants.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestConstants.kt
index 0f3a23df3f..f31e67b0e8 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTestConstants.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestConstants.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup
+package org.matrix.android.sdk.internal.crypto.keysbackup
 
-import im.vector.matrix.android.common.SessionTestParams
+import org.matrix.android.sdk.common.SessionTestParams
 
 object KeysBackupTestConstants {
     val defaultSessionParams = SessionTestParams(withInitialSync = false)
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
similarity index 88%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTestHelper.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
index bb1436b8d4..f84a90708c 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup
+package org.matrix.android.sdk.internal.crypto.keysbackup
 
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.assertDictEquals
-import im.vector.matrix.android.common.assertListEquals
-import im.vector.matrix.android.internal.crypto.MegolmSessionData
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.assertDictEquals
+import org.matrix.android.sdk.common.assertListEquals
+import org.matrix.android.sdk.internal.crypto.MegolmSessionData
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
 import org.junit.Assert
 import java.util.concurrent.CountDownLatch
 
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
similarity index 83%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
index 91d00cbe21..c28b7990e0 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup
+package org.matrix.android.sdk.internal.crypto.keysbackup
 
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
 
 data class PrepareKeysBackupDataResult(val megolmBackupCreationInfo: MegolmBackupCreationInfo,
                                        val version: String)
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/StateObserver.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt
similarity index 93%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/StateObserver.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt
index 3f2e33d73b..90d2fd7812 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/StateObserver.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup
+package org.matrix.android.sdk.internal.crypto.keysbackup
 
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import java.util.concurrent.CountDownLatch
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/ssss/QuadSTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
similarity index 91%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/ssss/QuadSTests.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
index 8bbc74011a..42cee74334 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/ssss/QuadSTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.ssss
+package org.matrix.android.sdk.internal.crypto.ssss
 
 import androidx.lifecycle.Observer
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.securestorage.EncryptedSecretContent
-import im.vector.matrix.android.api.session.securestorage.KeySigner
-import im.vector.matrix.android.api.session.securestorage.RawBytesKeySpec
-import im.vector.matrix.android.api.session.securestorage.SecretStorageKeyContent
-import im.vector.matrix.android.api.session.securestorage.SharedSecretStorageService
-import im.vector.matrix.android.api.session.securestorage.SsssKeyCreationInfo
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.SessionTestParams
-import im.vector.matrix.android.common.TestConstants
-import im.vector.matrix.android.common.TestMatrixCallback
-import im.vector.matrix.android.internal.crypto.SSSS_ALGORITHM_AES_HMAC_SHA2
-import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding
-import im.vector.matrix.android.internal.crypto.secrets.DefaultSharedSecretStorageService
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.securestorage.EncryptedSecretContent
+import org.matrix.android.sdk.api.session.securestorage.KeySigner
+import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
+import org.matrix.android.sdk.api.session.securestorage.SecretStorageKeyContent
+import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
+import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.common.TestMatrixCallback
+import org.matrix.android.sdk.internal.crypto.SSSS_ALGORITHM_AES_HMAC_SHA2
+import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
+import org.matrix.android.sdk.internal.crypto.secrets.DefaultSharedSecretStorageService
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/SASTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
similarity index 94%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/SASTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
index 460c411d43..a6beeb123c 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/SASTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
@@ -14,30 +14,30 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
 import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.IncomingSasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.OutgoingSasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.SasMode
-import im.vector.matrix.android.api.session.crypto.verification.SasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationCancel
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationStart
-import im.vector.matrix.android.internal.crypto.model.rest.toValue
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.OutgoingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.SasMode
+import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationCancel
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationStart
+import org.matrix.android.sdk.internal.crypto.model.rest.toValue
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/HexParser.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/HexParser.kt
similarity index 94%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/HexParser.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/HexParser.kt
index 387b627713..cd5aa32d59 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/HexParser.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/HexParser.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification.qrcode
+package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
 fun hexToByteArray(hex: String): ByteArray {
     // Remove all spaces
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/QrCodeTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
similarity index 98%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/QrCodeTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
index d19fad4b59..54a0f7e771 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/QrCodeTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification.qrcode
+package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
+import org.matrix.android.sdk.InstrumentedTest
 import org.amshove.kluent.shouldBeNull
 import org.amshove.kluent.shouldEqual
 import org.amshove.kluent.shouldEqualTo
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/SharedSecretTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecretTest.kt
similarity index 91%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/SharedSecretTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecretTest.kt
index 4ab79be18b..4032890723 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/SharedSecretTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecretTest.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification.qrcode
+package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
+import org.matrix.android.sdk.InstrumentedTest
 import org.amshove.kluent.shouldBe
 import org.amshove.kluent.shouldNotBeEqualTo
 import org.junit.FixMethodOrder
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/VerificationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
similarity index 92%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/VerificationTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
index d5e9e25b02..0c003215ee 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/verification/qrcode/VerificationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification.qrcode
+package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.TestConstants
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.api.session.crypto.verification.PendingVerificationRequest
 import org.amshove.kluent.shouldBe
 import org.junit.FixMethodOrder
 import org.junit.Test
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
similarity index 98%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/session/room/send/MarkdownParserTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index 0dd2261e24..9b85310d50 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
+import org.matrix.android.sdk.InstrumentedTest
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
 import org.commonmark.renderer.text.TextContentRenderer
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/util/JsonCanonicalizerTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
similarity index 98%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/util/JsonCanonicalizerTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
index 0a7c8f6439..854d420a82 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/util/JsonCanonicalizerTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import im.vector.matrix.android.InstrumentedTest
+import org.matrix.android.sdk.InstrumentedTest
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
similarity index 86%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
index de7142a1cc..a2a1586864 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.session.room.timeline
+package org.matrix.android.sdk.session.room.timeline
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.database.helper.addTimelineEvent
-import im.vector.matrix.android.internal.database.helper.merge
-import im.vector.matrix.android.internal.database.mapper.toEntity
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.model.SessionRealmModule
-import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection
-import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeListOfEvents
-import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeMessageEvent
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
+import org.matrix.android.sdk.internal.database.helper.merge
+import org.matrix.android.sdk.internal.database.mapper.toEntity
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.model.SessionRealmModule
+import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
+import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeListOfEvents
+import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeMessageEvent
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.kotlin.createObject
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeGetContextOfEventTask.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt
similarity index 75%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeGetContextOfEventTask.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt
index 0e1980f134..9a133032b6 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeGetContextOfEventTask.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.session.room.timeline
+package org.matrix.android.sdk.session.room.timeline
 
-import im.vector.matrix.android.internal.session.room.timeline.GetContextOfEventTask
-import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection
-import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEventPersistor
+import org.matrix.android.sdk.internal.session.room.timeline.GetContextOfEventTask
+import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
+import org.matrix.android.sdk.internal.session.room.timeline.TokenChunkEventPersistor
 import kotlin.random.Random
 
 internal class FakeGetContextOfEventTask constructor(private val tokenChunkEventPersistor: TokenChunkEventPersistor) : GetContextOfEventTask {
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakePaginationTask.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt
similarity index 78%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakePaginationTask.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt
index be67ffdbba..06828ef3d1 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakePaginationTask.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.session.room.timeline
+package org.matrix.android.sdk.session.room.timeline
 
-import im.vector.matrix.android.internal.session.room.timeline.PaginationTask
-import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEventPersistor
+import org.matrix.android.sdk.internal.session.room.timeline.PaginationTask
+import org.matrix.android.sdk.internal.session.room.timeline.TokenChunkEventPersistor
 import javax.inject.Inject
 import kotlin.random.Random
 
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeTokenChunkEvent.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt
similarity index 82%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeTokenChunkEvent.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt
index 3f74df2c2e..0301157d09 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeTokenChunkEvent.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.session.room.timeline
+package org.matrix.android.sdk.session.room.timeline
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEvent
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.session.room.timeline.TokenChunkEvent
 
 internal data class FakeTokenChunkEvent(override val start: String?,
                                         override val end: String?,
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
similarity index 74%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
index 102d9b65d3..a6fe675218 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.session.room.timeline
+package org.matrix.android.sdk.session.room.timeline
 
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import kotlin.random.Random
 
 object RoomDataHelper {
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt
similarity index 90%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt
index 7c7de8170b..8c5e7f17f2 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.session.room.timeline
+package org.matrix.android.sdk.session.room.timeline
 
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineSettings
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.checkSendOrder
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.checkSendOrder
 import org.amshove.kluent.shouldBeFalse
 import org.amshove.kluent.shouldBeTrue
 import org.junit.Assert.assertTrue
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineForwardPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
similarity index 91%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineForwardPaginationTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
index adb5c81378..facb905b35 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineForwardPaginationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.session.room.timeline
+package org.matrix.android.sdk.session.room.timeline
 
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineSettings
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.checkSendOrder
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.checkSendOrder
 import org.amshove.kluent.shouldBeFalse
 import org.amshove.kluent.shouldBeTrue
 import org.junit.FixMethodOrder
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelinePreviousLastForwardTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
similarity index 92%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelinePreviousLastForwardTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
index 3e673e4c08..28ce75c221 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelinePreviousLastForwardTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.session.room.timeline
+package org.matrix.android.sdk.session.room.timeline
 
-import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineSettings
-import im.vector.matrix.android.common.CommonTestHelper
-import im.vector.matrix.android.common.CryptoTestHelper
-import im.vector.matrix.android.common.checkSendOrder
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.checkSendOrder
 import org.amshove.kluent.shouldBeFalse
 import org.amshove.kluent.shouldBeTrue
 import org.junit.FixMethodOrder
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
similarity index 94%
rename from matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineTest.kt
rename to matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
index 008508ae19..b0da49cdbb 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.session.room.timeline
+package org.matrix.android.sdk.session.room.timeline
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.InstrumentedTest
+import org.matrix.android.sdk.InstrumentedTest
 
 internal class TimelineTest : InstrumentedTest {
 
diff --git a/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/database/RealmDebugTools.kt b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/database/RealmDebugTools.kt
similarity index 68%
rename from matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/database/RealmDebugTools.kt
rename to matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/database/RealmDebugTools.kt
index 2d9dcda1d4..324a3c1062 100644
--- a/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/database/RealmDebugTools.kt
+++ b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/database/RealmDebugTools.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database
+package org.matrix.android.sdk.internal.database
 
-import im.vector.matrix.android.internal.crypto.store.db.model.CrossSigningInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoMetadataEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoRoomEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.GossipingEventEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.IncomingGossipingRequestEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.KeyInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.KeysBackupDataEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.OlmInboundGroupSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.OlmSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.OutgoingGossipingRequestEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.TrustLevelEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.UserEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMetadataEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.GossipingEventEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.IncomingGossipingRequestEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeyInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.OutgoingGossipingRequestEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.TrustLevelEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntity
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
similarity index 96%
rename from matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt
rename to matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
index eb05e26362..ee2c6076cc 100644
--- a/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt
+++ b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.interceptors
+package org.matrix.android.sdk.internal.network.interceptors
 
-import im.vector.matrix.android.internal.di.MatrixScope
+import org.matrix.android.sdk.internal.di.MatrixScope
 import okhttp3.Interceptor
 import okhttp3.Response
 import okio.Buffer
diff --git a/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
similarity index 95%
rename from matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt
rename to matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
index 43f1373daf..349110aff8 100644
--- a/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt
+++ b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.interceptors
+package org.matrix.android.sdk.internal.network.interceptors
 
 import androidx.annotation.NonNull
-import im.vector.matrix.android.BuildConfig
+import org.matrix.android.sdk.BuildConfig
 import okhttp3.logging.HttpLoggingInterceptor
 import org.json.JSONArray
 import org.json.JSONException
diff --git a/matrix-sdk-android/src/main/AndroidManifest.xml b/matrix-sdk-android/src/main/AndroidManifest.xml
index c02f34f1c9..52238f824c 100644
--- a/matrix-sdk-android/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.matrix.android">
+    package="org.matrix.android.sdk">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -13,7 +13,7 @@
          read access permission
         -->
         <provider
-            android:name="im.vector.matrix.android.api.session.file.MatrixSDKFileProvider"
+            android:name=".api.session.file.MatrixSDKFileProvider"
             android:authorities="${applicationId}.mx-sdk.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/RiotConfig.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/RiotConfig.kt
deleted file mode 100644
index aebcfe0305..0000000000
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/RiotConfig.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.matrix.android.internal.auth.data
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
-data class RiotConfig(
-        // There are plenty of other elements in the file config.json of a RiotWeb client, but for the moment only one is interesting
-        // Ex: "brand", "branding", etc.
-        @Json(name = "default_hs_url")
-        val defaultHomeServerUrl: String?
-)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionComponent.kt
deleted file mode 100644
index b95595ed23..0000000000
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionComponent.kt
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.matrix.android.internal.session
-
-import dagger.BindsInstance
-import dagger.Component
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.internal.crypto.CancelGossipRequestWorker
-import im.vector.matrix.android.internal.crypto.CryptoModule
-import im.vector.matrix.android.internal.crypto.SendGossipRequestWorker
-import im.vector.matrix.android.internal.crypto.SendGossipWorker
-import im.vector.matrix.android.internal.crypto.verification.SendVerificationMessageWorker
-import im.vector.matrix.android.internal.di.MatrixComponent
-import im.vector.matrix.android.internal.di.SessionAssistedInjectModule
-import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
-import im.vector.matrix.android.internal.session.account.AccountModule
-import im.vector.matrix.android.internal.session.cache.CacheModule
-import im.vector.matrix.android.internal.session.call.CallModule
-import im.vector.matrix.android.internal.session.content.ContentModule
-import im.vector.matrix.android.internal.session.content.UploadContentWorker
-import im.vector.matrix.android.internal.session.filter.FilterModule
-import im.vector.matrix.android.internal.session.group.GetGroupDataWorker
-import im.vector.matrix.android.internal.session.group.GroupModule
-import im.vector.matrix.android.internal.session.homeserver.HomeServerCapabilitiesModule
-import im.vector.matrix.android.internal.session.identity.IdentityModule
-import im.vector.matrix.android.internal.session.integrationmanager.IntegrationManagerModule
-import im.vector.matrix.android.internal.session.openid.OpenIdModule
-import im.vector.matrix.android.internal.session.profile.ProfileModule
-import im.vector.matrix.android.internal.session.pushers.AddHttpPusherWorker
-import im.vector.matrix.android.internal.session.pushers.PushersModule
-import im.vector.matrix.android.internal.session.room.RoomModule
-import im.vector.matrix.android.internal.session.room.relation.SendRelationWorker
-import im.vector.matrix.android.internal.session.room.send.EncryptEventWorker
-import im.vector.matrix.android.internal.session.room.send.MultipleEventSendingDispatcherWorker
-import im.vector.matrix.android.internal.session.room.send.RedactEventWorker
-import im.vector.matrix.android.internal.session.room.send.SendEventWorker
-import im.vector.matrix.android.internal.session.signout.SignOutModule
-import im.vector.matrix.android.internal.session.sync.SyncModule
-import im.vector.matrix.android.internal.session.sync.SyncTask
-import im.vector.matrix.android.internal.session.sync.SyncTokenStore
-import im.vector.matrix.android.internal.session.sync.job.SyncWorker
-import im.vector.matrix.android.internal.session.terms.TermsModule
-import im.vector.matrix.android.internal.session.user.UserModule
-import im.vector.matrix.android.internal.session.user.accountdata.AccountDataModule
-import im.vector.matrix.android.internal.session.widgets.WidgetModule
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-
-@Component(dependencies = [MatrixComponent::class],
-        modules = [
-            SessionModule::class,
-            RoomModule::class,
-            SyncModule::class,
-            HomeServerCapabilitiesModule::class,
-            SignOutModule::class,
-            GroupModule::class,
-            UserModule::class,
-            FilterModule::class,
-            GroupModule::class,
-            ContentModule::class,
-            CacheModule::class,
-            CryptoModule::class,
-            PushersModule::class,
-            OpenIdModule::class,
-            WidgetModule::class,
-            IntegrationManagerModule::class,
-            IdentityModule::class,
-            TermsModule::class,
-            AccountDataModule::class,
-            ProfileModule::class,
-            SessionAssistedInjectModule::class,
-            AccountModule::class,
-            CallModule::class
-        ]
-)
-@SessionScope
-internal interface SessionComponent {
-
-    fun coroutineDispatchers(): MatrixCoroutineDispatchers
-
-    fun session(): Session
-
-    fun syncTask(): SyncTask
-
-    fun syncTokenStore(): SyncTokenStore
-
-    fun networkConnectivityChecker(): NetworkConnectivityChecker
-
-    fun taskExecutor(): TaskExecutor
-
-    fun inject(worker: SendEventWorker)
-
-    fun inject(worker: SendRelationWorker)
-
-    fun inject(worker: EncryptEventWorker)
-
-    fun inject(worker: MultipleEventSendingDispatcherWorker)
-
-    fun inject(worker: RedactEventWorker)
-
-    fun inject(worker: GetGroupDataWorker)
-
-    fun inject(worker: UploadContentWorker)
-
-    fun inject(worker: SyncWorker)
-
-    fun inject(worker: AddHttpPusherWorker)
-
-    fun inject(worker: SendVerificationMessageWorker)
-
-    fun inject(worker: SendGossipRequestWorker)
-
-    fun inject(worker: CancelGossipRequestWorker)
-
-    fun inject(worker: SendGossipWorker)
-
-    @Component.Factory
-    interface Factory {
-        fun create(
-                matrixComponent: MatrixComponent,
-                @BindsInstance sessionParams: SessionParams): SessionComponent
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/Matrix.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/Matrix.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
index 12bfb0bb8e..6cd003ddae 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/Matrix.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api
+package org.matrix.android.sdk.api
 
 import android.content.Context
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.Configuration
 import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.api.legacy.LegacySessionImporter
-import im.vector.matrix.android.internal.SessionManager
-import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
-import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments
-import im.vector.matrix.android.internal.di.DaggerMatrixComponent
-import im.vector.matrix.android.internal.network.UserAgentHolder
-import im.vector.matrix.android.internal.util.BackgroundDetectionObserver
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.legacy.LegacySessionImporter
+import org.matrix.android.sdk.internal.SessionManager
+import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
+import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
+import org.matrix.android.sdk.internal.di.DaggerMatrixComponent
+import org.matrix.android.sdk.internal.network.UserAgentHolder
+import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
 import org.matrix.olm.OlmManager
 import java.io.InputStream
 import java.util.concurrent.Executors
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixCallback.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixCallback.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt
index e57117f644..e20d9074a8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixCallback.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api
+package org.matrix.android.sdk.api
 
 /**
  * Generic callback interface for asynchronously.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixConfiguration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixConfiguration.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
index d80a940675..bfcc9105eb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixConfiguration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api
+package org.matrix.android.sdk.api
 
-import im.vector.matrix.android.api.crypto.MXCryptoConfig
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
 import java.net.Proxy
 
 data class MatrixConfiguration(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixPatterns.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
similarity index 98%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixPatterns.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
index bba925b89f..f6e9a33aee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixPatterns.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api
+package org.matrix.android.sdk.api
 
 /**
  * This class contains pattern to match the different Matrix ids
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/AuthenticationService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index 08007e3397..91e2845cd2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth
+package org.matrix.android.sdk.api.auth
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.auth.data.LoginFlowResult
-import im.vector.matrix.android.api.auth.login.LoginWizard
-import im.vector.matrix.android.api.auth.registration.RegistrationWizard
-import im.vector.matrix.android.api.auth.wellknown.WellknownResult
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.LoginFlowResult
+import org.matrix.android.sdk.api.auth.login.LoginWizard
+import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
+import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to authenticate or to create an account to a matrix server.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/Constants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/Constants.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
index f4d6d2505e..590b84f35b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/Constants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth
+package org.matrix.android.sdk.api.auth
 
 /**
  * Path to use when the client does not supported any or all login flows
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt
index d50ed2f46e..6dfa56f16a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.data
+package org.matrix.android.sdk.api.auth.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.util.md5
+import org.matrix.android.sdk.internal.util.md5
 
 /**
  * This data class hold credentials user data.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/DiscoveryInformation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/DiscoveryInformation.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/DiscoveryInformation.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/DiscoveryInformation.kt
index 2aa741bad3..d5d732ccc2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/DiscoveryInformation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/DiscoveryInformation.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.data
+package org.matrix.android.sdk.api.auth.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/HomeServerConnectionConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/HomeServerConnectionConfig.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/HomeServerConnectionConfig.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/HomeServerConnectionConfig.kt
index ef4c492bf8..02fab04067 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/HomeServerConnectionConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/HomeServerConnectionConfig.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +15,19 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.data
+package org.matrix.android.sdk.api.auth.data
 
 import android.net.Uri
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig.Builder
-import im.vector.matrix.android.internal.network.ssl.Fingerprint
-import im.vector.matrix.android.internal.util.ensureTrailingSlash
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig.Builder
+import org.matrix.android.sdk.internal.network.ssl.Fingerprint
+import org.matrix.android.sdk.internal.util.ensureTrailingSlash
 import okhttp3.CipherSuite
 import okhttp3.TlsVersion
 
 /**
  * This data class holds how to connect to a specific Homeserver.
- * It's used with [im.vector.matrix.android.api.auth.AuthenticationService] class.
+ * It's used with [org.matrix.android.sdk.api.auth.AuthenticationService] class.
  * You should use the [Builder] to create one.
  */
 @JsonClass(generateAdapter = true)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/LoginFlowResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/LoginFlowResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
index 3e824eeaee..c3686da7dd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/LoginFlowResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.data
+package org.matrix.android.sdk.api.auth.data
 
 // Either a list of supported login types, or an error if the homeserver is outdated
 sealed class LoginFlowResult {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/LoginFlowTypes.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowTypes.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/LoginFlowTypes.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowTypes.kt
index 922a4cca18..64a1fd88d1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/LoginFlowTypes.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowTypes.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.data
+package org.matrix.android.sdk.api.auth.data
 
 object LoginFlowTypes {
     const val PASSWORD = "m.login.password"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/SessionParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SessionParams.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/SessionParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SessionParams.kt
index 1cbba50af7..cbeece7e03 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/SessionParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SessionParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.data
+package org.matrix.android.sdk.api.auth.data
 
 /**
  * This data class holds necessary data to open a session.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/WellKnown.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnown.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/WellKnown.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnown.kt
index 7885a05e9b..b10cae6171 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/WellKnown.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnown.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.data
+package org.matrix.android.sdk.api.auth.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.util.JsonDict
+import org.matrix.android.sdk.api.util.JsonDict
 
 /**
  * https://matrix.org/docs/spec/client_server/r0.4.0.html#server-discovery
@@ -41,6 +42,9 @@ import im.vector.matrix.android.api.util.JsonDict
  *              }
  *          ]
  *    }
+ *     "im.vector.riot.jitsi": {
+ *         "preferredDomain": "https://jitsi.riot.im/"
+ *     }
  * }
  * </pre>
  */
@@ -56,7 +60,10 @@ data class WellKnown(
         val integrations: JsonDict? = null,
 
         @Json(name = "im.vector.riot.e2ee")
-        val e2eAdminSetting: E2EWellKnownConfig? = null
+        val e2eAdminSetting: E2EWellKnownConfig? = null,
+
+        @Json(name = "im.vector.riot.jitsi")
+        val jitsiServer: WellKnownPreferredConfig? = null
 
 )
 
@@ -65,3 +72,9 @@ data class E2EWellKnownConfig(
         @Json(name = "default")
         val e2eDefault: Boolean = true
 )
+
+@JsonClass(generateAdapter = true)
+data class WellKnownPreferredConfig(
+        @Json(name = "preferredDomain")
+        val preferredDomain: String? = null
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/WellKnownBaseConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnownBaseConfig.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/WellKnownBaseConfig.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnownBaseConfig.kt
index c544ebfdf8..f0b252f973 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/WellKnownBaseConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnownBaseConfig.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.data
+package org.matrix.android.sdk.api.auth.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/login/LoginWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/login/LoginWizard.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
index 9c296d5ddb..25cf8209fe 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/login/LoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.login
+package org.matrix.android.sdk.api.auth.login
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.Cancelable
 
 interface LoginWizard {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/RegisterThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegisterThreePid.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/RegisterThreePid.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegisterThreePid.kt
index 9ad72edc67..3dd2b460b2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/RegisterThreePid.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegisterThreePid.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.registration
+package org.matrix.android.sdk.api.auth.registration
 
 sealed class RegisterThreePid {
     data class Email(val email: String) : RegisterThreePid()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/RegistrationResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/RegistrationResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt
index fd75e096d9..544cbf63cc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/RegistrationResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.registration
+package org.matrix.android.sdk.api.auth.registration
 
-import im.vector.matrix.android.api.session.Session
+import org.matrix.android.sdk.api.session.Session
 
 // Either a session or an object containing data about registration stages
 sealed class RegistrationResult {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/RegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/RegistrationWizard.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
index 9c1e38e31e..0629915a42 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/RegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.registration
+package org.matrix.android.sdk.api.auth.registration
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 interface RegistrationWizard {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/Stage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/Stage.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt
index ccc5908911..2635adc733 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/registration/Stage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.registration
+package org.matrix.android.sdk.api.auth.registration
 
 sealed class Stage(open val mandatory: Boolean) {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/wellknown/WellknownResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/wellknown/WellknownResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
index 58c7cf730e..a736a4f1be 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/wellknown/WellknownResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.wellknown
+package org.matrix.android.sdk.api.auth.wellknown
 
-import im.vector.matrix.android.api.auth.data.WellKnown
+import org.matrix.android.sdk.api.auth.data.WellKnown
 
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#well-known-uri
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/comparators/DatedObjectComparators.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/comparators/DatedObjectComparators.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/comparators/DatedObjectComparators.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/comparators/DatedObjectComparators.kt
index a9d30f823c..409fec4437 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/comparators/DatedObjectComparators.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/comparators/DatedObjectComparators.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.comparators
+package org.matrix.android.sdk.api.comparators
 
-import im.vector.matrix.android.api.interfaces.DatedObject
+import org.matrix.android.sdk.api.interfaces.DatedObject
 
 object DatedObjectComparators {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/crypto/Emojis.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/Emojis.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/crypto/Emojis.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/Emojis.kt
index 469721a4c8..97454684a3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/crypto/Emojis.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/Emojis.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.crypto
+package org.matrix.android.sdk.api.crypto
 
-import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation
-import im.vector.matrix.android.internal.crypto.verification.getEmojiForCode
+import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
+import org.matrix.android.sdk.internal.crypto.verification.getEmojiForCode
 
 /**
  * Provide all the emojis used for SAS verification (for debug purpose)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/crypto/MXCryptoConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/crypto/MXCryptoConfig.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt
index fa8178334c..9eae1265f0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/crypto/MXCryptoConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.crypto
+package org.matrix.android.sdk.api.crypto
 
 /**
  * Class to define the parameters used to customize or configure the end-to-end crypto.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/crypto/RoomEncryptionTrustLevel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/RoomEncryptionTrustLevel.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/crypto/RoomEncryptionTrustLevel.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/RoomEncryptionTrustLevel.kt
index ee431ae23a..23f21f8829 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/crypto/RoomEncryptionTrustLevel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/RoomEncryptionTrustLevel.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.crypto
+package org.matrix.android.sdk.api.crypto
 
 /**
  * RoomEncryptionTrustLevel represents the trust level in an encrypted room.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/Booleans.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Booleans.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/Booleans.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Booleans.kt
index f6bf7d5f7d..606f321196 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/Booleans.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Booleans.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.extensions
+package org.matrix.android.sdk.api.extensions
 
 fun Boolean?.orTrue() = this ?: true
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/MatrixSdkExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MatrixSdkExtensions.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/MatrixSdkExtensions.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MatrixSdkExtensions.kt
index 6ce04f8b30..2f3c8c13c5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/MatrixSdkExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MatrixSdkExtensions.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.extensions
+package org.matrix.android.sdk.api.extensions
 
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 
 /* ==========================================================================================
  * MXDeviceInfo
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/Strings.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/Strings.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt
index 202c15b5b0..f25898077a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/Strings.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.extensions
+package org.matrix.android.sdk.api.extensions
 
 fun CharSequence.ensurePrefix(prefix: CharSequence): CharSequence {
     return when {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/Try.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Try.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/Try.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Try.kt
index 3d80a94156..baae9b70f5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/Try.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Try.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.extensions
+package org.matrix.android.sdk.api.extensions
 
 import timber.log.Timber
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/Extensions.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
index 7b5dffb21e..8caed519b2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.failure
+package org.matrix.android.sdk.api.failure
 
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.internal.auth.registration.RegistrationFlowResponse
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.internal.auth.registration.RegistrationFlowResponse
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import java.io.IOException
 import javax.net.ssl.HttpsURLConnection
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/Failure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/Failure.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
index f519819d0d..a930d7d633 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/Failure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.failure
+package org.matrix.android.sdk.api.failure
 
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.internal.auth.registration.RegistrationFlowResponse
-import im.vector.matrix.android.internal.network.ssl.Fingerprint
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.internal.auth.registration.RegistrationFlowResponse
+import org.matrix.android.sdk.internal.network.ssl.Fingerprint
 import java.io.IOException
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/GlobalError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/GlobalError.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
index ae268b9da2..053ad670b9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/GlobalError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.failure
+package org.matrix.android.sdk.api.failure
 
-import im.vector.matrix.android.internal.network.ssl.Fingerprint
+import org.matrix.android.sdk.internal.network.ssl.Fingerprint
 
 // This class will be sent to the bus
 sealed class GlobalError {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
similarity index 98%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
index 7c9ace5d82..ff68107ffc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.failure
+package org.matrix.android.sdk.api.failure
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/interfaces/DatedObject.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/interfaces/DatedObject.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/interfaces/DatedObject.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/interfaces/DatedObject.kt
index cd73550692..b1296c8aa3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/interfaces/DatedObject.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/interfaces/DatedObject.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.interfaces
+package org.matrix.android.sdk.api.interfaces
 
 /**
  * Can be implemented by any object containing a timestamp.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/legacy/LegacySessionImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/legacy/LegacySessionImporter.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/legacy/LegacySessionImporter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/legacy/LegacySessionImporter.kt
index 7856bd2c34..05128005cc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/legacy/LegacySessionImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/legacy/LegacySessionImporter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.legacy
+package org.matrix.android.sdk.api.legacy
 
 interface LegacySessionImporter {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/ProgressListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/ProgressListener.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/ProgressListener.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/ProgressListener.kt
index d672434046..9d6c9387f1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/ProgressListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/ProgressListener.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.listeners
+package org.matrix.android.sdk.api.listeners
 
 /**
  * Interface to send a progress info
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/StepProgressListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/StepProgressListener.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/StepProgressListener.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/StepProgressListener.kt
index 196aa6d655..afe6ac51bd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/StepProgressListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/StepProgressListener.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.listeners
+package org.matrix.android.sdk.api.listeners
 
 /**
  * Interface to send a progress info
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
index a81af2cf21..7a21920e58 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
-import im.vector.matrix.android.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import timber.log.Timber
 
 sealed class Action {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Condition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Condition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
index a7b475518c..50c2f8505b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Condition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 abstract class Condition(val kind: Kind) {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ConditionResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ConditionResolver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt
index 95f89ec2c7..dc92ce8d29 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ConditionResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 /**
  * Acts like a visitor on Conditions.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ContainsDisplayNameCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ContainsDisplayNameCondition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
index a2613d2859..a836c24c4e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ContainsDisplayNameCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import timber.log.Timber
 
 class ContainsDisplayNameCondition : Condition(Kind.ContainsDisplayName) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/EventMatchCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/EventMatchCondition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
index ca13155542..5eed785899 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/EventMatchCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import timber.log.Timber
 
 class EventMatchCondition(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
index 1c1c2f266c..64ccdcdece 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.api.pushrules.rest.RuleSet
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.pushrules.rest.RuleSet
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.util.Cancelable
 
 interface PushRuleService {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RoomMemberCountCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RoomMemberCountCondition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
index 5c7b79a5ba..f97636a7bd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RoomMemberCountCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.internal.session.room.RoomGetter
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.session.room.RoomGetter
 import timber.log.Timber
 
 private val regex = Regex("^(==|<=|>=|<|>)?(\\d*)$")
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleIds.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleIds.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
index cf05e9252d..eeb2577d4c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleIds.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
 /**
  * Known rule ids
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleScope.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleScope.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt
index 19aa2a4d43..d94026f438 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleScope.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
 object RuleScope {
     const val GLOBAL = "global"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleSetKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleSetKey.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt
index e8862ad343..f716b33f23 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RuleSetKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushrules
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/SenderNotificationPermissionCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/SenderNotificationPermissionCondition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
index 5d16825056..a8d08e5458 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/SenderNotificationPermissionCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 
 class SenderNotificationPermissionCondition(
         /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/GetPushRulesResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/GetPushRulesResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt
index 2ce6c8364a..f83d893c0a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/GetPushRulesResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules.rest
+package org.matrix.android.sdk.api.pushrules.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushCondition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
index edfb56e019..9469da3ea5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules.rest
+package org.matrix.android.sdk.api.pushrules.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.pushrules.Condition
-import im.vector.matrix.android.api.pushrules.ContainsDisplayNameCondition
-import im.vector.matrix.android.api.pushrules.EventMatchCondition
-import im.vector.matrix.android.api.pushrules.RoomMemberCountCondition
-import im.vector.matrix.android.api.pushrules.SenderNotificationPermissionCondition
+import org.matrix.android.sdk.api.pushrules.Condition
+import org.matrix.android.sdk.api.pushrules.ContainsDisplayNameCondition
+import org.matrix.android.sdk.api.pushrules.EventMatchCondition
+import org.matrix.android.sdk.api.pushrules.RoomMemberCountCondition
+import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
 import timber.log.Timber
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushRule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushRule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
index 8611f124e8..46d73a8aa2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushRule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.pushrules.rest
+package org.matrix.android.sdk.api.pushrules.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.pushrules.Action
-import im.vector.matrix.android.api.pushrules.getActions
-import im.vector.matrix.android.api.pushrules.toJson
+import org.matrix.android.sdk.api.pushrules.Action
+import org.matrix.android.sdk.api.pushrules.getActions
+import org.matrix.android.sdk.api.pushrules.toJson
 
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushrules
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/RuleSet.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/RuleSet.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
index 28f680b12b..eb813dba45 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/RuleSet.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.pushrules.rest
+package org.matrix.android.sdk.api.pushrules.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.pushrules.RuleSetKey
+import org.matrix.android.sdk.api.pushrules.RuleSetKey
 
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushrules
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/query/QueryStringValue.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/query/QueryStringValue.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
index ef99133ba6..21ff3aebca 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/query/QueryStringValue.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.query
+package org.matrix.android.sdk.api.query
 
 /**
  * Basic query language. All these cases are mutually exclusive.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/InitialSyncProgressService.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/InitialSyncProgressService.kt
index 6aacd6cd19..42bb29efca 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/InitialSyncProgressService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session
+package org.matrix.android.sdk.api.session
 
 import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
similarity index 70%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 8d97dfc01b..cfddf73363 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,40 +15,41 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session
+package org.matrix.android.sdk.api.session
 
 import androidx.annotation.MainThread
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.api.failure.GlobalError
-import im.vector.matrix.android.api.pushrules.PushRuleService
-import im.vector.matrix.android.api.session.account.AccountService
-import im.vector.matrix.android.api.session.accountdata.AccountDataService
-import im.vector.matrix.android.api.session.cache.CacheService
-import im.vector.matrix.android.api.session.call.CallSignalingService
-import im.vector.matrix.android.api.session.content.ContentUploadStateTracker
-import im.vector.matrix.android.api.session.content.ContentUrlResolver
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.file.ContentDownloadStateTracker
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.matrix.android.api.session.group.GroupService
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilitiesService
-import im.vector.matrix.android.api.session.identity.IdentityService
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService
-import im.vector.matrix.android.api.session.profile.ProfileService
-import im.vector.matrix.android.api.session.pushers.PushersService
-import im.vector.matrix.android.api.session.room.RoomDirectoryService
-import im.vector.matrix.android.api.session.room.RoomService
-import im.vector.matrix.android.api.session.securestorage.SecureStorageService
-import im.vector.matrix.android.api.session.securestorage.SharedSecretStorageService
-import im.vector.matrix.android.api.session.signout.SignOutService
-import im.vector.matrix.android.api.session.sync.FilterService
-import im.vector.matrix.android.api.session.sync.SyncState
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.matrix.android.api.session.typing.TypingUsersTracker
-import im.vector.matrix.android.api.session.user.UserService
-import im.vector.matrix.android.api.session.widgets.WidgetService
 import okhttp3.OkHttpClient
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.pushrules.PushRuleService
+import org.matrix.android.sdk.api.session.account.AccountService
+import org.matrix.android.sdk.api.session.accountdata.AccountDataService
+import org.matrix.android.sdk.api.session.cache.CacheService
+import org.matrix.android.sdk.api.session.call.CallSignalingService
+import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
+import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker
+import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.api.session.group.GroupService
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
+import org.matrix.android.sdk.api.session.identity.IdentityService
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.api.session.permalinks.PermalinkService
+import org.matrix.android.sdk.api.session.profile.ProfileService
+import org.matrix.android.sdk.api.session.pushers.PushersService
+import org.matrix.android.sdk.api.session.room.RoomDirectoryService
+import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
+import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
+import org.matrix.android.sdk.api.session.signout.SignOutService
+import org.matrix.android.sdk.api.session.sync.FilterService
+import org.matrix.android.sdk.api.session.sync.SyncState
+import org.matrix.android.sdk.api.session.terms.TermsService
+import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
+import org.matrix.android.sdk.api.session.user.UserService
+import org.matrix.android.sdk.api.session.widgets.WidgetService
 
 /**
  * This interface defines interactions with a session.
@@ -194,6 +196,11 @@ interface Session :
      */
     fun fileService(): FileService
 
+    /**
+     * Returns the permalink service associated with the session
+     */
+    fun permalinkService(): PermalinkService
+
     /**
      * Add a listener to the session.
      * @param listener the listener to add.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/account/AccountService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/account/AccountService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt
index ddbaaea6ef..40c373820c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/account/AccountService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.account
+package org.matrix.android.sdk.api.session.account
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to manage the account. It's implemented at the session level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/accountdata/AccountDataService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/accountdata/AccountDataService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt
index 3d5637caa1..a90a34de4b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/accountdata/AccountDataService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.accountdata
+package org.matrix.android.sdk.api.session.accountdata
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.Optional
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Optional
 
 interface AccountDataService {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/accountdata/UserAccountDataEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataEvent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/accountdata/UserAccountDataEvent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataEvent.kt
index 4ff0975de9..57eda657ac 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/accountdata/UserAccountDataEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataEvent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.accountdata
+package org.matrix.android.sdk.api.session.accountdata
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Content
 
 /**
  * This is a simplified Event with just a type and a content.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/accountdata/UserAccountDataTypes.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/accountdata/UserAccountDataTypes.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
index 83fdb61925..2414e4a1fb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/accountdata/UserAccountDataTypes.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
@@ -1,5 +1,6 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.accountdata
+package org.matrix.android.sdk.api.session.accountdata
 
 object UserAccountDataTypes {
-
     const val TYPE_IGNORED_USER_LIST = "m.ignored_user_list"
     const val TYPE_DIRECT_MESSAGES = "m.direct"
-    const val TYPE_BREADCRUMBS = "im.vector.setting.breadcrumbs" // Was previously "im.vector.riot.breadcrumb_rooms"
+    const val TYPE_BREADCRUMBS = "im.vector.setting.breadcrumbs"
     const val TYPE_PREVIEW_URLS = "org.matrix.preview_urls"
     const val TYPE_WIDGETS = "m.widgets"
     const val TYPE_PUSH_RULES = "m.push_rules"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/cache/CacheService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/cache/CacheService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt
index 2f34922280..a36856a7e6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/cache/CacheService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.cache
+package org.matrix.android.sdk.api.session.cache
 
-import im.vector.matrix.android.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixCallback
 
 /**
  * This interface defines a method to clear the cache. It's implemented at the session level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallSignalingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallSignalingService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
index ec0cb0e4e1..2962f9fac3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallSignalingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.call
+package org.matrix.android.sdk.api.session.call
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 interface CallSignalingService {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt
index 3b3a393026..60268abf70 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.call
+package org.matrix.android.sdk.api.session.call
 
 import org.webrtc.PeerConnection
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallsListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallsListener.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallsListener.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallsListener.kt
index 1c51c10c0b..81430c71ea 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallsListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallsListener.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.call
+package org.matrix.android.sdk.api.session.call
 
-import im.vector.matrix.android.api.session.room.model.call.CallAnswerContent
-import im.vector.matrix.android.api.session.room.model.call.CallCandidatesContent
-import im.vector.matrix.android.api.session.room.model.call.CallHangupContent
-import im.vector.matrix.android.api.session.room.model.call.CallInviteContent
+import org.matrix.android.sdk.api.session.room.model.call.CallAnswerContent
+import org.matrix.android.sdk.api.session.room.model.call.CallCandidatesContent
+import org.matrix.android.sdk.api.session.room.model.call.CallHangupContent
+import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
 
 interface CallsListener {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/EglUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/EglUtils.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/EglUtils.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/EglUtils.kt
index bd1d95ae6f..6b70d8500f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/EglUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/EglUtils.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.call
+package org.matrix.android.sdk.api.session.call
 
 import org.webrtc.EglBase
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/MxCall.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/MxCall.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
index f6b8813188..04af588b93 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/MxCall.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.call
+package org.matrix.android.sdk.api.session.call
 
 import org.webrtc.IceCandidate
 import org.webrtc.SessionDescription
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/TurnServerResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/TurnServerResponse.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/TurnServerResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/TurnServerResponse.kt
index 78acff5290..f63a1a0d28 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/TurnServerResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/TurnServerResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.call
+package org.matrix.android.sdk.api.session.call
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentAttachmentData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentAttachmentData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
index b80a17b017..045a9bc1a0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentAttachmentData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.content
+package org.matrix.android.sdk.api.session.content
 
 import android.net.Uri
 import android.os.Parcelable
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
index dedf9a83cf..a29e7110e2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.content
+package org.matrix.android.sdk.api.session.content
 
 interface ContentUploadStateTracker {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUrlResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUrlResolver.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUrlResolver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUrlResolver.kt
index 6ed0b92e38..890e72edd9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUrlResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUrlResolver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.content
+package org.matrix.android.sdk.api.session.content
 
 /**
  * This interface defines methods for accessing content from the current session.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/CryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/CryptoService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
index 19635364cd..726f9b624a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/CryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,32 +15,32 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto
+package org.matrix.android.sdk.api.session.crypto
 
 import android.content.Context
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
-import im.vector.matrix.android.api.session.crypto.keyshare.GossipingRequestListener
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
-import im.vector.matrix.android.internal.crypto.NewSessionListener
-import im.vector.matrix.android.internal.crypto.OutgoingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXEncryptEventContentResult
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.event.RoomKeyWithHeldContent
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
+import org.matrix.android.sdk.api.session.crypto.keyshare.GossipingRequestListener
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
+import org.matrix.android.sdk.internal.crypto.NewSessionListener
+import org.matrix.android.sdk.internal.crypto.OutgoingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.internal.crypto.model.MXDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXEncryptEventContentResult
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyWithHeldContent
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DevicesListResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
 
 interface CryptoService {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/MXCryptoError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/MXCryptoError.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
index b5d63faaf9..53bee09f11 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/MXCryptoError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
@@ -2,6 +2,7 @@
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +17,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto
+package org.matrix.android.sdk.api.session.crypto
 
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
 import org.matrix.olm.OlmException
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/crosssigning/CrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/crosssigning/CrossSigningService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt
index 5709e66581..490b1d19c1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/crosssigning/CrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.crosssigning
+package org.matrix.android.sdk.api.session.crypto.crosssigning
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustResult
-import im.vector.matrix.android.internal.crypto.crosssigning.UserTrustResult
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.android.internal.crypto.store.PrivateKeysInfo
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustResult
+import org.matrix.android.sdk.internal.crypto.crosssigning.UserTrustResult
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
 
 interface CrossSigningService {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/crosssigning/CrossSigningSsssSecretConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningSsssSecretConstants.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/crosssigning/CrossSigningSsssSecretConstants.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningSsssSecretConstants.kt
index 2c3425bcb4..bc85254f69 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/crosssigning/CrossSigningSsssSecretConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningSsssSecretConstants.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.crosssigning
+package org.matrix.android.sdk.api.session.crypto.crosssigning
 
 const val MASTER_KEY_SSSS_NAME = "m.cross_signing.master"
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/crosssigning/MXCrossSigningInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
index 8d75fe2a91..0212dee36c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.crosssigning
+package org.matrix.android.sdk.api.session.crypto.crosssigning
 
-import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
-import im.vector.matrix.android.internal.crypto.model.KeyUsage
+import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
+import org.matrix.android.sdk.internal.crypto.model.KeyUsage
 
 data class MXCrossSigningInfo(
         val userId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
index 9ad39d45fd..ceeb87c128 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.keysbackup
+package org.matrix.android.sdk.api.session.crypto.keysbackup
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.listeners.StepProgressListener
-import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.matrix.android.internal.crypto.store.SavedKeyBackupKeyInfo
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.listeners.StepProgressListener
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.KeysBackupVersionTrust
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.internal.crypto.store.SavedKeyBackupKeyInfo
 
 interface KeysBackupService {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
index a20f1c61b4..9ab190ac98 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.keysbackup
+package org.matrix.android.sdk.api.session.crypto.keysbackup
 
 /**
  * E2e keys backup states.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupStateListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupStateListener.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupStateListener.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupStateListener.kt
index be1f2e5f3e..10cfe6ce85 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupStateListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupStateListener.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.keysbackup
+package org.matrix.android.sdk.api.session.crypto.keysbackup
 
 interface KeysBackupStateListener {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keyshare/GossipingRequestListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keyshare/GossipingRequestListener.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt
index 1dad685f41..3daee31bcf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keyshare/GossipingRequestListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.keyshare
+package org.matrix.android.sdk.api.session.crypto.keyshare
 
-import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.IncomingRequestCancellation
-import im.vector.matrix.android.internal.crypto.IncomingSecretShareRequest
+import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.IncomingRequestCancellation
+import org.matrix.android.sdk.internal.crypto.IncomingSecretShareRequest
 
 /**
  * Room keys events listener
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/CancelCode.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/CancelCode.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/CancelCode.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/CancelCode.kt
index 35961b309f..acd0866401 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/CancelCode.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/CancelCode.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 enum class CancelCode(val value: String, val humanReadable: String) {
     User("m.user", "the user cancelled the verification"),
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/EmojiRepresentation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/EmojiRepresentation.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt
index 7d18d9bd70..6b568ee143 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/EmojiRepresentation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/IncomingSasVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/IncomingSasVerificationTransaction.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/IncomingSasVerificationTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/IncomingSasVerificationTransaction.kt
index e3ba3dc4c0..45d04e66f0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/IncomingSasVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/IncomingSasVerificationTransaction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 interface IncomingSasVerificationTransaction : SasVerificationTransaction {
     val uxState: UxState
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/OutgoingSasVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/OutgoingSasVerificationTransaction.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/OutgoingSasVerificationTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/OutgoingSasVerificationTransaction.kt
index 67e88f5648..c6be940cde 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/OutgoingSasVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/OutgoingSasVerificationTransaction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 interface OutgoingSasVerificationTransaction : SasVerificationTransaction {
     val uxState: UxState
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/PendingVerificationRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/PendingVerificationRequest.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/PendingVerificationRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/PendingVerificationRequest.kt
index c2e0b8f7c5..8da60976ac 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/PendingVerificationRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/PendingVerificationRequest.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_QR_CODE_SCAN
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_QR_CODE_SHOW
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_QR_CODE_SCAN
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_QR_CODE_SHOW
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
 import java.util.UUID
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/QrCodeVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/QrCodeVerificationTransaction.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/QrCodeVerificationTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/QrCodeVerificationTransaction.kt
index 516f7f0712..e4956aaabb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/QrCodeVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/QrCodeVerificationTransaction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 interface QrCodeVerificationTransaction : VerificationTransaction {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/SasMode.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasMode.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/SasMode.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasMode.kt
index c346a07228..2dc5c308ee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/SasMode.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasMode.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 object SasMode {
     const val DECIMAL = "decimal"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/SasVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/SasVerificationTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt
index d1778f19a0..00da238bd2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/SasVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 interface SasVerificationTransaction : VerificationTransaction {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/ValidVerificationInfoReady.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoReady.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/ValidVerificationInfoReady.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoReady.kt
index db70e2d19f..68c1bb7bb0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/ValidVerificationInfoReady.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoReady.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 data class ValidVerificationInfoReady(
         val transactionId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/ValidVerificationInfoRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoRequest.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/ValidVerificationInfoRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoRequest.kt
index 9ef148f02f..431c9728ee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/ValidVerificationInfoRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoRequest.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 data class ValidVerificationInfoRequest(
         val transactionId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationMethod.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationMethod.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
index 3cd3aee90d..15a728ccf2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationMethod.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 /**
  * Verification methods
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
index 4482101434..623f9e5c0e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
 
 /**
  * https://matrix.org/docs/spec/client_server/r0.5.0#key-verification-framework
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTransaction.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTransaction.kt
index 13aae70b5b..7e7dcb6d90 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTransaction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 interface VerificationTransaction {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationTxState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationTxState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt
index 868ec5a3e2..a8ae81bc30 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationTxState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.crypto.verification
+package org.matrix.android.sdk.api.session.crypto.verification
 
 sealed class VerificationTxState {
     // Uninitialized state
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedAnnotation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedAnnotation.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt
index ef164cd17b..30a1e29d81 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedAnnotation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.events.model
+package org.matrix.android.sdk.api.session.events.model
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedRelations.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedRelations.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt
index d04a72bac5..8bc1af25e0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedRelations.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.events.model
+package org.matrix.android.sdk.api.session.events.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/DefaultUnsignedRelationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/DefaultUnsignedRelationInfo.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/DefaultUnsignedRelationInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/DefaultUnsignedRelationInfo.kt
index f7a573ca28..f8be9e26a0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/DefaultUnsignedRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/DefaultUnsignedRelationInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.events.model
+package org.matrix.android.sdk.api.session.events.model
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index 2fbd5f4d4d..fdd3e66703 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +15,19 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.events.model
+package org.matrix.android.sdk.api.session.events.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.json.JSONObject
 import timber.log.Timber
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/EventType.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index 066a65323c..f9f2e10af4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.events.model
+package org.matrix.android.sdk.api.session.events.model
 
 /**
  * Constants defining known event types from Matrix specifications.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/LocalEcho.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/LocalEcho.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/LocalEcho.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/LocalEcho.kt
index 67ae3b2d73..aa3726d49e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/LocalEcho.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/LocalEcho.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.events.model
+package org.matrix.android.sdk.api.session.events.model
 
 import java.util.UUID
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/RelationChunkInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationChunkInfo.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/RelationChunkInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationChunkInfo.kt
index f4f1d8667d..72ab3e5c0e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/RelationChunkInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationChunkInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.events.model
+package org.matrix.android.sdk.api.session.events.model
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/RelationType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/RelationType.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
index 8ffb8eb63f..2c18bd6c8a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/RelationType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.events.model
+package org.matrix.android.sdk.api.session.events.model
 
 /**
  * Constants defining known event relation types from Matrix specifications
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedData.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedData.kt
index 16ff36ea07..a16d9ec5bd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.events.model
+package org.matrix.android.sdk.api.session.events.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedRelationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedRelationInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt
index ad31ad3a32..04371ae54b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.events.model
+package org.matrix.android.sdk.api.session.events.model
 
 interface UnsignedRelationInfo {
     val limited : Boolean?
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/ContentDownloadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/ContentDownloadStateTracker.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/ContentDownloadStateTracker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/ContentDownloadStateTracker.kt
index ed098e7a42..52bf0ed05c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/ContentDownloadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/ContentDownloadStateTracker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.file
+package org.matrix.android.sdk.api.session.file
 
 interface ContentDownloadStateTracker {
     fun track(key: String, updateListener: UpdateListener)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/FileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/FileService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
index c120c499c9..da42bfa485 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/FileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.file
+package org.matrix.android.sdk.api.session.file
 
 import android.net.Uri
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
 import java.io.File
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/MatrixSDKFileProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/MatrixSDKFileProvider.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/MatrixSDKFileProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/MatrixSDKFileProvider.kt
index 31d85eefb0..b456626ef7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/MatrixSDKFileProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/MatrixSDKFileProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.file
+package org.matrix.android.sdk.api.session.file
 
 import android.net.Uri
 import androidx.core.content.FileProvider
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/Group.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/Group.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt
index cdc8bc1621..10435ee054 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/Group.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.group
+package org.matrix.android.sdk.api.session.group
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to interact within a group.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/GroupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupService.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/GroupService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupService.kt
index c01e5b5cd8..6858db4646 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/GroupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.group
+package org.matrix.android.sdk.api.session.group
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 
 /**
  * This interface defines methods to get groups. It's implemented at the session level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/GroupSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupSummaryQueryParams.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/GroupSummaryQueryParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupSummaryQueryParams.kt
index 702b8c2523..bf9535f271 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/GroupSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupSummaryQueryParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.group
+package org.matrix.android.sdk.api.session.group
 
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.room.model.Membership
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.room.model.Membership
 
 fun groupSummaryQueryParams(init: (GroupSummaryQueryParams.Builder.() -> Unit) = {}): GroupSummaryQueryParams {
     return GroupSummaryQueryParams.Builder().apply(init).build()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/model/GroupSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/model/GroupSummary.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/model/GroupSummary.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/model/GroupSummary.kt
index 8e39d6d31a..2633bdcdeb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/model/GroupSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/model/GroupSummary.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.group.model
+package org.matrix.android.sdk.api.session.group.model
 
-import im.vector.matrix.android.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.Membership
 
 /**
  * This class holds some data of a group.
- * It can be retrieved through [im.vector.matrix.android.api.session.group.GroupService]
+ * It can be retrieved through [org.matrix.android.sdk.api.session.group.GroupService]
  */
 data class GroupSummary(
         val groupId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilities.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilities.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
index 148d75282e..de7ac45bf3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilities.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.homeserver
+package org.matrix.android.sdk.api.session.homeserver
 
 data class HomeServerCapabilities(
         /**
@@ -37,7 +38,11 @@ data class HomeServerCapabilities(
          * Option to allow homeserver admins to set the default E2EE behaviour back to disabled for DMs / private rooms
          * (as it was before) for various environments where this is desired.
          */
-        val adminE2EByDefault: Boolean = true
+        val adminE2EByDefault: Boolean = true,
+        /**
+         * Preferred Jitsi domain, provided in Wellknown
+         */
+        val preferredJitsiDomain: String? = null
 ) {
     companion object {
         const val MAX_UPLOAD_FILE_SIZE_UNKNOWN = -1L
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilitiesService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilitiesService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
index e8b38735cf..bcf1052b98 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilitiesService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.homeserver
+package org.matrix.android.sdk.api.session.homeserver
 
 /**
  * This interface defines a method to retrieve the homeserver capabilities.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/FoundThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/FoundThreePid.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/FoundThreePid.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/FoundThreePid.kt
index 5817699636..2ac1720400 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/FoundThreePid.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/FoundThreePid.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.identity
+package org.matrix.android.sdk.api.session.identity
 
 data class FoundThreePid(
         val threePid: ThreePid,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
index 2f2821d7a8..2a4054114e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.identity
+package org.matrix.android.sdk.api.session.identity
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * Provides access to the identity server configuration and services identity server can provide
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityServiceError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityServiceError.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt
index d0cb5332a1..a9f8ccb9d3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityServiceError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.identity
+package org.matrix.android.sdk.api.session.identity
 
-import im.vector.matrix.android.api.failure.Failure
+import org.matrix.android.sdk.api.failure.Failure
 
 sealed class IdentityServiceError : Failure.FeatureFailure() {
     object OutdatedIdentityServer : IdentityServiceError()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityServiceListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceListener.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityServiceListener.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceListener.kt
index 13f622fe77..f01d4e97c3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityServiceListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceListener.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.identity
+package org.matrix.android.sdk.api.session.identity
 
 interface IdentityServiceListener {
     fun onIdentityServerChange()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/SharedState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/SharedState.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/SharedState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/SharedState.kt
index 88cac776d6..3dae4b43ee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/SharedState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/SharedState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.identity
+package org.matrix.android.sdk.api.session.identity
 
 enum class SharedState {
     SHARED,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/ThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/ThreePid.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt
index 2a453ca1a6..de4e0a9a5a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/ThreePid.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.identity
+package org.matrix.android.sdk.api.session.identity
 
 import com.google.i18n.phonenumbers.NumberParseException
 import com.google.i18n.phonenumbers.PhoneNumberUtil
-import im.vector.matrix.android.internal.session.profile.ThirdPartyIdentifier
+import org.matrix.android.sdk.internal.session.profile.ThirdPartyIdentifier
 
 sealed class ThreePid(open val value: String) {
     data class Email(val email: String) : ThreePid(email)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerConfig.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt
index 44a39ae3ff..0bee245537 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.integrationmanager
+package org.matrix.android.sdk.api.session.integrationmanager
 
 /**
  * This class holds configuration of integration manager.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt
index b5b34e2f30..003e8bc9aa 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.integrationmanager
+package org.matrix.android.sdk.api.session.integrationmanager
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This is the entry point to manage integration. You can grab an instance of this service through an active session.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixLinkify.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixLinkify.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt
index cd4ce1206e..8927f06c77 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixLinkify.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.permalinks
+package org.matrix.android.sdk.api.session.permalinks
 
 import android.text.Spannable
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixPermalinkSpan.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixPermalinkSpan.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt
index afba5ab040..a660930646 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixPermalinkSpan.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.permalinks
+package org.matrix.android.sdk.api.session.permalinks
 
 import android.text.style.ClickableSpan
 import android.view.View
-import im.vector.matrix.android.api.permalinks.MatrixPermalinkSpan.Callback
+import org.matrix.android.sdk.api.session.permalinks.MatrixPermalinkSpan.Callback
 
 /**
  * This MatrixPermalinkSpan is a clickable span which use a [Callback] to communicate back.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
index ecdbe86b98..85632d6e83 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.permalinks
+package org.matrix.android.sdk.api.session.permalinks
 
 import android.net.Uri
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkParser.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt
index 871c30e46a..dd6847f1e3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.permalinks
+package org.matrix.android.sdk.api.session.permalinks
 
 import android.net.Uri
-import im.vector.matrix.android.api.MatrixPatterns
+import org.matrix.android.sdk.api.MatrixPatterns
 
 /**
  * This class turns an uri to a [PermalinkData]
@@ -36,7 +37,7 @@ object PermalinkParser {
      * Turns an uri to a [PermalinkData]
      */
     fun parse(uri: Uri): PermalinkData {
-        if (!uri.toString().startsWith(PermalinkFactory.MATRIX_TO_URL_BASE)) {
+        if (!uri.toString().startsWith(PermalinkService.MATRIX_TO_URL_BASE)) {
             return PermalinkData.FallbackLink(uri)
         }
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt
similarity index 54%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt
index 03c5149e6b..804cde5b30 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,55 +15,58 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.permalinks
+package org.matrix.android.sdk.api.session.permalinks
 
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 /**
  * Useful methods to create Matrix permalink (matrix.to links).
  */
-object PermalinkFactory {
+interface PermalinkService {
 
-    const val MATRIX_TO_URL_BASE = "https://matrix.to/#/"
+    companion object {
+        const val MATRIX_TO_URL_BASE = "https://matrix.to/#/"
+    }
 
     /**
      * Creates a permalink for an event.
      * Ex: "https://matrix.to/#/!nbzmcXAqpxBXjAdgoX:matrix.org/$1531497316352799BevdV:matrix.org"
      *
      * @param event the event
+     *
      * @return the permalink, or null in case of error
      */
-    fun createPermalink(event: Event): String? {
-        if (event.roomId.isNullOrEmpty() || event.eventId.isNullOrEmpty()) {
-            return null
-        }
-        return createPermalink(event.roomId, event.eventId)
-    }
+    fun createPermalink(event: Event): String?
 
     /**
-     * Creates a permalink for an id (can be a user Id, Room Id, etc.).
+     * Creates a permalink for an id (can be a user Id, etc.).
+     * For a roomId, consider using [createRoomPermalink]
      * Ex: "https://matrix.to/#/@benoit:matrix.org"
      *
      * @param id the id
      * @return the permalink, or null in case of error
      */
-    fun createPermalink(id: String): String? {
-        return if (id.isEmpty()) {
-            null
-        } else MATRIX_TO_URL_BASE + escape(id)
-    }
+    fun createPermalink(id: String): String?
 
     /**
-     * Creates a permalink for an event. If you have an event you can use [.createPermalink]
-     * Ex: "https://matrix.to/#/!nbzmcXAqpxBXjAdgoX:matrix.org/$1531497316352799BevdV:matrix.org"
+     * Creates a permalink for a roomId, including the via parameters
+     *
+     * @param roomId the room id
+     *
+     * @return the permalink, or null in case of error
+     */
+    fun createRoomPermalink(roomId: String): String?
+
+    /**
+     * Creates a permalink for an event. If you have an event you can use [createPermalink]
+     * Ex: "https://matrix.to/#/!nbzmcXAqpxBXjAdgoX:matrix.org/$1531497316352799BevdV:matrix.org?via=matrix.org"
      *
      * @param roomId  the id of the room
      * @param eventId the id of the event
+     *
      * @return the permalink
      */
-    fun createPermalink(roomId: String, eventId: String): String {
-        return MATRIX_TO_URL_BASE + escape(roomId) + "/" + escape(eventId)
-    }
+    fun createPermalink(roomId: String, eventId: String): String
 
     /**
      * Extract the linked id from the universal link
@@ -70,31 +74,5 @@ object PermalinkFactory {
      * @param url the universal link, Ex: "https://matrix.to/#/@benoit:matrix.org"
      * @return the id from the url, ex: "@benoit:matrix.org", or null if the url is not a permalink
      */
-    fun getLinkedId(url: String): String? {
-        val isSupported = url.startsWith(MATRIX_TO_URL_BASE)
-
-        return if (isSupported) {
-            url.substring(MATRIX_TO_URL_BASE.length)
-        } else null
-    }
-
-    /**
-     * Escape '/' in id, because it is used as a separator
-     *
-     * @param id the id to escape
-     * @return the escaped id
-     */
-    internal fun escape(id: String): String {
-        return id.replace("/", "%2F")
-    }
-
-    /**
-     * Unescape '/' in id
-     *
-     * @param id the id to escape
-     * @return the escaped id
-     */
-    internal fun unescape(id: String): String {
-        return id.replace("%2F", "/")
-    }
+    fun getLinkedId(url: String): String?
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/profile/ProfileService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index d7569bbc18..449c670983 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +16,15 @@
  *
  */
 
-package im.vector.matrix.android.api.session.profile
+package org.matrix.android.sdk.api.session.profile
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.api.util.Optional
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.api.util.Optional
 
 /**
  * This interface defines methods to handling profile information. It's implemented at the session level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/Pusher.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/Pusher.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
index ba0af7d4dc..6cc089e152 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/Pusher.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.pushers
+package org.matrix.android.sdk.api.session.pushers
 
 data class Pusher(
         val pushKey: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/PushersService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index e87773db38..f42721f485 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.pushers
+package org.matrix.android.sdk.api.session.pushers
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 import java.util.UUID
 
 interface PushersService {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
similarity index 55%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 231eaa5806..3d8550adf0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,25 +15,25 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room
+package org.matrix.android.sdk.api.session.room
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.session.room.call.RoomCallService
-import im.vector.matrix.android.api.session.room.crypto.RoomCryptoService
-import im.vector.matrix.android.api.session.room.members.MembershipService
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.relation.RelationService
-import im.vector.matrix.android.api.session.room.notification.RoomPushRuleService
-import im.vector.matrix.android.api.session.room.read.ReadService
-import im.vector.matrix.android.api.session.room.reporting.ReportingService
-import im.vector.matrix.android.api.session.room.send.DraftService
-import im.vector.matrix.android.api.session.room.send.SendService
-import im.vector.matrix.android.api.session.room.state.StateService
-import im.vector.matrix.android.api.session.room.tags.TagsService
-import im.vector.matrix.android.api.session.room.timeline.TimelineService
-import im.vector.matrix.android.api.session.room.typing.TypingService
-import im.vector.matrix.android.api.session.room.uploads.UploadsService
-import im.vector.matrix.android.api.util.Optional
+import org.matrix.android.sdk.api.session.room.call.RoomCallService
+import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
+import org.matrix.android.sdk.api.session.room.members.MembershipService
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.relation.RelationService
+import org.matrix.android.sdk.api.session.room.notification.RoomPushRuleService
+import org.matrix.android.sdk.api.session.room.read.ReadService
+import org.matrix.android.sdk.api.session.room.reporting.ReportingService
+import org.matrix.android.sdk.api.session.room.send.DraftService
+import org.matrix.android.sdk.api.session.room.send.SendService
+import org.matrix.android.sdk.api.session.room.state.StateService
+import org.matrix.android.sdk.api.session.room.tags.TagsService
+import org.matrix.android.sdk.api.session.room.timeline.TimelineService
+import org.matrix.android.sdk.api.session.room.typing.TypingService
+import org.matrix.android.sdk.api.session.room.uploads.UploadsService
+import org.matrix.android.sdk.api.util.Optional
 
 /**
  * This interface defines methods to interact within a room.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomDirectoryService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomDirectoryService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
index 7014fbff37..17d3a2a95a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomDirectoryService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room
+package org.matrix.android.sdk.api.session.room
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsParams
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsResponse
-import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
+import org.matrix.android.sdk.api.session.room.model.thirdparty.ThirdPartyProtocol
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to get and join public rooms. It's implemented at the session level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 4e7b973bba..1161dce518 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room
+package org.matrix.android.sdk.api.session.room
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.Optional
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Optional
 
 /**
  * This interface defines methods to get rooms. It's implemented at the session level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomSummaryQueryParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index 51df30ad75..5af23f8e24 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room
+package org.matrix.android.sdk.api.session.room
 
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.room.model.Membership
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.room.model.Membership
 
 fun roomSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {}): RoomSummaryQueryParams {
     return RoomSummaryQueryParams.Builder().apply(init).build()
@@ -25,7 +26,7 @@ fun roomSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {
 
 /**
  * This class can be used to filter room summaries to use with:
- * [im.vector.matrix.android.api.session.room.Room] and [im.vector.matrix.android.api.session.room.RoomService]
+ * [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
  */
 data class RoomSummaryQueryParams(
         val roomId: QueryStringValue,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/call/RoomCallService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/call/RoomCallService.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/call/RoomCallService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/call/RoomCallService.kt
index b1dc0899bb..0ec27fdd5d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/call/RoomCallService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/call/RoomCallService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.call
+package org.matrix.android.sdk.api.session.room.call
 
 /**
  * This interface defines methods to handle calls in a room. It's implemented at the room level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/crypto/RoomCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/crypto/RoomCryptoService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
index 920bea1b6b..b7f018bda8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/crypto/RoomCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.crypto
+package org.matrix.android.sdk.api.session.room.crypto
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 
 interface RoomCryptoService {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/CreateRoomFailure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt
similarity index 64%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/CreateRoomFailure.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt
index 263f699e62..508cf5ea1d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/CreateRoomFailure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.failure
+package org.matrix.android.sdk.api.session.room.failure
 
-import im.vector.matrix.android.api.failure.Failure
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
 
 sealed class CreateRoomFailure : Failure.FeatureFailure() {
-
-    object CreatedWithTimeout: CreateRoomFailure()
+    object CreatedWithTimeout : CreateRoomFailure()
+    data class CreatedWithFederationFailure(val matrixError: MatrixError) : CreateRoomFailure()
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/JoinRoomFailure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/JoinRoomFailure.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/JoinRoomFailure.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/JoinRoomFailure.kt
index 80393e5d3d..ef15fbc7c1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/JoinRoomFailure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/JoinRoomFailure.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.failure
+package org.matrix.android.sdk.api.session.room.failure
 
-import im.vector.matrix.android.api.failure.Failure
+import org.matrix.android.sdk.api.failure.Failure
 
 sealed class JoinRoomFailure : Failure.FeatureFailure() {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/ChangeMembershipState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/ChangeMembershipState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt
index 1094f9cb21..6d13b0bf94 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/ChangeMembershipState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.members
+package org.matrix.android.sdk.api.session.room.members
 
 sealed class ChangeMembershipState() {
     object Unknown : ChangeMembershipState()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/MembershipService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/MembershipService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
index bb74b5afa5..5c9a50dc0c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/MembershipService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.members
+package org.matrix.android.sdk.api.session.room.members
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to handling membership. It's implemented at the room level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/RoomMemberQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/RoomMemberQueryParams.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/RoomMemberQueryParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/RoomMemberQueryParams.kt
index b3260c28fd..39fc7598f6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/RoomMemberQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/RoomMemberQueryParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.members
+package org.matrix.android.sdk.api.session.room.members
 
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.room.model.Membership
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.room.model.Membership
 
 fun roomMemberQueryParams(init: (RoomMemberQueryParams.Builder.() -> Unit) = {}): RoomMemberQueryParams {
     return RoomMemberQueryParams.Builder().apply(init).build()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/EditAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/EditAggregatedSummary.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
index 759ba1ecd3..721dcf4f2e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/EditAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
-import im.vector.matrix.android.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Content
 
 data class EditAggregatedSummary(
         val aggregatedContent: Content? = null,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/EventAnnotationsSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/EventAnnotationsSummary.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt
index 5b5e18707d..d1b0c89410 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/EventAnnotationsSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 data class EventAnnotationsSummary(
         var eventId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Invite.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Invite.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Invite.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Invite.kt
index c439143de5..6b3a333672 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Invite.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Invite.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Membership.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Membership.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
index c4e3f16e9b..fc89ff06df 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Membership.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PollResponseAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollResponseAggregatedSummary.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PollResponseAggregatedSummary.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollResponseAggregatedSummary.kt
index 3256e5d7e1..695a3353d5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PollResponseAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollResponseAggregatedSummary.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 data class PollResponseAggregatedSummary(
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PollSummaryContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PollSummaryContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt
index 2e6e3ed349..07d62a173c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PollSummaryContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PowerLevelsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PowerLevelsContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt
index a14190eb47..e55508c9db 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PowerLevelsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.room.powerlevels.Role
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
 
 /**
  * Class representing the EventType.EVENT_TYPE_STATE_ROOM_POWER_LEVELS state event content.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReactionAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReactionAggregatedSummary.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReactionAggregatedSummary.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReactionAggregatedSummary.kt
index 5ab4804fae..97fd0a16ab 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReactionAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReactionAggregatedSummary.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 data class ReactionAggregatedSummary(
         val key: String,                // "👍"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReadReceipt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReadReceipt.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt
index 4bb31bccdc..d6ced198d7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReadReceipt.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
-import im.vector.matrix.android.api.session.user.model.User
+import org.matrix.android.sdk.api.session.user.model.User
 
 data class ReadReceipt(
         val user: User,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReferencesAggregatedContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReferencesAggregatedContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt
index 31a5694682..82291fa062 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReferencesAggregatedContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.session.room.VerificationState
+import org.matrix.android.sdk.internal.session.room.VerificationState
 
 /**
  * Contains an aggregated summary info of the references.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReferencesAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReferencesAggregatedSummary.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt
index 018436ad6b..298567262a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReferencesAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
-import im.vector.matrix.android.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Content
 
 /**
  * Events can relates to other events, this object keeps a summary
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAliasesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAliasesContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt
index 8a857a1c02..94628e6987 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAliasesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAvatarContent.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAvatarContent.kt
index fc0814817c..ded2e49657 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAvatarContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomCanonicalAliasContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomCanonicalAliasContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt
index 0aec7f6c8b..d5f41b66dc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomCanonicalAliasContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomDirectoryVisibility.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomDirectoryVisibility.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomDirectoryVisibility.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomDirectoryVisibility.kt
index 3e63636fc6..bd37884407 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomDirectoryVisibility.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomDirectoryVisibility.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomGuestAccessContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomGuestAccessContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
index 36e2d769a3..d2b944c0eb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomGuestAccessContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibility.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibility.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
index 44ad777c0e..d6546b1065 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibility.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibilityContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibilityContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
index 96bd910781..8955320d89 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibilityContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomJoinRules.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomJoinRules.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
index e4ebcc7044..d6c947b753 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomJoinRules.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  *
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomJoinRulesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomJoinRulesContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
index cf6b182e2d..14a88885b6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomJoinRulesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  *
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomMemberContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberContent.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomMemberContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberContent.kt
index deeeb8ba52..278db67a0e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomMemberContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.UnsignedData
+import org.matrix.android.sdk.api.session.events.model.UnsignedData
 
 /**
  * Class representing the EventType.STATE_ROOM_MEMBER state event content
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomMemberSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberSummary.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomMemberSummary.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberSummary.kt
index 8641425214..17b0cf30b1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomMemberSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberSummary.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 /**
  * Class representing a simplified version of EventType.STATE_ROOM_MEMBER state event content
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomNameContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomNameContent.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomNameContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomNameContent.kt
index 72bdaf1d36..c3d93a5a16 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomNameContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomNameContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index 19eac8dc32..0df86e09d7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.matrix.android.api.session.room.model.tag.RoomTag
-import im.vector.matrix.android.api.session.room.send.UserDraft
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
+import org.matrix.android.sdk.api.session.room.send.UserDraft
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 /**
  * This class holds some data of a room.
- * It can be retrieved by [im.vector.matrix.android.api.session.room.Room] and [im.vector.matrix.android.api.session.room.RoomService]
+ * It can be retrieved by [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
  */
 data class RoomSummary constructor(
         val roomId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomThirdPartyInviteContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomThirdPartyInviteContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt
index fa871d186e..f8372f3142 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomThirdPartyInviteContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomTopicContent.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomTopicContent.kt
index 2439618f46..38d3ca93f4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomTopicContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Signed.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Signed.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt
index 43b957bde3..9c14275b3e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Signed.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/VersioningState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/VersioningState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
index a878e10e3f..202d64d621 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/VersioningState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model
 
 enum class VersioningState {
     NONE,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallAnswerContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallAnswerContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt
index 7fb575d12c..2e21ebea86 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallAnswerContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.call
+package org.matrix.android.sdk.api.session.room.model.call
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallCandidatesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallCandidatesContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt
index 4b71320c32..6a6f1c82c3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallCandidatesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.call
+package org.matrix.android.sdk.api.session.room.model.call
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallHangupContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallHangupContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt
index 1cb379b508..aef774008c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallHangupContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.call
+package org.matrix.android.sdk.api.session.room.model.call
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallInviteContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallInviteContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt
index b165575ba0..6baef034c2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallInviteContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.call
+package org.matrix.android.sdk.api.session.room.model.call
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/SdpType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/SdpType.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt
index 799792c8a3..a760e6ef93 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/SdpType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.call
+package org.matrix.android.sdk.api.session.room.model.call
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index f89558801d..2e78ae10f9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.create
+package org.matrix.android.sdk.api.session.room.model.create
 
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 
 // TODO Give a way to include other initial states
 class CreateRoomParams {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomPreset.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomPreset.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomPreset.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomPreset.kt
index 109ef7f9bd..7bc4f664c5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomPreset.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomPreset.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.create
+package org.matrix.android.sdk.api.session.room.model.create
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/Predecessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/Predecessor.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/Predecessor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/Predecessor.kt
index 960f91306f..fb726808e9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/Predecessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/Predecessor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.create
+package org.matrix.android.sdk.api.session.room.model.create
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/RoomCreateContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/RoomCreateContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
index 323c7d7445..2a9b4ca9cf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/RoomCreateContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.create
+package org.matrix.android.sdk.api.session.room.model.create
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioInfo.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioInfo.kt
index 877746705f..7b0097db2c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/FileInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/FileInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
index b8ed516d9d..290909ded1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/FileInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
 data class FileInfo(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ImageInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ImageInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
index 20af927e46..26c196bb14 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ImageInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
 data class ImageInfo(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/LocationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/LocationInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt
index ab6e5e66e9..258fd75c94 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/LocationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
 data class LocationInfo(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageAudioContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageAudioContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt
index a0f4655f4b..14022075c2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageAudioContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
 data class MessageAudioContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContent.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContent.kt
index 32c446cb54..8b5c98d250 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
 interface MessageContent {
     val msgType: String
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContentWithFormattedBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContentWithFormattedBody.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContentWithFormattedBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContentWithFormattedBody.kt
index b51e3eb841..15609dca3b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContentWithFormattedBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContentWithFormattedBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 interface MessageContentWithFormattedBody : MessageContent {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageDefaultContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageDefaultContent.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageDefaultContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageDefaultContent.kt
index 7a5c7e2cd5..2b033755bd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageDefaultContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageDefaultContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
 @JsonClass(generateAdapter = true)
 data class MessageDefaultContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEmoteContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEmoteContent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEmoteContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEmoteContent.kt
index 7b63959f78..36ec85ebf0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEmoteContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEmoteContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
 @JsonClass(generateAdapter = true)
 data class MessageEmoteContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageFileContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFileContent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageFileContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFileContent.kt
index 067d08e5b8..bbdb2835b1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageFileContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFileContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import android.webkit.MimeTypeMap
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
 data class MessageFileContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageFormat.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFormat.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageFormat.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFormat.kt
index 3effa9a630..c32b0586ea 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageFormat.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFormat.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 object MessageFormat {
     const val FORMAT_MATRIX_HTML = "org.matrix.custom.html"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageImageContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageImageContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt
index 75ae5f0323..48e30508bc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageImageContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
 data class MessageImageContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageImageInfoContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageInfoContent.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageImageInfoContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageInfoContent.kt
index be0b5c4bb7..e14d531a4f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageImageInfoContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageInfoContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  *
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 /**
  * A content with image information
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageLocationContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageLocationContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
index 4bbd821819..3452e291eb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageLocationContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
 @JsonClass(generateAdapter = true)
 data class MessageLocationContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageNoticeContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageNoticeContent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageNoticeContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageNoticeContent.kt
index 41e63bb457..7c2dd2a196 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageNoticeContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageNoticeContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
 @JsonClass(generateAdapter = true)
 data class MessageNoticeContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageOptionsContent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageOptionsContent.kt
index 33b133afaf..caaf5151af 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageOptionsContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
 // Possible values for optionType
 const val OPTION_TYPE_POLL = "org.matrix.poll"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessagePollResponseContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessagePollResponseContent.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessagePollResponseContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessagePollResponseContent.kt
index dfd8059b9a..a7dd0160cb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessagePollResponseContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessagePollResponseContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
 /**
  * Ref: https://github.com/matrix-org/matrix-doc/pull/2192
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageRelationContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageRelationContent.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageRelationContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageRelationContent.kt
index f65215e2bf..a97c0f86e3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageRelationContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageRelationContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  *
  */
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
 @JsonClass(generateAdapter = true)
 data class MessageRelationContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageStickerContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageStickerContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
index 6730768d7d..fad04941f7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageStickerContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
 data class MessageStickerContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageTextContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageTextContent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageTextContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageTextContent.kt
index d6c54e3ff5..ea8685ae71 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageTextContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageTextContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
 @JsonClass(generateAdapter = true)
 data class MessageTextContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
index c244500c9e..026132b7c5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 object MessageType {
     const val MSGTYPE_TEXT = "m.text"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationAcceptContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationAcceptContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt
index 074776bc34..d7a8a4a6f8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationAcceptContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAccept
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAcceptFactory
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoAccept
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoAcceptFactory
 
 @JsonClass(generateAdapter = true)
 internal data class MessageVerificationAcceptContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationCancelContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationCancelContent.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationCancelContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationCancelContent.kt
index aa72bfe272..944599a153 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationCancelContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationCancelContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoCancel
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoCancel
 
 @JsonClass(generateAdapter = true)
 data class MessageVerificationCancelContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationDoneContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationDoneContent.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationDoneContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationDoneContent.kt
index 509b63e831..13593b60b8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationDoneContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationDoneContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfo
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfo
 
 @JsonClass(generateAdapter = true)
 internal data class MessageVerificationDoneContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationKeyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationKeyContent.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationKeyContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationKeyContent.kt
index cfd3f438b8..00d4e2cd0b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationKeyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationKeyContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoKey
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoKeyFactory
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoKey
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoKeyFactory
 
 @JsonClass(generateAdapter = true)
 internal data class MessageVerificationKeyContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationMacContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationMacContent.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationMacContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationMacContent.kt
index 043e89cc38..9ac43e49d0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationMacContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationMacContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoMac
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoMacFactory
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoMac
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoMacFactory
 
 @JsonClass(generateAdapter = true)
 internal data class MessageVerificationMacContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationReadyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationReadyContent.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationReadyContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationReadyContent.kt
index da16d21c1a..eafdb30ecf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationReadyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationReadyContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.verification.MessageVerificationReadyFactory
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoReady
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.verification.MessageVerificationReadyFactory
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoReady
 
 @JsonClass(generateAdapter = true)
 internal data class MessageVerificationReadyContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationRequestContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationRequestContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt
index 5010982e8b..b89ff07552 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationRequestContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoRequest
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoRequest
 
 @JsonClass(generateAdapter = true)
 data class MessageVerificationRequestContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationStartContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationStartContent.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationStartContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationStartContent.kt
index 1db65d8888..c6c5cb6208 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationStartContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationStartContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoStart
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoStart
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 
 @JsonClass(generateAdapter = true)
 internal data class MessageVerificationStartContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVideoContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVideoContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
index 34d599595f..02456e6b0f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVideoContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
 data class MessageVideoContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageWithAttachmentContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageWithAttachmentContent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageWithAttachmentContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageWithAttachmentContent.kt
index 0613f69c56..af07d37efd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageWithAttachmentContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageWithAttachmentContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 /**
  * Interface for message which can contains an encrypted file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/OptionItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/OptionItem.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/OptionItem.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/OptionItem.kt
index 0ea9e246ba..b6e7979040 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/OptionItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/OptionItem.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ThumbnailInfo.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ThumbnailInfo.kt
index 0ee6b88e01..bedbe52641 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ThumbnailInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/VideoInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/VideoInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
index da247810cb..b16c3dd823 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/VideoInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.message
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
 data class VideoInfo(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReactionContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionContent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReactionContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionContent.kt
index 29144da90d..8f2b2c7fac 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReactionContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.relation
+package org.matrix.android.sdk.api.session.room.model.relation
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReactionInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionInfo.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReactionInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionInfo.kt
index 622250da4e..97577c90d1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReactionInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.relation
+package org.matrix.android.sdk.api.session.room.model.relation
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationContent.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationContent.kt
index d43c9f6a0c..a3822118c0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.relation
+package org.matrix.android.sdk.api.session.room.model.relation
 
-import im.vector.matrix.android.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.RelationType
 
 interface RelationContent {
     /** See [RelationType] for known possible values */
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationDefaultContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationDefaultContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt
index 892fc61dee..eedc23518f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationDefaultContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.relation
+package org.matrix.android.sdk.api.session.room.model.relation
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
index 31ed4e9986..b3d739fc62 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.relation
+package org.matrix.android.sdk.api.session.room.model.relation
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.Optional
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Optional
 
 /**
  * In some cases, events may wish to reference other events.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt
index 9ed629acda..57d8adb6d6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.relation
+package org.matrix.android.sdk.api.session.room.model.relation
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoom.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoom.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoom.kt
index efe2debeab..0429eba1b0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoom.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.roomdirectory
+package org.matrix.android.sdk.api.session.room.model.roomdirectory
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoomsFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsFilter.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoomsFilter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsFilter.kt
index c519d054f2..041b804576 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoomsFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsFilter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.roomdirectory
+package org.matrix.android.sdk.api.session.room.model.roomdirectory
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoomsParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsParams.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoomsParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsParams.kt
index 467968cd2a..c69cde72b7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoomsParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsParams.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.roomdirectory
+package org.matrix.android.sdk.api.session.room.model.roomdirectory
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoomsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsResponse.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoomsResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsResponse.kt
index b83fa51491..39f24d658c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/roomdirectory/PublicRoomsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.roomdirectory
+package org.matrix.android.sdk.api.session.room.model.roomdirectory
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTag.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTag.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTag.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTag.kt
index 6826824278..f5303773bc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTag.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTag.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.tag
+package org.matrix.android.sdk.api.session.room.model.tag
 
 data class RoomTag(
         val name: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTagContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTagContent.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTagContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTagContent.kt
index 388f494d41..15b83a4af1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTagContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTagContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.tag
+package org.matrix.android.sdk.api.session.room.model.tag
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/FieldType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/FieldType.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/FieldType.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/FieldType.kt
index 2e9f69568c..36bc949606 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/FieldType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/FieldType.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.thirdparty
+package org.matrix.android.sdk.api.session.room.model.thirdparty
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/RoomDirectoryData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/RoomDirectoryData.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/RoomDirectoryData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/RoomDirectoryData.kt
index e651500af1..e2cdd25b7c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/RoomDirectoryData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/RoomDirectoryData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.thirdparty
+package org.matrix.android.sdk.api.session.room.model.thirdparty
 
 /**
  * This class describes a rooms directory server.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocol.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
index b4ed1f1a8e..ebc147e69f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.thirdparty
+package org.matrix.android.sdk.api.session.room.model.thirdparty
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
index f5d59f9282..04e5481259 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.model.thirdparty
+package org.matrix.android.sdk.api.session.room.model.thirdparty
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tombstone/RoomTombstoneContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tombstone/RoomTombstoneContent.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tombstone/RoomTombstoneContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tombstone/RoomTombstoneContent.kt
index 4dfcdd86f5..43b56c8b9d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tombstone/RoomTombstoneContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tombstone/RoomTombstoneContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.session.room.model.tombstone
+package org.matrix.android.sdk.api.session.room.model.tombstone
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomNotificationState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomNotificationState.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomNotificationState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomNotificationState.kt
index a638b2710c..42971e874a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomNotificationState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomNotificationState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.notification
+package org.matrix.android.sdk.api.session.room.notification
 
 /**
  * Defines the room notification state
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomPushRuleService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt
index 41cd484ef9..79070adea3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.notification
+package org.matrix.android.sdk.api.session.room.notification
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 interface RoomPushRuleService {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/powerlevels/PowerLevelsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/powerlevels/PowerLevelsHelper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
index f434859f6e..34e3168ce1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/powerlevels/PowerLevelsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +16,9 @@
  *
  */
 
-package im.vector.matrix.android.api.session.room.powerlevels
+package org.matrix.android.sdk.api.session.room.powerlevels
 
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 
 /**
  * This class is an helper around PowerLevelsContent.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/powerlevels/Role.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/powerlevels/Role.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt
index 099adcabdf..5ac479786e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/powerlevels/Role.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +16,10 @@
  *
  */
 
-package im.vector.matrix.android.api.session.room.powerlevels
+package org.matrix.android.sdk.api.session.room.powerlevels
 
 import androidx.annotation.StringRes
-import im.vector.matrix.android.R
+import org.matrix.android.sdk.R
 
 sealed class Role(open val value: Int, @StringRes val res: Int) : Comparable<Role> {
     object Admin : Role(100, R.string.power_level_admin)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/read/ReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/read/ReadService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
index 23b2fbeb66..3aa9d60e6a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/read/ReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.read
+package org.matrix.android.sdk.api.session.room.read
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.room.model.ReadReceipt
-import im.vector.matrix.android.api.util.Optional
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.model.ReadReceipt
+import org.matrix.android.sdk.api.util.Optional
 
 /**
  * This interface defines methods to handle read receipts and read marker in a room. It's implemented at the room level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/reporting/ReportingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/reporting/ReportingService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt
index 71ce02ac69..42a21fab90 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/reporting/ReportingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.reporting
+package org.matrix.android.sdk.api.session.room.reporting
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to report content of an event.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/DraftService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/DraftService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt
index ffb15f4632..dc91d5177f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/DraftService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.send
+package org.matrix.android.sdk.api.session.room.send
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 interface DraftService {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/MatrixItemSpan.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/MatrixItemSpan.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/MatrixItemSpan.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/MatrixItemSpan.kt
index d191f5197b..a96339a111 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/MatrixItemSpan.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/MatrixItemSpan.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.send
+package org.matrix.android.sdk.api.session.room.send
 
-import im.vector.matrix.android.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.MatrixItem
 
 /**
  * Tag class for spans that should mention a matrix item.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
index d0d1d2faf5..e84b75d0af 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.send
+package org.matrix.android.sdk.api.session.room.send
 
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.message.OptionItem
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.OptionItem
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to send events in a room. It's implemented at the room level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
index cfe3c9ae1a..f0dd2f3025 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.send
+package org.matrix.android.sdk.api.session.room.send
 
 enum class SendState {
     UNKNOWN,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/UserDraft.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/UserDraft.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt
index 8912cc2580..b5542b7d63 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/UserDraft.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.send
+package org.matrix.android.sdk.api.session.room.send
 
 /**
  * Describes a user draft:
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/sender/SenderInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/sender/SenderInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt
index 1a0908a6d3..b2836ecaae 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/sender/SenderInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.sender
+package org.matrix.android.sdk.api.session.room.sender
 
 data class SenderInfo(
         val userId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/state/StateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/state/StateService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt
index 9c70baefd3..f887a8b854 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/state/StateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.state
+package org.matrix.android.sdk.api.session.room.state
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.api.util.Optional
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.api.util.Optional
 
 interface StateService {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/tags/TagsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/tags/TagsService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt
index a4d05224ea..62f9560315 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/tags/TagsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.tags
+package org.matrix.android.sdk.api.session.room.tags
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to handle tags of a room. It's implemented at the room level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/Timeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/Timeline.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
index 19ff65dbe2..8920689d97 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/Timeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.timeline
+package org.matrix.android.sdk.api.session.room.timeline
 
 /**
  * A Timeline instance represents a contiguous sequence of events in a room.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
index 5f0db3e206..1f3c85afe6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.timeline
+package org.matrix.android.sdk.api.session.room.timeline
 
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.getRelationContent
-import im.vector.matrix.android.api.session.events.model.isReply
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary
-import im.vector.matrix.android.api.session.room.model.ReadReceipt
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageStickerContent
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
-import im.vector.matrix.android.api.util.ContentUtils.extractUsefulTextFromReply
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.getRelationContent
+import org.matrix.android.sdk.api.session.events.model.isReply
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
+import org.matrix.android.sdk.api.session.room.model.ReadReceipt
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.util.ContentUtils.extractUsefulTextFromReply
 
 /**
  * This data class is a wrapper around an Event. It allows to get useful data in the context of a timeline.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
index 2353fc1c30..473e505302 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.timeline
+package org.matrix.android.sdk.api.session.room.timeline
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.util.Optional
+import org.matrix.android.sdk.api.util.Optional
 
 /**
  * This interface defines methods to interact with the timeline. It's implemented at the room level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineSettings.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineSettings.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
index 60ccec3074..4f915cb907 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineSettings.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.timeline
+package org.matrix.android.sdk.api.session.room.timeline
 
 /**
  * Data class holding setting values for a [Timeline] instance.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/typing/TypingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/typing/TypingService.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/typing/TypingService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/typing/TypingService.kt
index 8ef550531e..eaa8d5c3df 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/typing/TypingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/typing/TypingService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.typing
+package org.matrix.android.sdk.api.session.room.typing
 
 /**
  * This interface defines methods to handle typing data. It's implemented at the room level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/uploads/GetUploadsResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/GetUploadsResult.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/uploads/GetUploadsResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/GetUploadsResult.kt
index 4c75d909aa..09b885e24d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/uploads/GetUploadsResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/GetUploadsResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.uploads
+package org.matrix.android.sdk.api.session.room.uploads
 
 data class GetUploadsResult(
         // List of fetched Events, most recent first
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/uploads/UploadEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadEvent.kt
similarity index 65%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/uploads/UploadEvent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadEvent.kt
index 5df2b9c9e0..16423cf3c5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/uploads/UploadEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadEvent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.uploads
+package org.matrix.android.sdk.api.session.room.uploads
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.message.MessageWithAttachmentContent
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 
 /**
  * Wrapper around on Event.
- * Similar to [im.vector.matrix.android.api.session.room.timeline.TimelineEvent], contains an Event with extra useful data
+ * Similar to [org.matrix.android.sdk.api.session.room.timeline.TimelineEvent], contains an Event with extra useful data
  */
 data class UploadEvent(
         val root: Event,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/uploads/UploadsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/uploads/UploadsService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt
index 54a87cdcd9..1cabdfc92a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/uploads/UploadsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.room.uploads
+package org.matrix.android.sdk.api.session.room.uploads
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to get event with uploads (= attachments) sent to a room. It's implemented at the room level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/EncryptedSecretContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/EncryptedSecretContent.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/EncryptedSecretContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/EncryptedSecretContent.kt
index 57fd652735..8c062b4203 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/EncryptedSecretContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/EncryptedSecretContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.securestorage
+package org.matrix.android.sdk.api.session.securestorage
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.internal.session.user.accountdata.AccountDataContent
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataContent
 
 /**
  * The account_data will have an encrypted property that is a map from key ID to an object.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/IntegrityResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/IntegrityResult.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/IntegrityResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/IntegrityResult.kt
index 70efa56c48..096f9f34a2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/IntegrityResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/IntegrityResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.securestorage
+package org.matrix.android.sdk.api.session.securestorage
 
 sealed class IntegrityResult {
     data class Success(val passphraseBased: Boolean) : IntegrityResult()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/KeyInfoResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeyInfoResult.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/KeyInfoResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeyInfoResult.kt
index 940f5298ef..287555ae95 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/KeyInfoResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeyInfoResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.securestorage
+package org.matrix.android.sdk.api.session.securestorage
 
 sealed class KeyInfoResult {
     data class Success(val keyInfo: KeyInfo) : KeyInfoResult()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/KeySigner.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeySigner.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/KeySigner.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeySigner.kt
index 242f9a8945..2d56fb81f3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/KeySigner.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeySigner.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.securestorage
+package org.matrix.android.sdk.api.session.securestorage
 
 interface KeySigner {
     fun sign(canonicalJson: String): Map<String, Map<String, String>>?
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SecretStorageKeyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecretStorageKeyContent.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SecretStorageKeyContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecretStorageKeyContent.kt
index 129f4bab9d..f960a43675 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SecretStorageKeyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecretStorageKeyContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.securestorage
+package org.matrix.android.sdk.api.session.securestorage
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 
 /**
  *
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SecureStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecureStorageService.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SecureStorageService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecureStorageService.kt
index bae8132990..89095268b3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SecureStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecureStorageService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.securestorage
+package org.matrix.android.sdk.api.session.securestorage
 
 import java.io.InputStream
 import java.io.OutputStream
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SharedSecretStorageError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SharedSecretStorageError.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt
index a6bf75f2c0..79e7fa51fe 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SharedSecretStorageError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.securestorage
+package org.matrix.android.sdk.api.session.securestorage
 
 sealed class SharedSecretStorageError(message: String?) : Throwable(message) {
     data class UnknownSecret(val secretName: String) : SharedSecretStorageError("Unknown Secret $secretName")
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SharedSecretStorageService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
index 22fbcf2d26..ffc7e3889d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.securestorage
+package org.matrix.android.sdk.api.session.securestorage
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
 
 /**
  * Some features may require clients to store encrypted data on the server so that it can be shared securely between clients.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SsssKeyCreationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeyCreationInfo.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SsssKeyCreationInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeyCreationInfo.kt
index 85823d9dbf..17f0366d16 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SsssKeyCreationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeyCreationInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.securestorage
+package org.matrix.android.sdk.api.session.securestorage
 
 data class SsssKeyCreationInfo(
         val keyId: String = "",
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SsssKeySpec.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeySpec.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SsssKeySpec.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeySpec.kt
index 1fe8fbb90d..9ae181a44e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SsssKeySpec.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeySpec.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.securestorage
+package org.matrix.android.sdk.api.session.securestorage
 
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.internal.crypto.keysbackup.deriveKey
-import im.vector.matrix.android.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.internal.crypto.keysbackup.deriveKey
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
 
 /** Tag class */
 interface SsssKeySpec
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/signout/SignOutService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/signout/SignOutService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt
index 3fb086ac45..d4061c5c7c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/signout/SignOutService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.signout
+package org.matrix.android.sdk.api.session.signout
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines a method to sign out, or to renew the token. It's implemented at the session level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/FilterService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/FilterService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
index e995e775a9..0389969948 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/FilterService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.sync
+package org.matrix.android.sdk.api.session.sync
 
 interface FilterService {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncState.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncState.kt
index 4890c28331..08d8be699a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.sync
+package org.matrix.android.sdk.api.session.sync
 
 sealed class SyncState {
     object Idle : SyncState()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/terms/GetTermsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/GetTermsResponse.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/terms/GetTermsResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/GetTermsResponse.kt
index 29c6a7a921..685f4ba9c3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/terms/GetTermsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/GetTermsResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.terms
+package org.matrix.android.sdk.api.session.terms
 
-import im.vector.matrix.android.internal.session.terms.TermsResponse
+import org.matrix.android.sdk.internal.session.terms.TermsResponse
 
 data class GetTermsResponse(
         val serverResponse: TermsResponse,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/terms/TermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/terms/TermsService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
index 36e6a411e3..3e2201cb29 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/terms/TermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.terms
+package org.matrix.android.sdk.api.session.terms
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 
 interface TermsService {
     enum class ServiceType {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/typing/TypingUsersTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/typing/TypingUsersTracker.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/typing/TypingUsersTracker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/typing/TypingUsersTracker.kt
index 4d1f1a9c45..e51fa45d72 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/typing/TypingUsersTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/typing/TypingUsersTracker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.typing
+package org.matrix.android.sdk.api.session.typing
 
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 
 /**
  * Responsible for tracking typing users from each room.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/UserService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/UserService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
index 1abda8ec05..b5617a206f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/UserService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.user
+package org.matrix.android.sdk.api.session.user
 
 import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.Optional
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Optional
 
 /**
  * This interface defines methods to get users. It's implemented at the session level.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/model/User.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/model/User.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/model/User.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/model/User.kt
index 9f4f997b3b..bf8551588e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/model/User.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/model/User.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.user.model
+package org.matrix.android.sdk.api.session.user.model
 
 /**
  * Data class which holds information about a user.
- * It can be retrieved with [im.vector.matrix.android.api.session.user.UserService]
+ * It can be retrieved with [org.matrix.android.sdk.api.session.user.UserService]
  */
 data class User(
         val userId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetManagementFailure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetManagementFailure.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetManagementFailure.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetManagementFailure.kt
index cd3bdb57ba..abbbf040ab 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetManagementFailure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetManagementFailure.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.widgets
+package org.matrix.android.sdk.api.session.widgets
 
-import im.vector.matrix.android.api.failure.Failure
+import org.matrix.android.sdk.api.failure.Failure
 
 sealed class WidgetManagementFailure : Failure.FeatureFailure() {
     object NotEnoughPower : WidgetManagementFailure()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetPostAPIMediator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetPostAPIMediator.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetPostAPIMediator.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetPostAPIMediator.kt
index bc39afda8f..4dba2a10e1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetPostAPIMediator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetPostAPIMediator.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.widgets
+package org.matrix.android.sdk.api.session.widgets
 
 import android.webkit.WebView
-import im.vector.matrix.android.api.util.JsonDict
+import org.matrix.android.sdk.api.util.JsonDict
 import java.lang.reflect.Type
 
 interface WidgetPostAPIMediator {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt
index 1f62a335a9..444708d992 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.widgets
+package org.matrix.android.sdk.api.session.widgets
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 
 /**
  * This is the entry point to manage widgets. You can grab an instance of this service through an active session.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetURLFormatter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetURLFormatter.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetURLFormatter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetURLFormatter.kt
index f2ba40c344..ad01679ee5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetURLFormatter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetURLFormatter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.widgets
+package org.matrix.android.sdk.api.session.widgets
 
 interface WidgetURLFormatter {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/Widget.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/Widget.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt
index 0b564d6496..9da2f224f7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/Widget.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.widgets.model
+package org.matrix.android.sdk.api.session.widgets.model
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 
 data class Widget(
         val widgetContent: WidgetContent,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt
index af70400622..1a3d397376 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.widgets.model
+package org.matrix.android.sdk.api.session.widgets.model
 
 import android.annotation.SuppressLint
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.util.JsonDict
+import org.matrix.android.sdk.api.util.JsonDict
 
 /**
  * Ref: https://github.com/matrix-org/matrix-doc/issues/1236
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetType.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetType.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetType.kt
index 3977a4c474..278a123699 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetType.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.session.widgets.model
+package org.matrix.android.sdk.api.session.widgets.model
 
 private val DEFINED_TYPES by lazy {
     listOf(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Cancelable.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Cancelable.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Cancelable.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Cancelable.kt
index 8473f50796..b1976f3921 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Cancelable.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Cancelable.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.util
+package org.matrix.android.sdk.api.util
 
 /**
  * An interface defining a unique cancel method.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/CancelableBag.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/CancelableBag.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/CancelableBag.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/CancelableBag.kt
index 145ddb6660..bc44e08c02 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/CancelableBag.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/CancelableBag.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.util
+package org.matrix.android.sdk.api.util
 
 class CancelableBag : Cancelable, MutableList<Cancelable> by ArrayList() {
     override fun cancel() {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/ContentUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/ContentUtils.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
index 9131cf143b..a11be96297 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/ContentUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.api.util
+package org.matrix.android.sdk.api.util
 
 object ContentUtils {
     fun extractUsefulTextFromReply(repliedBody: String): String {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/MatrixCallbackDelegate.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/MatrixCallbackDelegate.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt
index 06b157daeb..c72ae3d051 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/MatrixCallbackDelegate.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.util
+package org.matrix.android.sdk.api.util
 
-import im.vector.matrix.android.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixCallback
 
 /**
  * Simple MatrixCallback implementation which delegate its calls to another callback
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/MatrixItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/MatrixItem.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
index f30494711b..3e99ae52b4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/MatrixItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.util
+package org.matrix.android.sdk.api.util
 
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
-import im.vector.matrix.android.api.session.user.model.User
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.user.model.User
 import java.util.Locale
 
 sealed class MatrixItem(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Optional.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Optional.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
index 713872e3d6..159f7149b9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Optional.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
@@ -1,6 +1,7 @@
 /*
 
   * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
   * limitations under the License.
 
  */
-package im.vector.matrix.android.api.util
+package org.matrix.android.sdk.api.util
 
 data class Optional<T : Any> constructor(private val value: T?) {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Types.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Types.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Types.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Types.kt
index f83166512e..7344dab8d4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Types.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Types.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.util
+package org.matrix.android.sdk.api.util
 
 import com.squareup.moshi.Types
 import java.lang.reflect.ParameterizedType
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt
index 918f5f2f55..24f5558b26 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal
+package org.matrix.android.sdk.internal
 
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.api.auth.data.sessionId
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.internal.auth.SessionParamsStore
-import im.vector.matrix.android.internal.di.MatrixComponent
-import im.vector.matrix.android.internal.di.MatrixScope
-import im.vector.matrix.android.internal.session.DaggerSessionComponent
-import im.vector.matrix.android.internal.session.SessionComponent
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.auth.data.sessionId
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.auth.SessionParamsStore
+import org.matrix.android.sdk.internal.di.MatrixComponent
+import org.matrix.android.sdk.internal.di.MatrixScope
+import org.matrix.android.sdk.internal.session.DaggerSessionComponent
+import org.matrix.android.sdk.internal.session.SessionComponent
 import javax.inject.Inject
 
 @MatrixScope
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
similarity index 69%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
index ec8cc5c074..d0c02b6027 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,21 +15,21 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth
+package org.matrix.android.sdk.internal.auth
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.internal.auth.data.LoginFlowResponse
-import im.vector.matrix.android.internal.auth.data.PasswordLoginParams
-import im.vector.matrix.android.internal.auth.data.RiotConfig
-import im.vector.matrix.android.internal.auth.data.TokenLoginParams
-import im.vector.matrix.android.internal.auth.login.ResetPasswordMailConfirmed
-import im.vector.matrix.android.internal.auth.registration.AddThreePidRegistrationParams
-import im.vector.matrix.android.internal.auth.registration.AddThreePidRegistrationResponse
-import im.vector.matrix.android.internal.auth.registration.RegistrationParams
-import im.vector.matrix.android.internal.auth.registration.SuccessResult
-import im.vector.matrix.android.internal.auth.registration.ValidationCodeBody
-import im.vector.matrix.android.internal.auth.version.Versions
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.internal.auth.data.LoginFlowResponse
+import org.matrix.android.sdk.internal.auth.data.PasswordLoginParams
+import org.matrix.android.sdk.internal.auth.data.RiotConfig
+import org.matrix.android.sdk.internal.auth.data.TokenLoginParams
+import org.matrix.android.sdk.internal.auth.login.ResetPasswordMailConfirmed
+import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationParams
+import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationResponse
+import org.matrix.android.sdk.internal.auth.registration.RegistrationParams
+import org.matrix.android.sdk.internal.auth.registration.SuccessResult
+import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
+import org.matrix.android.sdk.internal.auth.version.Versions
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -41,6 +42,11 @@ import retrofit2.http.Url
  * The login REST API.
  */
 internal interface AuthAPI {
+    /**
+     * Get a Riot config file, using the name including the domain
+     */
+    @GET("config.{domain}.json")
+    fun getRiotConfigDomain(@Path("domain") domain: String): Call<RiotConfig>
 
     /**
      * Get a Riot config file
@@ -67,13 +73,15 @@ internal interface AuthAPI {
      * https://github.com/matrix-org/matrix-doc/pull/2290
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register/{threePid}/requestToken")
-    fun add3Pid(@Path("threePid") threePid: String, @Body params: AddThreePidRegistrationParams): Call<AddThreePidRegistrationResponse>
+    fun add3Pid(@Path("threePid") threePid: String,
+                @Body params: AddThreePidRegistrationParams): Call<AddThreePidRegistrationResponse>
 
     /**
      * Validate 3pid
      */
     @POST
-    fun validate3Pid(@Url url: String, @Body params: ValidationCodeBody): Call<SuccessResult>
+    fun validate3Pid(@Url url: String,
+                     @Body params: ValidationCodeBody): Call<SuccessResult>
 
     /**
      * Get the supported login flow
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
similarity index 72%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
index 688023b55e..229baac052 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +15,24 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth
+package org.matrix.android.sdk.internal.auth
 
 import android.content.Context
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.api.legacy.LegacySessionImporter
-import im.vector.matrix.android.internal.auth.db.AuthRealmMigration
-import im.vector.matrix.android.internal.auth.db.AuthRealmModule
-import im.vector.matrix.android.internal.auth.db.RealmPendingSessionStore
-import im.vector.matrix.android.internal.auth.db.RealmSessionParamsStore
-import im.vector.matrix.android.internal.auth.login.DefaultDirectLoginTask
-import im.vector.matrix.android.internal.auth.login.DirectLoginTask
-import im.vector.matrix.android.internal.database.RealmKeysUtils
-import im.vector.matrix.android.internal.di.AuthDatabase
-import im.vector.matrix.android.internal.legacy.DefaultLegacySessionImporter
-import im.vector.matrix.android.internal.wellknown.WellknownModule
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.legacy.LegacySessionImporter
+import org.matrix.android.sdk.internal.auth.db.AuthRealmMigration
+import org.matrix.android.sdk.internal.auth.db.AuthRealmModule
+import org.matrix.android.sdk.internal.auth.db.RealmPendingSessionStore
+import org.matrix.android.sdk.internal.auth.db.RealmSessionParamsStore
+import org.matrix.android.sdk.internal.auth.login.DefaultDirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.DirectLoginTask
+import org.matrix.android.sdk.internal.database.RealmKeysUtils
+import org.matrix.android.sdk.internal.di.AuthDatabase
+import org.matrix.android.sdk.internal.legacy.DefaultLegacySessionImporter
+import org.matrix.android.sdk.internal.wellknown.WellknownModule
 import io.realm.RealmConfiguration
 import java.io.File
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticationService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 087e00848c..02c48dab07 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,47 +15,46 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth
+package org.matrix.android.sdk.internal.auth
 
 import android.net.Uri
 import dagger.Lazy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.auth.data.LoginFlowResult
-import im.vector.matrix.android.api.auth.login.LoginWizard
-import im.vector.matrix.android.api.auth.registration.RegistrationWizard
-import im.vector.matrix.android.api.auth.wellknown.WellknownResult
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.NoOpCancellable
-import im.vector.matrix.android.internal.SessionManager
-import im.vector.matrix.android.internal.auth.data.LoginFlowResponse
-import im.vector.matrix.android.internal.auth.data.RiotConfig
-import im.vector.matrix.android.internal.auth.db.PendingSessionData
-import im.vector.matrix.android.internal.auth.login.DefaultLoginWizard
-import im.vector.matrix.android.internal.auth.login.DirectLoginTask
-import im.vector.matrix.android.internal.auth.registration.DefaultRegistrationWizard
-import im.vector.matrix.android.internal.auth.version.Versions
-import im.vector.matrix.android.internal.auth.version.isLoginAndRegistrationSupportedBySdk
-import im.vector.matrix.android.internal.auth.version.isSupportedBySdk
-import im.vector.matrix.android.internal.di.Unauthenticated
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.network.httpclient.addSocketFactory
-import im.vector.matrix.android.internal.network.ssl.UnrecognizedCertificateException
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.task.launchToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.util.exhaustive
-import im.vector.matrix.android.internal.util.toCancelable
-import im.vector.matrix.android.internal.wellknown.GetWellknownTask
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.LoginFlowResult
+import org.matrix.android.sdk.api.auth.login.LoginWizard
+import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
+import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.internal.SessionManager
+import org.matrix.android.sdk.internal.auth.data.LoginFlowResponse
+import org.matrix.android.sdk.internal.auth.data.RiotConfig
+import org.matrix.android.sdk.internal.auth.db.PendingSessionData
+import org.matrix.android.sdk.internal.auth.login.DefaultLoginWizard
+import org.matrix.android.sdk.internal.auth.login.DirectLoginTask
+import org.matrix.android.sdk.internal.auth.registration.DefaultRegistrationWizard
+import org.matrix.android.sdk.internal.auth.version.Versions
+import org.matrix.android.sdk.internal.auth.version.isLoginAndRegistrationSupportedBySdk
+import org.matrix.android.sdk.internal.auth.version.isSupportedBySdk
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.httpclient.addSocketFactory
+import org.matrix.android.sdk.internal.network.ssl.UnrecognizedCertificateException
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.task.launchToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.toCancelable
+import org.matrix.android.sdk.internal.wellknown.GetWellknownTask
 import javax.inject.Inject
 import javax.net.ssl.HttpsURLConnection
 
@@ -156,7 +156,7 @@ internal class DefaultAuthenticationService @Inject constructor(
                                 if (it is Failure.OtherServerError
                                         && it.httpCode == HttpsURLConnection.HTTP_NOT_FOUND /* 404 */) {
                                     // It's maybe a Riot url?
-                                    getRiotLoginFlowInternal(homeServerConnectionConfig)
+                                    getRiotDomainLoginFlowInternal(homeServerConnectionConfig)
                                 } else {
                                     throw it
                                 }
@@ -165,6 +165,37 @@ internal class DefaultAuthenticationService @Inject constructor(
         }
     }
 
+    private suspend fun getRiotDomainLoginFlowInternal(homeServerConnectionConfig: HomeServerConnectionConfig): LoginFlowResult {
+        val authAPI = buildAuthAPI(homeServerConnectionConfig)
+
+        val domain = homeServerConnectionConfig.homeServerUri.host
+                ?: return getRiotLoginFlowInternal(homeServerConnectionConfig)
+
+        // Ok, try to get the config.domain.json file of a RiotWeb client
+        return runCatching {
+            executeRequest<RiotConfig>(null) {
+                apiCall = authAPI.getRiotConfigDomain(domain)
+            }
+        }
+                .map { riotConfig ->
+                    onRiotConfigRetrieved(homeServerConnectionConfig, riotConfig)
+                }
+                .fold(
+                        {
+                            it
+                        },
+                        {
+                            if (it is Failure.OtherServerError
+                                    && it.httpCode == HttpsURLConnection.HTTP_NOT_FOUND /* 404 */) {
+                                // Try with config.json
+                                getRiotLoginFlowInternal(homeServerConnectionConfig)
+                            } else {
+                                throw it
+                            }
+                        }
+                )
+    }
+
     private suspend fun getRiotLoginFlowInternal(homeServerConnectionConfig: HomeServerConnectionConfig): LoginFlowResult {
         val authAPI = buildAuthAPI(homeServerConnectionConfig)
 
@@ -175,23 +206,7 @@ internal class DefaultAuthenticationService @Inject constructor(
             }
         }
                 .map { riotConfig ->
-                    if (riotConfig.defaultHomeServerUrl?.isNotBlank() == true) {
-                        // Ok, good sign, we got a default hs url
-                        val newHomeServerConnectionConfig = homeServerConnectionConfig.copy(
-                                homeServerUri = Uri.parse(riotConfig.defaultHomeServerUrl)
-                        )
-
-                        val newAuthAPI = buildAuthAPI(newHomeServerConnectionConfig)
-
-                        val versions = executeRequest<Versions>(null) {
-                            apiCall = newAuthAPI.versions()
-                        }
-
-                        getLoginFlowResult(newAuthAPI, versions, riotConfig.defaultHomeServerUrl)
-                    } else {
-                        // Config exists, but there is no default homeserver url (ex: https://riot.im/app)
-                        throw Failure.OtherServerError("", HttpsURLConnection.HTTP_NOT_FOUND /* 404 */)
-                    }
+                    onRiotConfigRetrieved(homeServerConnectionConfig, riotConfig)
                 }
                 .fold(
                         {
@@ -209,6 +224,27 @@ internal class DefaultAuthenticationService @Inject constructor(
                 )
     }
 
+    private suspend fun onRiotConfigRetrieved(homeServerConnectionConfig: HomeServerConnectionConfig, riotConfig: RiotConfig): LoginFlowResult {
+        val defaultHomeServerUrl = riotConfig.getPreferredHomeServerUrl()
+        if (defaultHomeServerUrl?.isNotEmpty() == true) {
+            // Ok, good sign, we got a default hs url
+            val newHomeServerConnectionConfig = homeServerConnectionConfig.copy(
+                    homeServerUri = Uri.parse(defaultHomeServerUrl)
+            )
+
+            val newAuthAPI = buildAuthAPI(newHomeServerConnectionConfig)
+
+            val versions = executeRequest<Versions>(null) {
+                apiCall = newAuthAPI.versions()
+            }
+
+            return getLoginFlowResult(newAuthAPI, versions, defaultHomeServerUrl)
+        } else {
+            // Config exists, but there is no default homeserver url (ex: https://riot.im/app)
+            throw Failure.OtherServerError("", HttpsURLConnection.HTTP_NOT_FOUND /* 404 */)
+        }
+    }
+
     private suspend fun getWellknownLoginFlowInternal(homeServerConnectionConfig: HomeServerConnectionConfig): LoginFlowResult {
         val domain = homeServerConnectionConfig.homeServerUri.host
                 ?: throw Failure.OtherServerError("", HttpsURLConnection.HTTP_NOT_FOUND /* 404 */)
@@ -233,7 +269,7 @@ internal class DefaultAuthenticationService @Inject constructor(
                 getLoginFlowResult(newAuthAPI, versions, wellknownResult.homeServerUrl)
             }
             else                      -> throw Failure.OtherServerError("", HttpsURLConnection.HTTP_NOT_FOUND /* 404 */)
-        }.exhaustive
+        }
     }
 
     private suspend fun getLoginFlowResult(authAPI: AuthAPI, versions: Versions, homeServerUrl: String): LoginFlowResult {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/PendingSessionStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/PendingSessionStore.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/PendingSessionStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/PendingSessionStore.kt
index ed28de6ae8..3b1c61e272 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/PendingSessionStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/PendingSessionStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth
+package org.matrix.android.sdk.internal.auth
 
-import im.vector.matrix.android.internal.auth.db.PendingSessionData
+import org.matrix.android.sdk.internal.auth.db.PendingSessionData
 
 /**
  * Store for elements when doing login or registration
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionCreator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionCreator.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt
index 74f7cad67d..a44cda5b57 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionCreator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth
+package org.matrix.android.sdk.internal.auth
 
 import android.net.Uri
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.internal.SessionManager
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.SessionManager
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionParamsStore.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionParamsStore.kt
index f99b95c2b3..eb038ecffb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionParamsStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth
+package org.matrix.android.sdk.internal.auth
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.SessionParams
 
 internal interface SessionParamsStore {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/InteractiveAuthenticationFlow.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/InteractiveAuthenticationFlow.kt
index a6d74a8de7..7a631a5677 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/InteractiveAuthenticationFlow.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.data
+package org.matrix.android.sdk.internal.auth.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt
index ca57a3aa0c..9fb7eb5f3a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.data
+package org.matrix.android.sdk.internal.auth.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
index e37977425a..fc7206779e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.data
+package org.matrix.android.sdk.internal.auth.data
 
 internal interface LoginParams {
     val type: String
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
index 26b1b65218..60eebea57d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.data
+package org.matrix.android.sdk.internal.auth.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 
 /**
  * Ref:
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/RiotConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/RiotConfig.kt
new file mode 100644
index 0000000000..9fb8963812
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/RiotConfig.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.auth.data
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class RiotConfig(
+        /**
+         * This is now deprecated, but still used first, rather than value from "default_server_config"
+         */
+        @Json(name = "default_hs_url")
+        val defaultHomeServerUrl: String?,
+
+        @Json(name = "default_server_config")
+        val defaultServerConfig: RiotConfigDefaultServerConfig?
+) {
+    fun getPreferredHomeServerUrl(): String? {
+        return defaultHomeServerUrl
+                ?.takeIf { it.isNotEmpty() }
+                ?: defaultServerConfig?.homeServer?.baseURL
+    }
+}
+
+@JsonClass(generateAdapter = true)
+internal data class RiotConfigDefaultServerConfig(
+        @Json(name = "m.homeserver")
+        val homeServer: RiotConfigBaseConfig? = null
+)
+
+@JsonClass(generateAdapter = true)
+internal data class RiotConfigBaseConfig(
+        @Json(name = "base_url")
+        val baseURL: String? = null
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/ThreePidMedium.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/ThreePidMedium.kt
index b1aeb9370b..d47eca8c9f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/ThreePidMedium.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.data
+package org.matrix.android.sdk.internal.auth.data
 
 internal object ThreePidMedium {
     const val EMAIL = "email"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/TokenLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/TokenLoginParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
index e95a998d38..3d9f58f048 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/TokenLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.data
+package org.matrix.android.sdk.internal.auth.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 
 @JsonClass(generateAdapter = true)
 internal data class TokenLoginParams(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/AuthRealmMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/AuthRealmMigration.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt
index e5e77cb14a..88e2804798 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/AuthRealmMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.db
+package org.matrix.android.sdk.internal.auth.db
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.sessionId
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.sessionId
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/AuthRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/AuthRealmModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
index ee930cd1ef..282d0df75d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/AuthRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.db
+package org.matrix.android.sdk.internal.auth.db
 
 import io.realm.annotations.RealmModule
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/PendingSessionData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionData.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/PendingSessionData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionData.kt
index 3241ea5917..ad51f63ee8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/PendingSessionData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.db
+package org.matrix.android.sdk.internal.auth.db
 
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.internal.auth.login.ResetPasswordData
-import im.vector.matrix.android.internal.auth.registration.ThreePidData
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.internal.auth.login.ResetPasswordData
+import org.matrix.android.sdk.internal.auth.registration.ThreePidData
 import java.util.UUID
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/PendingSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/PendingSessionEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionEntity.kt
index d21c515849..2ee342d02c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/PendingSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.db
+package org.matrix.android.sdk.internal.auth.db
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/PendingSessionMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/PendingSessionMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
index 32e6ba963e..d357221f82 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/PendingSessionMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.db
+package org.matrix.android.sdk.internal.auth.db
 
 import com.squareup.moshi.Moshi
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.internal.auth.login.ResetPasswordData
-import im.vector.matrix.android.internal.auth.registration.ThreePidData
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.internal.auth.login.ResetPasswordData
+import org.matrix.android.sdk.internal.auth.registration.ThreePidData
 import javax.inject.Inject
 
 internal class PendingSessionMapper @Inject constructor(moshi: Moshi) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmPendingSessionStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmPendingSessionStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt
index 6841e43ef0..41851fc2c6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmPendingSessionStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.db
+package org.matrix.android.sdk.internal.auth.db
 
-import im.vector.matrix.android.internal.auth.PendingSessionStore
-import im.vector.matrix.android.internal.database.awaitTransaction
-import im.vector.matrix.android.internal.di.AuthDatabase
+import org.matrix.android.sdk.internal.auth.PendingSessionStore
+import org.matrix.android.sdk.internal.database.awaitTransaction
+import org.matrix.android.sdk.internal.di.AuthDatabase
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt
index 9491d5737c..57f1c23e99 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.db
+package org.matrix.android.sdk.internal.auth.db
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.api.auth.data.sessionId
-import im.vector.matrix.android.internal.auth.SessionParamsStore
-import im.vector.matrix.android.internal.database.awaitTransaction
-import im.vector.matrix.android.internal.di.AuthDatabase
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.auth.data.sessionId
+import org.matrix.android.sdk.internal.auth.SessionParamsStore
+import org.matrix.android.sdk.internal.database.awaitTransaction
+import org.matrix.android.sdk.internal.di.AuthDatabase
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.exceptions.RealmPrimaryKeyConstraintException
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsEntity.kt
index 72eed95fcc..81202d2f52 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.db
+package org.matrix.android.sdk.internal.auth.db
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
index a4db0e84f7..78324b6916 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.db
+package org.matrix.android.sdk.internal.auth.db
 
 import com.squareup.moshi.Moshi
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.api.auth.data.sessionId
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.auth.data.sessionId
 import javax.inject.Inject
 
 internal class SessionParamsMapper @Inject constructor(moshi: Moshi) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/DefaultLoginWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/DefaultLoginWizard.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
index 522f571cf7..71b8f64069 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/DefaultLoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,30 +15,30 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.login
+package org.matrix.android.sdk.internal.auth.login
 
 import android.util.Patterns
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.login.LoginWizard
-import im.vector.matrix.android.api.auth.registration.RegisterThreePid
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.NoOpCancellable
-import im.vector.matrix.android.internal.auth.AuthAPI
-import im.vector.matrix.android.internal.auth.PendingSessionStore
-import im.vector.matrix.android.internal.auth.SessionCreator
-import im.vector.matrix.android.internal.auth.data.PasswordLoginParams
-import im.vector.matrix.android.internal.auth.data.ThreePidMedium
-import im.vector.matrix.android.internal.auth.data.TokenLoginParams
-import im.vector.matrix.android.internal.auth.db.PendingSessionData
-import im.vector.matrix.android.internal.auth.registration.AddThreePidRegistrationParams
-import im.vector.matrix.android.internal.auth.registration.AddThreePidRegistrationResponse
-import im.vector.matrix.android.internal.auth.registration.RegisterAddThreePidTask
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.launchToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.login.LoginWizard
+import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.auth.PendingSessionStore
+import org.matrix.android.sdk.internal.auth.SessionCreator
+import org.matrix.android.sdk.internal.auth.data.PasswordLoginParams
+import org.matrix.android.sdk.internal.auth.data.ThreePidMedium
+import org.matrix.android.sdk.internal.auth.data.TokenLoginParams
+import org.matrix.android.sdk.internal.auth.db.PendingSessionData
+import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationParams
+import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationResponse
+import org.matrix.android.sdk.internal.auth.registration.RegisterAddThreePidTask
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.launchToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/DirectLoginTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/DirectLoginTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt
index 51dbac2cc3..f759dc4235 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/DirectLoginTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.login
+package org.matrix.android.sdk.internal.auth.login
 
 import dagger.Lazy
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.internal.auth.AuthAPI
-import im.vector.matrix.android.internal.auth.SessionCreator
-import im.vector.matrix.android.internal.auth.data.PasswordLoginParams
-import im.vector.matrix.android.internal.di.Unauthenticated
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.network.httpclient.addSocketFactory
-import im.vector.matrix.android.internal.network.ssl.UnrecognizedCertificateException
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.auth.SessionCreator
+import org.matrix.android.sdk.internal.auth.data.PasswordLoginParams
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.httpclient.addSocketFactory
+import org.matrix.android.sdk.internal.network.ssl.UnrecognizedCertificateException
+import org.matrix.android.sdk.internal.task.Task
 import okhttp3.OkHttpClient
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/ResetPasswordData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/ResetPasswordData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt
index 11a8b95443..a6f621c2db 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/ResetPasswordData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.login
+package org.matrix.android.sdk.internal.auth.login
 
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.auth.registration.AddThreePidRegistrationResponse
+import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationResponse
 
 /**
  * Container to store the data when a reset password is in the email validation step
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/ResetPasswordMailConfirmed.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/ResetPasswordMailConfirmed.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt
index 9be4451628..c291c78882 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/ResetPasswordMailConfirmed.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt
@@ -2,6 +2,7 @@
  * Copyright 2014 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.auth.login
+package org.matrix.android.sdk.internal.auth.login
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.auth.registration.AuthParams
+import org.matrix.android.sdk.internal.auth.registration.AuthParams
 
 /**
  * Class to pass parameters to reset the password once a email has been validated.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/AddThreePidRegistrationParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/AddThreePidRegistrationParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt
index 90e1894bac..7fbdaacb81 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/AddThreePidRegistrationParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.registration.RegisterThreePid
+import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 
 /**
  * Add a three Pid during authentication
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/AddThreePidRegistrationResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationResponse.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/AddThreePidRegistrationResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationResponse.kt
index f07e66a7ef..2d60724e99 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/AddThreePidRegistrationResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/AuthParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AuthParams.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/AuthParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AuthParams.kt
index 9e20be240a..f3136526da 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/AuthParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AuthParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 
 /**
  * Open class, parent to all possible authentication parameters
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/DefaultRegistrationWizard.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index dafb024b7e..79b71b208e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +15,24 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
-import im.vector.matrix.android.api.auth.registration.RegisterThreePid
-import im.vector.matrix.android.api.auth.registration.RegistrationResult
-import im.vector.matrix.android.api.auth.registration.RegistrationWizard
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.Failure.RegistrationFlowError
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.NoOpCancellable
-import im.vector.matrix.android.internal.auth.AuthAPI
-import im.vector.matrix.android.internal.auth.PendingSessionStore
-import im.vector.matrix.android.internal.auth.SessionCreator
-import im.vector.matrix.android.internal.auth.db.PendingSessionData
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.task.launchToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
+import org.matrix.android.sdk.api.auth.registration.RegistrationResult
+import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.Failure.RegistrationFlowError
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.auth.PendingSessionStore
+import org.matrix.android.sdk.internal.auth.SessionCreator
+import org.matrix.android.sdk.internal.auth.db.PendingSessionData
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.task.launchToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import okhttp3.OkHttpClient
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/LocalizedFlowDataLoginTerms.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/LocalizedFlowDataLoginTerms.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt
index 5bdc9579e0..45e2f80fcc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/LocalizedFlowDataLoginTerms.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegisterAddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegisterAddThreePidTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt
index c455ccf48c..3ad15822ca 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegisterAddThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
-import im.vector.matrix.android.api.auth.registration.RegisterThreePid
-import im.vector.matrix.android.internal.auth.AuthAPI
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 
 internal interface RegisterAddThreePidTask : Task<RegisterAddThreePidTask.Params, AddThreePidRegistrationResponse> {
     data class Params(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegisterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegisterTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt
index 473b960d94..2b3924138e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegisterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.toRegistrationFlowResponse
-import im.vector.matrix.android.internal.auth.AuthAPI
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 
 internal interface RegisterTask : Task<RegisterTask.Params, Credentials> {
     data class Params(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationFlowResponse.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationFlowResponse.kt
index 5bb87f9557..267e50eeb9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationFlowResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
-import im.vector.matrix.android.api.auth.registration.FlowResult
-import im.vector.matrix.android.api.auth.registration.Stage
-import im.vector.matrix.android.api.auth.registration.TermPolicies
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.auth.data.InteractiveAuthenticationFlow
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.registration.FlowResult
+import org.matrix.android.sdk.api.auth.registration.Stage
+import org.matrix.android.sdk.api.auth.registration.TermPolicies
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.auth.data.InteractiveAuthenticationFlow
 
 @JsonClass(generateAdapter = true)
 data class RegistrationFlowResponse(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
index 6a874c7387..4089e280d7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
@@ -2,6 +2,7 @@
  * Copyright 2014 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/SuccessResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/SuccessResult.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/SuccessResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/SuccessResult.kt
index 1d19d1a5e5..bfebc57884 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/SuccessResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/SuccessResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.extensions.orFalse
+import org.matrix.android.sdk.api.extensions.orFalse
 
 @JsonClass(generateAdapter = true)
 data class SuccessResult(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/ThreePidData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/ThreePidData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt
index bb4751c438..25a7fa3ab2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/ThreePidData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.registration.RegisterThreePid
+import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 
 /**
  * Container to store the data when a three pid is in validation step
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/ValidateCodeTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/ValidateCodeTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt
index 30f9aaa705..470faae710 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/ValidateCodeTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
-import im.vector.matrix.android.internal.auth.AuthAPI
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 
 internal interface ValidateCodeTask : Task<ValidateCodeTask.Params, SuccessResult> {
     data class Params(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/ValidationCodeBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidationCodeBody.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/ValidationCodeBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidationCodeBody.kt
index cb3b7e5e85..ad4a3d4609 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/ValidationCodeBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidationCodeBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.registration
+package org.matrix.android.sdk.internal.auth.registration
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/HomeServerVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/HomeServerVersion.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
index 7e0a95dfef..9a02bc62e9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/HomeServerVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.version
+package org.matrix.android.sdk.internal.auth.version
 
 /**
  * Values will take the form "rX.Y.Z".
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/Versions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/Versions.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
index aee5f7e3f3..483c43f502 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/Versions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.auth.version
+package org.matrix.android.sdk.internal.auth.version
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CancelGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CancelGossipRequestWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
index 54f89dc8b9..c4f55d14bf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CancelGossipRequestWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,25 +15,25 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.failure.shouldBeRetried
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.rest.ShareRequestCancellation
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.failure.shouldBeRetried
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.rest.ShareRequestCancellation
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoConstants.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt
index f82300548a..3c8b525b96 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 /**
  * Matrix algorithm value for olm.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
similarity index 51%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
index 44092f4ae4..e5496a6fd1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,87 +15,87 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.crosssigning.ComputeTrustTask
-import im.vector.matrix.android.internal.crypto.crosssigning.DefaultComputeTrustTask
-import im.vector.matrix.android.internal.crypto.crosssigning.DefaultCrossSigningService
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.CreateKeysBackupVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultCreateKeysBackupVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultDeleteBackupTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultDeleteRoomSessionDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultDeleteRoomSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultDeleteSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultGetKeysBackupLastVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultGetKeysBackupVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultGetRoomSessionDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultGetRoomSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultGetSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultStoreRoomSessionDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultStoreRoomSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultStoreSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DefaultUpdateKeysBackupVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DeleteBackupTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DeleteRoomSessionDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DeleteRoomSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DeleteSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.GetKeysBackupLastVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.GetKeysBackupVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.GetRoomSessionDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.GetRoomSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.GetSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.StoreRoomSessionDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.StoreRoomSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.StoreSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.UpdateKeysBackupVersionTask
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStore
-import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreMigration
-import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreModule
-import im.vector.matrix.android.internal.crypto.tasks.ClaimOneTimeKeysForUsersDeviceTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultClaimOneTimeKeysForUsersDevice
-import im.vector.matrix.android.internal.crypto.tasks.DefaultDeleteDeviceTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultDeleteDeviceWithUserPasswordTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultDownloadKeysForUsers
-import im.vector.matrix.android.internal.crypto.tasks.DefaultEncryptEventTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultGetDeviceInfoTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultGetDevicesTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultInitializeCrossSigningTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultSendEventTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultSendToDeviceTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultSendVerificationMessageTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultSetDeviceNameTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultUploadKeysTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultUploadSignaturesTask
-import im.vector.matrix.android.internal.crypto.tasks.DefaultUploadSigningKeysTask
-import im.vector.matrix.android.internal.crypto.tasks.DeleteDeviceTask
-import im.vector.matrix.android.internal.crypto.tasks.DeleteDeviceWithUserPasswordTask
-import im.vector.matrix.android.internal.crypto.tasks.DownloadKeysForUsersTask
-import im.vector.matrix.android.internal.crypto.tasks.EncryptEventTask
-import im.vector.matrix.android.internal.crypto.tasks.GetDeviceInfoTask
-import im.vector.matrix.android.internal.crypto.tasks.GetDevicesTask
-import im.vector.matrix.android.internal.crypto.tasks.InitializeCrossSigningTask
-import im.vector.matrix.android.internal.crypto.tasks.SendEventTask
-import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.crypto.tasks.SendVerificationMessageTask
-import im.vector.matrix.android.internal.crypto.tasks.SetDeviceNameTask
-import im.vector.matrix.android.internal.crypto.tasks.UploadKeysTask
-import im.vector.matrix.android.internal.crypto.tasks.UploadSignaturesTask
-import im.vector.matrix.android.internal.crypto.tasks.UploadSigningKeysTask
-import im.vector.matrix.android.internal.database.RealmKeysUtils
-import im.vector.matrix.android.internal.di.CryptoDatabase
-import im.vector.matrix.android.internal.di.SessionFilesDirectory
-import im.vector.matrix.android.internal.di.UserMd5
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.cache.ClearCacheTask
-import im.vector.matrix.android.internal.session.cache.RealmClearCacheTask
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.crosssigning.ComputeTrustTask
+import org.matrix.android.sdk.internal.crypto.crosssigning.DefaultComputeTrustTask
+import org.matrix.android.sdk.internal.crypto.crosssigning.DefaultCrossSigningService
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.CreateKeysBackupVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultCreateKeysBackupVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultDeleteBackupTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultDeleteRoomSessionDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultDeleteRoomSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultDeleteSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultGetKeysBackupLastVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultGetKeysBackupVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultGetRoomSessionDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultGetRoomSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultGetSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultStoreRoomSessionDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultStoreRoomSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultStoreSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DefaultUpdateKeysBackupVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DeleteBackupTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DeleteRoomSessionDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DeleteRoomSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DeleteSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.GetKeysBackupLastVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.GetKeysBackupVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.GetRoomSessionDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.GetRoomSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.GetSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.StoreRoomSessionDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.StoreRoomSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.StoreSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.UpdateKeysBackupVersionTask
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStore
+import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreMigration
+import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreModule
+import org.matrix.android.sdk.internal.crypto.tasks.ClaimOneTimeKeysForUsersDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultClaimOneTimeKeysForUsersDevice
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultDeleteDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultDeleteDeviceWithUserPasswordTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultDownloadKeysForUsers
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultEncryptEventTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultGetDeviceInfoTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultGetDevicesTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultInitializeCrossSigningTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultSendEventTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultSendToDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultSendVerificationMessageTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultSetDeviceNameTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultUploadKeysTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultUploadSignaturesTask
+import org.matrix.android.sdk.internal.crypto.tasks.DefaultUploadSigningKeysTask
+import org.matrix.android.sdk.internal.crypto.tasks.DeleteDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.DeleteDeviceWithUserPasswordTask
+import org.matrix.android.sdk.internal.crypto.tasks.DownloadKeysForUsersTask
+import org.matrix.android.sdk.internal.crypto.tasks.EncryptEventTask
+import org.matrix.android.sdk.internal.crypto.tasks.GetDeviceInfoTask
+import org.matrix.android.sdk.internal.crypto.tasks.GetDevicesTask
+import org.matrix.android.sdk.internal.crypto.tasks.InitializeCrossSigningTask
+import org.matrix.android.sdk.internal.crypto.tasks.SendEventTask
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.SendVerificationMessageTask
+import org.matrix.android.sdk.internal.crypto.tasks.SetDeviceNameTask
+import org.matrix.android.sdk.internal.crypto.tasks.UploadKeysTask
+import org.matrix.android.sdk.internal.crypto.tasks.UploadSignaturesTask
+import org.matrix.android.sdk.internal.crypto.tasks.UploadSigningKeysTask
+import org.matrix.android.sdk.internal.database.RealmKeysUtils
+import org.matrix.android.sdk.internal.di.CryptoDatabase
+import org.matrix.android.sdk.internal.di.SessionFilesDirectory
+import org.matrix.android.sdk.internal.di.UserMd5
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.cache.ClearCacheTask
+import org.matrix.android.sdk.internal.session.cache.RealmClearCacheTask
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 5b2e3d2e83..f8fb5a35d0 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -2,6 +2,7 @@
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import android.content.Context
 import android.os.Handler
@@ -26,81 +27,81 @@ import androidx.lifecycle.LiveData
 import com.squareup.moshi.Types
 import com.zhuinden.monarchy.Monarchy
 import dagger.Lazy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.crypto.MXCryptoConfig
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.keyshare.GossipingRequestListener
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibilityContent
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
-import im.vector.matrix.android.internal.crypto.actions.MegolmSessionDataImporter
-import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
-import im.vector.matrix.android.internal.crypto.actions.SetDeviceVerificationAction
-import im.vector.matrix.android.internal.crypto.algorithms.IMXEncrypting
-import im.vector.matrix.android.internal.crypto.algorithms.IMXWithHeldExtension
-import im.vector.matrix.android.internal.crypto.algorithms.megolm.MXMegolmEncryptionFactory
-import im.vector.matrix.android.internal.crypto.algorithms.olm.MXOlmEncryptionFactory
-import im.vector.matrix.android.internal.crypto.crosssigning.DefaultCrossSigningService
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.keysbackup.DefaultKeysBackupService
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXEncryptEventContentResult
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.crypto.model.event.OlmEventContent
-import im.vector.matrix.android.internal.crypto.model.event.RoomKeyContent
-import im.vector.matrix.android.internal.crypto.model.event.RoomKeyWithHeldContent
-import im.vector.matrix.android.internal.crypto.model.event.SecretSendEventContent
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
-import im.vector.matrix.android.internal.crypto.model.toRest
-import im.vector.matrix.android.internal.crypto.repository.WarnOnUnknownDeviceRepository
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.tasks.DeleteDeviceTask
-import im.vector.matrix.android.internal.crypto.tasks.DeleteDeviceWithUserPasswordTask
-import im.vector.matrix.android.internal.crypto.tasks.GetDeviceInfoTask
-import im.vector.matrix.android.internal.crypto.tasks.GetDevicesTask
-import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.crypto.tasks.SetDeviceNameTask
-import im.vector.matrix.android.internal.crypto.tasks.UploadKeysTask
-import im.vector.matrix.android.internal.crypto.verification.DefaultVerificationService
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.EventEntityFields
-import im.vector.matrix.android.internal.database.query.whereType
-import im.vector.matrix.android.internal.di.DeviceId
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.extensions.foldToCallback
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.room.membership.LoadRoomMembersTask
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberHelper
-import im.vector.matrix.android.internal.session.sync.model.SyncResponse
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.TaskThread
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.task.launchToCallback
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.util.fetchCopied
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.keyshare.GossipingRequestListener
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
+import org.matrix.android.sdk.internal.crypto.actions.MegolmSessionDataImporter
+import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
+import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXEncrypting
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXWithHeldExtension
+import org.matrix.android.sdk.internal.crypto.algorithms.megolm.MXMegolmEncryptionFactory
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.MXOlmEncryptionFactory
+import org.matrix.android.sdk.internal.crypto.crosssigning.DefaultCrossSigningService
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.keysbackup.DefaultKeysBackupService
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.internal.crypto.model.MXDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXEncryptEventContentResult
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.crypto.model.event.OlmEventContent
+import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyContent
+import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyWithHeldContent
+import org.matrix.android.sdk.internal.crypto.model.event.SecretSendEventContent
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DevicesListResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.internal.crypto.model.toRest
+import org.matrix.android.sdk.internal.crypto.repository.WarnOnUnknownDeviceRepository
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.tasks.DeleteDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.DeleteDeviceWithUserPasswordTask
+import org.matrix.android.sdk.internal.crypto.tasks.GetDeviceInfoTask
+import org.matrix.android.sdk.internal.crypto.tasks.GetDevicesTask
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.SetDeviceNameTask
+import org.matrix.android.sdk.internal.crypto.tasks.UploadKeysTask
+import org.matrix.android.sdk.internal.crypto.verification.DefaultVerificationService
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.query.whereType
+import org.matrix.android.sdk.internal.di.DeviceId
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.extensions.foldToCallback
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.TaskThread
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.task.launchToCallback
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.fetchCopied
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancelChildren
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index 722a751ecd..bb41edefe1 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,20 +16,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.MatrixPatterns
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.CryptoInfoMapper
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.tasks.DownloadKeysForUsersTask
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.sync.SyncTokenStore
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.CryptoInfoMapper
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.tasks.DownloadKeysForUsersTask
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/GossipingRequestState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/GossipingRequestState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt
index f2e45ef109..9c2e498863 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/GossipingRequestState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 enum class GossipRequestType {
     KEY,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/GossipingWorkManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/GossipingWorkManager.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
index b7c782c5b4..50e11e40b8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/GossipingWorkManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import androidx.work.BackoffPolicy
 import androidx.work.Data
 import androidx.work.ExistingWorkPolicy
 import androidx.work.ListenableWorker
 import androidx.work.OneTimeWorkRequest
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.util.CancelableWork
-import im.vector.matrix.android.internal.worker.startChain
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.util.CancelableWork
+import org.matrix.android.sdk.internal.worker.startChain
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingGossipingRequestManager.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
index addcc539e4..da72186136 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,27 +15,27 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.crypto.MXCryptoConfig
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.keyshare.GossipingRequestListener
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding
-import im.vector.matrix.android.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
-import im.vector.matrix.android.internal.crypto.model.rest.GossipingDefaultContent
-import im.vector.matrix.android.internal.crypto.model.rest.GossipingToDeviceObject
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.keyshare.GossipingRequestListener
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
+import org.matrix.android.sdk.internal.crypto.model.rest.GossipingDefaultContent
+import org.matrix.android.sdk.internal.crypto.model.rest.GossipingToDeviceObject
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRequestCancellation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRequestCancellation.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRequestCancellation.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRequestCancellation.kt
index 98e1e95423..04b78fc89f 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRequestCancellation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRequestCancellation.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.internal.crypto.model.rest.ShareRequestCancellation
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.internal.crypto.model.rest.ShareRequestCancellation
 
 /**
  * IncomingRequestCancellation describes the incoming room key cancellation.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt
index 13f3d38677..04e18bf7f9 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +16,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyShareRequest
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyShareRequest
 
 /**
  * IncomingRoomKeyRequest class defines the incoming room keys request.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingSecretShareRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingSecretShareRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
index 2fcd3e22d5..4b91ed5d76 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingSecretShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.internal.crypto.model.rest.SecretShareRequest
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.internal.crypto.model.rest.SecretShareRequest
 
 /**
  * IncomingRoomKeyRequest class defines the incoming room keys request.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingShareRequestCommon.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingShareRequestCommon.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingShareRequestCommon.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingShareRequestCommon.kt
index f39a0d80d1..d57584f49f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingShareRequestCommon.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingShareRequestCommon.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 interface IncomingShareRequestCommon {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXCryptoAlgorithms.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXCryptoAlgorithms.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt
index 92b6adabc5..90b0b318b9 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXCryptoAlgorithms.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 // TODO Update comment
 internal object MXCryptoAlgorithms {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXEventDecryptionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXEventDecryptionResult.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXEventDecryptionResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXEventDecryptionResult.kt
index 332ca86097..f094b5c656 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXEventDecryptionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXEventDecryptionResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.util.JsonDict
+import org.matrix.android.sdk.api.util.JsonDict
 
 /**
  * The result of a (successful) call to decryptEvent.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXMegolmExportEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
similarity index 98%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXMegolmExportEncryption.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
index 0aa7a15ce2..4526ba8a51 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXMegolmExportEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import android.util.Base64
-import im.vector.matrix.android.internal.extensions.toUnsignedInt
+import org.matrix.android.sdk.internal.extensions.toUnsignedInt
 import timber.log.Timber
 import java.io.ByteArrayOutputStream
 import java.nio.charset.Charset
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
index 9e116d8223..cfdd050801 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,20 +16,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.util.JSON_DICT_PARAMETERIZED_TYPE
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper2
-import im.vector.matrix.android.internal.crypto.model.OlmSessionWrapper
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
-import im.vector.matrix.android.internal.util.convertFromUTF8
-import im.vector.matrix.android.internal.util.convertToUTF8
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.util.JSON_DICT_PARAMETERIZED_TYPE
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
+import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.util.convertFromUTF8
+import org.matrix.android.sdk.internal.util.convertToUTF8
 import org.matrix.olm.OlmAccount
 import org.matrix.olm.OlmException
 import org.matrix.olm.OlmMessage
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MegolmSessionData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MegolmSessionData.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MegolmSessionData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MegolmSessionData.kt
index d6dae1a865..9991115f28 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MegolmSessionData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MegolmSessionData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MyDeviceInfoHolder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MyDeviceInfoHolder.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MyDeviceInfoHolder.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MyDeviceInfoHolder.kt
index e50faf6f76..092ab672a6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MyDeviceInfoHolder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MyDeviceInfoHolder.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
 
 @SessionScope
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/NewSessionListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/NewSessionListener.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/NewSessionListener.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/NewSessionListener.kt
index e113e64146..19a8468e9c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/NewSessionListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/NewSessionListener.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 interface NewSessionListener {
     fun onNewSession(roomId: String?, senderKey: String, sessionId: String)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/ObjectSigner.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/ObjectSigner.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt
index be15f3753e..e59fe10c82 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/ObjectSigner.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.Credentials
 import javax.inject.Inject
 
 internal class ObjectSigner @Inject constructor(private val credentials: Credentials,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OneTimeKeysUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OneTimeKeysUploader.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
index 0752e646f2..e37c2df69e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OneTimeKeysUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.internal.crypto.model.MXKey
-import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadResponse
-import im.vector.matrix.android.internal.crypto.tasks.UploadKeysTask
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.crypto.model.MXKey
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysUploadResponse
+import org.matrix.android.sdk.internal.crypto.tasks.UploadKeysTask
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 import org.matrix.olm.OlmAccount
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingGossipingRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequest.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingGossipingRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequest.kt
index 2fb0c7094b..34661fcc21 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingGossipingRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequest.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 interface OutgoingGossipingRequest {
     var recipients: Map<String, List<String>>
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingGossipingRequestManager.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
index 5ad1013f49..030560b77f 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +16,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt
index b01c9d9b3f..f27338b712 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +16,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
 
 /**
  * Represents an outgoing room key request
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingSecretRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingSecretRequest.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingSecretRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingSecretRequest.kt
index 1497796743..6b51b42b53 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingSecretRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingSecretRequest.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomDecryptorProvider.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomDecryptorProvider.kt
index a17a524923..e574627d39 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomDecryptorProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.internal.crypto.algorithms.IMXDecrypting
-import im.vector.matrix.android.internal.crypto.algorithms.megolm.MXMegolmDecryptionFactory
-import im.vector.matrix.android.internal.crypto.algorithms.olm.MXOlmDecryptionFactory
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXDecrypting
+import org.matrix.android.sdk.internal.crypto.algorithms.megolm.MXMegolmDecryptionFactory
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.MXOlmDecryptionFactory
+import org.matrix.android.sdk.internal.session.SessionScope
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomEncryptorsStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomEncryptorsStore.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomEncryptorsStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomEncryptorsStore.kt
index 52a324d68d..aabe2aedec 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomEncryptorsStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomEncryptorsStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
-import im.vector.matrix.android.internal.crypto.algorithms.IMXEncrypting
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXEncrypting
+import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
 
 @SessionScope
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/SendGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/SendGossipRequestWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
index fb9c45da45..db85f2c246 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/SendGossipRequestWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,27 +15,27 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.failure.shouldBeRetried
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.rest.GossipingToDeviceObject
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyShareRequest
-import im.vector.matrix.android.internal.crypto.model.rest.SecretShareRequest
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.failure.shouldBeRetried
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.rest.GossipingToDeviceObject
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyShareRequest
+import org.matrix.android.sdk.internal.crypto.model.rest.SecretShareRequest
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/SendGossipWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/SendGossipWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
index 8a273da338..a3eb476b51 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/SendGossipWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,27 +15,27 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto
+package org.matrix.android.sdk.internal.crypto
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.failure.shouldBeRetried
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
-import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.event.SecretSendEventContent
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.failure.shouldBeRetried
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
+import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.event.SecretSendEventContent
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
index e630d14eab..e69cac5a5e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.actions
+package org.matrix.android.sdk.internal.crypto.actions
 
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXKey
-import im.vector.matrix.android.internal.crypto.model.MXOlmSessionResult
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.tasks.ClaimOneTimeKeysForUsersDeviceTask
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXKey
+import org.matrix.android.sdk.internal.crypto.model.MXOlmSessionResult
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.tasks.ClaimOneTimeKeysForUsersDeviceTask
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
index 1d452f4515..270240f912 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.actions
+package org.matrix.android.sdk.internal.crypto.actions
 
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.model.MXOlmSessionResult
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.model.MXOlmSessionResult
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MegolmSessionDataImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MegolmSessionDataImporter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
index cac4659ae5..d9da459d7d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MegolmSessionDataImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.actions
+package org.matrix.android.sdk.internal.crypto.actions
 
 import androidx.annotation.WorkerThread
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.MegolmSessionData
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.RoomDecryptorProvider
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.MegolmSessionData
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.RoomDecryptorProvider
+import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MessageEncrypter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MessageEncrypter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt
index c1cdbe59f9..c654622ffb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MessageEncrypter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.actions
+package org.matrix.android.sdk.internal.crypto.actions
 
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_OLM
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedMessage
-import im.vector.matrix.android.internal.di.DeviceId
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
-import im.vector.matrix.android.internal.util.convertToUTF8
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_OLM
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedMessage
+import org.matrix.android.sdk.internal.di.DeviceId
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.util.convertToUTF8
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/SetDeviceVerificationAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/SetDeviceVerificationAction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt
index d9fa8d5955..a5c00c3632 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/SetDeviceVerificationAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.actions
+package org.matrix.android.sdk.internal.crypto.actions
 
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.keysbackup.DefaultKeysBackupService
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.di.UserId
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.keysbackup.DefaultKeysBackupService
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.di.UserId
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXDecrypting.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXDecrypting.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
index be62bb33c1..76efc4d77f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXDecrypting.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2015 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms
+package org.matrix.android.sdk.internal.crypto.algorithms
 
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.IncomingSecretShareRequest
-import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
-import im.vector.matrix.android.internal.crypto.keysbackup.DefaultKeysBackupService
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.IncomingSecretShareRequest
+import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.DefaultKeysBackupService
 
 /**
  * An interface for decrypting data
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXEncrypting.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXEncrypting.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
index ddf605def4..60a5d7be7a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXEncrypting.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2015 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +16,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms
+package org.matrix.android.sdk.internal.crypto.algorithms
 
-import im.vector.matrix.android.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Content
 
 /**
  * An interface for encrypting data
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXWithHeldExtension.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXWithHeldExtension.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXWithHeldExtension.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXWithHeldExtension.kt
index e582bbcb04..844cb38858 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXWithHeldExtension.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXWithHeldExtension.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms
+package org.matrix.android.sdk.internal.crypto.algorithms
 
-import im.vector.matrix.android.internal.crypto.model.event.RoomKeyWithHeldContent
+import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyWithHeldContent
 
 internal interface IMXWithHeldExtension {
     fun onRoomKeyWithHeldEvent(withHeldInfo: RoomKeyWithHeldContent)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index 89ba87646a..423c883927 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,32 +16,32 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.megolm
+package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.internal.crypto.DeviceListManager
-import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.NewSessionListener
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
-import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
-import im.vector.matrix.android.internal.crypto.algorithms.IMXDecrypting
-import im.vector.matrix.android.internal.crypto.algorithms.IMXWithHeldExtension
-import im.vector.matrix.android.internal.crypto.keysbackup.DefaultKeysBackupService
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.crypto.model.event.RoomKeyContent
-import im.vector.matrix.android.internal.crypto.model.event.RoomKeyWithHeldContent
-import im.vector.matrix.android.internal.crypto.model.rest.ForwardedRoomKeyContent
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
+import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.NewSessionListener
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
+import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXDecrypting
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXWithHeldExtension
+import org.matrix.android.sdk.internal.crypto.keysbackup.DefaultKeysBackupService
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyContent
+import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyWithHeldContent
+import org.matrix.android.sdk.internal.crypto.model.rest.ForwardedRoomKeyContent
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
similarity index 70%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
index e8044186d8..b7b2919dbe 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.megolm
+package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
-import im.vector.matrix.android.internal.crypto.DeviceListManager
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
-import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
+import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index b131b77ce9..8c2dfc9e5d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -2,6 +2,7 @@
  * Copyright 2015 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,32 +17,32 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.megolm
+package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.internal.crypto.DeviceListManager
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
-import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
-import im.vector.matrix.android.internal.crypto.algorithms.IMXEncrypting
-import im.vector.matrix.android.internal.crypto.keysbackup.DefaultKeysBackupService
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.event.RoomKeyWithHeldContent
-import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode
-import im.vector.matrix.android.internal.crypto.model.forEach
-import im.vector.matrix.android.internal.crypto.repository.WarnOnUnknownDeviceRepository
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
-import im.vector.matrix.android.internal.util.convertToUTF8
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
+import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXEncrypting
+import org.matrix.android.sdk.internal.crypto.keysbackup.DefaultKeysBackupService
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyWithHeldContent
+import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
+import org.matrix.android.sdk.internal.crypto.model.forEach
+import org.matrix.android.sdk.internal.crypto.repository.WarnOnUnknownDeviceRepository
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.util.convertToUTF8
 import timber.log.Timber
 
 internal class MXMegolmEncryption(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
similarity index 68%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
index 3cc321621b..ca7b9657ae 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.megolm
+package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.internal.crypto.DeviceListManager
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
-import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
-import im.vector.matrix.android.internal.crypto.keysbackup.DefaultKeysBackupService
-import im.vector.matrix.android.internal.crypto.repository.WarnOnUnknownDeviceRepository
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.task.TaskExecutor
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
+import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
+import org.matrix.android.sdk.internal.crypto.keysbackup.DefaultKeysBackupService
+import org.matrix.android.sdk.internal.crypto.repository.WarnOnUnknownDeviceRepository
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
 
 internal class MXMegolmEncryptionFactory @Inject constructor(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
index 94c8d4494c..9bdebdf24f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2015 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +16,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.megolm
+package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
 import timber.log.Timber
 
 internal class MXOutboundSessionInfo(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/SharedWithHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/SharedWithHelper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
index 9a59db391f..c018f6e275 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/SharedWithHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.megolm
+package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 
 internal class SharedWithHelper(
         private val roomId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryption.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
index 5607e54fd6..d4295e2cec 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2015 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,20 +16,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.olm
+package org.matrix.android.sdk.internal.crypto.algorithms.olm
 
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.util.JSON_DICT_PARAMETERIZED_TYPE
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.algorithms.IMXDecrypting
-import im.vector.matrix.android.internal.crypto.model.event.OlmEventContent
-import im.vector.matrix.android.internal.crypto.model.event.OlmPayloadContent
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.internal.util.convertFromUTF8
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.util.JSON_DICT_PARAMETERIZED_TYPE
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXDecrypting
+import org.matrix.android.sdk.internal.crypto.model.event.OlmEventContent
+import org.matrix.android.sdk.internal.crypto.model.event.OlmPayloadContent
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.convertFromUTF8
 import timber.log.Timber
 
 internal class MXOlmDecryption(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
index 52a9a4f8c6..17c743fc08 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.olm
+package org.matrix.android.sdk.internal.crypto.algorithms.olm
 
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.di.UserId
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.di.UserId
 import javax.inject.Inject
 
 internal class MXOlmDecryptionFactory @Inject constructor(private val olmDevice: MXOlmDevice,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryption.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
index fc40331af2..f253ce005a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
@@ -2,6 +2,7 @@
  * Copyright 2015 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +17,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.olm
+package org.matrix.android.sdk.internal.crypto.algorithms.olm
 
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.internal.crypto.DeviceListManager
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.actions.EnsureOlmSessionsForUsersAction
-import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
-import im.vector.matrix.android.internal.crypto.algorithms.IMXEncrypting
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForUsersAction
+import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXEncrypting
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 
 internal class MXOlmEncryption(
         private val roomId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
index ef4057fe26..d80c344854 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.olm
+package org.matrix.android.sdk.internal.crypto.algorithms.olm
 
-import im.vector.matrix.android.internal.crypto.DeviceListManager
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.actions.EnsureOlmSessionsForUsersAction
-import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForUsersAction
+import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import javax.inject.Inject
 
 internal class MXOlmEncryptionFactory @Inject constructor(private val olmDevice: MXOlmDevice,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/OlmDecryptionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/OlmDecryptionResult.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/OlmDecryptionResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/OlmDecryptionResult.kt
index f882ed5ce6..ba627d4c30 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/OlmDecryptionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/OlmDecryptionResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.algorithms.olm
+package org.matrix.android.sdk.internal.crypto.algorithms.olm
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.util.JsonDict
+import org.matrix.android.sdk.api.util.JsonDict
 
 /**
  * This class represents the decryption result.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/api/CryptoApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/api/CryptoApi.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
index d3ba501d03..a12b725efd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/api/CryptoApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2014 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +15,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.api
+package org.matrix.android.sdk.internal.crypto.api
 
-import im.vector.matrix.android.internal.crypto.model.rest.DeleteDeviceParams
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse
-import im.vector.matrix.android.internal.crypto.model.rest.KeyChangesResponse
-import im.vector.matrix.android.internal.crypto.model.rest.KeysClaimBody
-import im.vector.matrix.android.internal.crypto.model.rest.KeysClaimResponse
-import im.vector.matrix.android.internal.crypto.model.rest.KeysQueryBody
-import im.vector.matrix.android.internal.crypto.model.rest.KeysQueryResponse
-import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadBody
-import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadResponse
-import im.vector.matrix.android.internal.crypto.model.rest.SendToDeviceBody
-import im.vector.matrix.android.internal.crypto.model.rest.SignatureUploadResponse
-import im.vector.matrix.android.internal.crypto.model.rest.UpdateDeviceInfoBody
-import im.vector.matrix.android.internal.crypto.model.rest.UploadSigningKeysBody
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.crypto.model.rest.DeleteDeviceParams
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DevicesListResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyChangesResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysClaimBody
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysClaimResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryBody
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysUploadBody
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysUploadResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.SendToDeviceBody
+import org.matrix.android.sdk.internal.crypto.model.rest.SignatureUploadResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.UpdateDeviceInfoBody
+import org.matrix.android.sdk.internal.crypto.model.rest.UploadSigningKeysBody
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -119,7 +120,9 @@ internal interface CryptoApi {
      * @param body          the body
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "sendToDevice/{eventType}/{txnId}")
-    fun sendToDevice(@Path("eventType") eventType: String, @Path("txnId") transactionId: String, @Body body: SendToDeviceBody): Call<Unit>
+    fun sendToDevice(@Path("eventType") eventType: String,
+                     @Path("txnId") transactionId: String,
+                     @Body body: SendToDeviceBody): Call<Unit>
 
     /**
      * Delete a device.
@@ -129,7 +132,8 @@ internal interface CryptoApi {
      * @param params   the deletion parameters
      */
     @HTTP(path = NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices/{device_id}", method = "DELETE", hasBody = true)
-    fun deleteDevice(@Path("device_id") deviceId: String, @Body params: DeleteDeviceParams): Call<Unit>
+    fun deleteDevice(@Path("device_id") deviceId: String,
+                     @Body params: DeleteDeviceParams): Call<Unit>
 
     /**
      * Update the device information.
@@ -139,7 +143,8 @@ internal interface CryptoApi {
      * @param params   the params
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices/{device_id}")
-    fun updateDeviceInfo(@Path("device_id") deviceId: String, @Body params: UpdateDeviceInfoBody): Call<Unit>
+    fun updateDeviceInfo(@Path("device_id") deviceId: String,
+                         @Body params: UpdateDeviceInfoBody): Call<Unit>
 
     /**
      * Get the update devices list from two sync token.
@@ -149,5 +154,6 @@ internal interface CryptoApi {
      * @param newToken the up-to token.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "keys/changes")
-    fun getKeyChanges(@Query("from") oldToken: String, @Query("to") newToken: String): Call<KeyChangesResponse>
+    fun getKeyChanges(@Query("from") oldToken: String,
+                      @Query("to") newToken: String): Call<KeyChangesResponse>
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/ElementToDecrypt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/ElementToDecrypt.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt
index a3fc98f674..21f7c209ef 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/ElementToDecrypt.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.attachments
+package org.matrix.android.sdk.internal.crypto.attachments
 
 import android.os.Parcelable
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 import kotlinx.android.parcel.Parcelize
 
 fun EncryptedFileInfo.toElementToDecrypt(): ElementToDecrypt? {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/EncryptionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/EncryptionResult.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/EncryptionResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/EncryptionResult.kt
index 3b89b3f559..721ee0639d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/EncryptionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/EncryptionResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.attachments
+package org.matrix.android.sdk.internal.crypto.attachments
 
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 /**
  * Define the result of an encryption file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/MXEncryptedAttachments.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/MXEncryptedAttachments.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
index 19243f1a23..cec1480d7b 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/MXEncryptedAttachments.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.attachments
+package org.matrix.android.sdk.internal.crypto.attachments
 
 import android.util.Base64
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileKey
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileKey
 import timber.log.Timber
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/ComputeTrustTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ComputeTrustTask.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/ComputeTrustTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ComputeTrustTask.kt
index 121479ad66..3bcbeefa91 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/ComputeTrustTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ComputeTrustTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.crosssigning
+package org.matrix.android.sdk.internal.crypto.crosssigning
 
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/DefaultCrossSigningService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
index 5a7c07fb53..8cd4a6b8e8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/DefaultCrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,29 +15,29 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.crosssigning
+package org.matrix.android.sdk.internal.crypto.crosssigning
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.crypto.DeviceListManager
-import im.vector.matrix.android.internal.crypto.model.rest.UploadSignatureQueryBuilder
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.store.PrivateKeysInfo
-import im.vector.matrix.android.internal.crypto.tasks.InitializeCrossSigningTask
-import im.vector.matrix.android.internal.crypto.tasks.UploadSignaturesTask
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.TaskThread
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.util.withoutPrefix
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
+import org.matrix.android.sdk.internal.crypto.model.rest.UploadSignatureQueryBuilder
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
+import org.matrix.android.sdk.internal.crypto.tasks.InitializeCrossSigningTask
+import org.matrix.android.sdk.internal.crypto.tasks.UploadSignaturesTask
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.TaskThread
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.withoutPrefix
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/DeviceTrustLevel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustLevel.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/DeviceTrustLevel.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustLevel.kt
index 075b141f8d..c371c84ade 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/DeviceTrustLevel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustLevel.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.crosssigning
+package org.matrix.android.sdk.internal.crypto.crosssigning
 
 data class DeviceTrustLevel(
         val crossSigningVerified: Boolean,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/DeviceTrustResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustResult.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/DeviceTrustResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustResult.kt
index 27d2c1e76d..cabfae1748 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/DeviceTrustResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.crosssigning
+package org.matrix.android.sdk.internal.crypto.crosssigning
 
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
 
 sealed class DeviceTrustResult {
     data class Success(val level: DeviceTrustLevel) : DeviceTrustResult()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/Extensions.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt
index fadfb567b3..8178a8810d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.crosssigning
+package org.matrix.android.sdk.internal.crypto.crosssigning
 
 import android.util.Base64
-import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 import timber.log.Timber
 
 fun CryptoDeviceInfo.canonicalSignable(): String {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/SessionToCryptoRoomMembersUpdate.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/SessionToCryptoRoomMembersUpdate.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/SessionToCryptoRoomMembersUpdate.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/SessionToCryptoRoomMembersUpdate.kt
index 2f1cb77a21..9b06d79693 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/SessionToCryptoRoomMembersUpdate.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/SessionToCryptoRoomMembersUpdate.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.crosssigning
+package org.matrix.android.sdk.internal.crypto.crosssigning
 
 data class SessionToCryptoRoomMembersUpdate(
         val roomId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/ShieldTrustUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/ShieldTrustUpdater.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt
index cadcf3d855..e8c1317604 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/ShieldTrustUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.crosssigning
+package org.matrix.android.sdk.internal.crypto.crosssigning
 
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntityFields
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.SessionLifecycleObserver
-import im.vector.matrix.android.internal.session.room.summary.RoomSummaryUpdater
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberHelper
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.createBackgroundHandler
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryUpdater
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.createBackgroundHandler
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.android.asCoroutineDispatcher
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/UserTrustResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UserTrustResult.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/UserTrustResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UserTrustResult.kt
index c4235531fb..878cbd0b32 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/crosssigning/UserTrustResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UserTrustResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.crosssigning
+package org.matrix.android.sdk.internal.crypto.crosssigning
 
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
-import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
 
 sealed class UserTrustResult {
     object Success : UserTrustResult()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/DefaultKeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/DefaultKeysBackupService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
index 38dae20a83..949677182c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/DefaultKeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,73 +15,73 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup
+package org.matrix.android.sdk.internal.crypto.keysbackup
 
 import android.os.Handler
 import android.os.Looper
 import androidx.annotation.UiThread
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.listeners.StepProgressListener
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.MegolmSessionData
-import im.vector.matrix.android.internal.crypto.ObjectSigner
-import im.vector.matrix.android.internal.crypto.actions.MegolmSessionDataImporter
-import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64
-import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust
-import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrustSignature
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupAuthData
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.BackupKeysResult
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.CreateKeysBackupVersionBody
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeyBackupData
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysBackupData
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.UpdateKeysBackupVersionBody
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.CreateKeysBackupVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DeleteBackupTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DeleteRoomSessionDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DeleteRoomSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.DeleteSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.GetKeysBackupLastVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.GetKeysBackupVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.GetRoomSessionDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.GetRoomSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.GetSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.StoreRoomSessionDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.StoreRoomSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.StoreSessionsDataTask
-import im.vector.matrix.android.internal.crypto.keysbackup.tasks.UpdateKeysBackupVersionTask
-import im.vector.matrix.android.internal.crypto.keysbackup.util.computeRecoveryKey
-import im.vector.matrix.android.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper2
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.store.SavedKeyBackupKeyInfo
-import im.vector.matrix.android.internal.crypto.store.db.model.KeysBackupDataEntity
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.extensions.foldToCallback
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.TaskThread
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.util.awaitCallback
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.listeners.StepProgressListener
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.MegolmSessionData
+import org.matrix.android.sdk.internal.crypto.ObjectSigner
+import org.matrix.android.sdk.internal.crypto.actions.MegolmSessionDataImporter
+import org.matrix.android.sdk.internal.crypto.crosssigning.fromBase64
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.KeysBackupVersionTrust
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.KeysBackupVersionTrustSignature
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupAuthData
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.BackupKeysResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.CreateKeysBackupVersionBody
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeyBackupData
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysBackupData
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.UpdateKeysBackupVersionBody
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.CreateKeysBackupVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DeleteBackupTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DeleteRoomSessionDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DeleteRoomSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.DeleteSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.GetKeysBackupLastVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.GetKeysBackupVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.GetRoomSessionDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.GetRoomSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.GetSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.StoreRoomSessionDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.StoreRoomSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.StoreSessionsDataTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.UpdateKeysBackupVersionTask
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.computeRecoveryKey
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
+import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.store.SavedKeyBackupKeyInfo
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntity
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.extensions.foldToCallback
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.TaskThread
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPassword.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPassword.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
index 2429c1e658..e796514cf4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPassword.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +18,10 @@
 /**
  * Utility to compute a backup private key from a password and vice-versa.
  */
-package im.vector.matrix.android.internal.crypto.keysbackup
+package org.matrix.android.sdk.internal.crypto.keysbackup
 
 import androidx.annotation.WorkerThread
-import im.vector.matrix.android.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.listeners.ProgressListener
 import timber.log.Timber
 import java.util.UUID
 import javax.crypto.Mac
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupStateManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupStateManager.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt
index cd74d04a67..19a1f08177 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupStateManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup
+package org.matrix.android.sdk.internal.crypto.keysbackup
 
 import android.os.Handler
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
 import timber.log.Timber
 
 internal class KeysBackupStateManager(private val uiHandler: Handler) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/api/RoomKeysApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/api/RoomKeysApi.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
index 75de995be3..de59aa8ae7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/api/RoomKeysApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.api
+package org.matrix.android.sdk.internal.crypto.keysbackup.api
 
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.BackupKeysResult
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.CreateKeysBackupVersionBody
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeyBackupData
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysBackupData
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.UpdateKeysBackupVersionBody
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.BackupKeysResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.CreateKeysBackupVersionBody
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeyBackupData
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysBackupData
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.UpdateKeysBackupVersionBody
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeyBackupVersionTrust.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrust.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeyBackupVersionTrust.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrust.kt
index 77531d285c..871874bc9a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeyBackupVersionTrust.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrust.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model
+package org.matrix.android.sdk.internal.crypto.keysbackup.model
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
index e85e1cc433..955bd5e531 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model
+package org.matrix.android.sdk.internal.crypto.keysbackup.model
 
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 
 /**
  * A signature in a the `KeyBackupVersionTrust` object.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
index fc642b3fb2..a7d23c42dd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model
+package org.matrix.android.sdk.internal.crypto.keysbackup.model
 
 /**
  * Data model for response to [KeysBackup.getKeysBackupTrust()].
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
index b860afd36d..8382fff6f2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model
+package org.matrix.android.sdk.internal.crypto.keysbackup.model
 
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 
 /**
  * A signature in a `KeysBackupVersionTrust` object.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/MegolmBackupAuthData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupAuthData.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/MegolmBackupAuthData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupAuthData.kt
index 48015a98dd..aa5629e6d9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/MegolmBackupAuthData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupAuthData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model
+package org.matrix.android.sdk.internal.crypto.keysbackup.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.MoshiProvider
 
 /**
  * Data model for [org.matrix.androidsdk.rest.model.keys.KeysAlgorithmAndData.authData] in case
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
index b329fa44c9..25b191e5bd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model
+package org.matrix.android.sdk.internal.crypto.keysbackup.model
 
 /**
  * Data retrieved from Olm library. algorithm and authData will be send to the homeserver, and recoveryKey will be displayed to the user
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/BackupKeysResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/BackupKeysResult.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/BackupKeysResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/BackupKeysResult.kt
index e2abc38186..4903372abd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/BackupKeysResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/BackupKeysResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model.rest
+package org.matrix.android.sdk.internal.crypto.keysbackup.model.rest
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/CreateKeysBackupVersionBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/CreateKeysBackupVersionBody.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/CreateKeysBackupVersionBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/CreateKeysBackupVersionBody.kt
index f0c0ada207..1f493571d3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/CreateKeysBackupVersionBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/CreateKeysBackupVersionBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model.rest
+package org.matrix.android.sdk.internal.crypto.keysbackup.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.util.JsonDict
+import org.matrix.android.sdk.api.util.JsonDict
 
 @JsonClass(generateAdapter = true)
 data class CreateKeysBackupVersionBody(
@@ -30,7 +31,7 @@ data class CreateKeysBackupVersionBody(
 
         /**
          * algorithm-dependent data, for "m.megolm_backup.v1.curve25519-aes-sha2"
-         * see [im.vector.matrix.android.internal.crypto.keysbackup.MegolmBackupAuthData]
+         * see [org.matrix.android.sdk.internal.crypto.keysbackup.MegolmBackupAuthData]
          */
         @Json(name = "auth_data")
         override val authData: JsonDict? = null
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeyBackupData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeyBackupData.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeyBackupData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeyBackupData.kt
index b2d10687aa..b03d51894c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeyBackupData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeyBackupData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model.rest
+package org.matrix.android.sdk.internal.crypto.keysbackup.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.internal.network.parsing.ForceToBoolean
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.network.parsing.ForceToBoolean
 
 /**
  * Backup data for one key.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
index 81ca6586a3..99031ca458 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model.rest
+package org.matrix.android.sdk.internal.crypto.keysbackup.model.rest
 
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupAuthData
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupAuthData
+import org.matrix.android.sdk.internal.di.MoshiProvider
 
 /**
  * <pre>
@@ -45,7 +46,7 @@ interface KeysAlgorithmAndData {
     val algorithm: String?
 
     /**
-     * algorithm-dependent data, for "m.megolm_backup.v1.curve25519-aes-sha2" see [im.vector.matrix.android.internal.crypto.keysbackup.MegolmBackupAuthData]
+     * algorithm-dependent data, for "m.megolm_backup.v1.curve25519-aes-sha2" see [org.matrix.android.sdk.internal.crypto.keysbackup.MegolmBackupAuthData]
      */
     val authData: JsonDict?
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysBackupData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysBackupData.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysBackupData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysBackupData.kt
index 240c79fd1e..34c5d1c531 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysBackupData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysBackupData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model.rest
+package org.matrix.android.sdk.internal.crypto.keysbackup.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysVersion.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt
index 4e33c17be3..3ca8df3131 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model.rest
+package org.matrix.android.sdk.internal.crypto.keysbackup.model.rest
 
 data class KeysVersion(
         // the keys backup version
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
index ba5cb2a379..fd5d926871 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model.rest
+package org.matrix.android.sdk.internal.crypto.keysbackup.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.util.JsonDict
+import org.matrix.android.sdk.api.util.JsonDict
 
 @JsonClass(generateAdapter = true)
 data class KeysVersionResult(
@@ -30,7 +31,7 @@ data class KeysVersionResult(
 
         /**
          * algorithm-dependent data, for "m.megolm_backup.v1.curve25519-aes-sha2"
-         * see [im.vector.matrix.android.internal.crypto.keysbackup.MegolmBackupAuthData]
+         * see [org.matrix.android.sdk.internal.crypto.keysbackup.MegolmBackupAuthData]
          */
         @Json(name = "auth_data")
         override val authData: JsonDict? = null,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/RoomKeysBackupData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/RoomKeysBackupData.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/RoomKeysBackupData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/RoomKeysBackupData.kt
index f3c218baca..7564e54fc0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/RoomKeysBackupData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/RoomKeysBackupData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model.rest
+package org.matrix.android.sdk.internal.crypto.keysbackup.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
index bb12911e42..6de374d380 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.model.rest
+package org.matrix.android.sdk.internal.crypto.keysbackup.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.util.JsonDict
+import org.matrix.android.sdk.api.util.JsonDict
 
 @JsonClass(generateAdapter = true)
 data class UpdateKeysBackupVersionBody(
@@ -30,7 +31,7 @@ data class UpdateKeysBackupVersionBody(
 
         /**
          * algorithm-dependent data, for "m.megolm_backup.v1.curve25519-aes-sha2"
-         * see [im.vector.matrix.android.internal.crypto.keysbackup.MegolmBackupAuthData]
+         * see [org.matrix.android.sdk.internal.crypto.keysbackup.MegolmBackupAuthData]
          */
         @Json(name = "auth_data")
         override val authData: JsonDict? = null,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
similarity index 71%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
index 9b8183bd02..3b11e91716 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.CreateKeysBackupVersionBody
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.CreateKeysBackupVersionBody
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
index 9712bb099b..25417ef4fe 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
index 72173ec7f4..12042f6459 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
index e9f35fb3d4..92e5153d41 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
index 81244158b6..66e1fa0203 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
index 07d04965f8..afd0e85f59 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
index 70cc7472a9..b454a83b89 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
index 327836ed5f..5c5d3c3afa 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeyBackupData
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeyBackupData
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
index 7c99fdafb7..d8b49d49d4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
index f2822db249..c0a05eaff9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysBackupData
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysBackupData
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
index 112af22da1..31a464dc38 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.BackupKeysResult
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeyBackupData
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.BackupKeysResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeyBackupData
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
index 1790741d08..057198aaf9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.BackupKeysResult
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.BackupKeysResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
index 5472900f2e..33f6a0862d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.BackupKeysResult
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysBackupData
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.BackupKeysResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysBackupData
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
index 6877465d36..68725b1eb1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.tasks
+package org.matrix.android.sdk.internal.crypto.keysbackup.tasks
 
-import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.UpdateKeysBackupVersionBody
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.keysbackup.api.RoomKeysApi
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.UpdateKeysBackupVersionBody
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/util/Base58.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/util/Base58.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58.kt
index cafb9ba6f2..adbcd18d12 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/util/Base58.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2011 Google Inc.
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.util
+package org.matrix.android.sdk.internal.crypto.keysbackup.util
 
 import java.math.BigInteger
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/util/RecoveryKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKey.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/util/RecoveryKey.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKey.kt
index 86ab5cfb8a..78697ca9ce 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/util/RecoveryKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKey.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.util
+package org.matrix.android.sdk.internal.crypto.keysbackup.util
 
 import kotlin.experimental.xor
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoCrossSigningKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoCrossSigningKey.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt
index b12eaabaed..168258acd2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoCrossSigningKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.rest.RestKeyInfo
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.rest.RestKeyInfo
 
 data class CryptoCrossSigningKey(
         override val userId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoDeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoDeviceInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt
index bc73111ace..b4bba72718 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoDeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceKeys
-import im.vector.matrix.android.internal.crypto.model.rest.UnsignedDeviceInfo
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoMapper
-import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntity
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceKeys
+import org.matrix.android.sdk.internal.crypto.model.rest.UnsignedDeviceInfo
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMapper
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntity
 
 data class CryptoDeviceInfo(
         val deviceId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfo.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfo.kt
index c9d49bede0..116205dce4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
 /**
  * Generic crypto info.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoInfoMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfoMapper.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoInfoMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfoMapper.kt
index a847b65d1f..ead1dd5457 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoInfoMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfoMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceKeys
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceKeysWithUnsigned
-import im.vector.matrix.android.internal.crypto.model.rest.RestKeyInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceKeys
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceKeysWithUnsigned
+import org.matrix.android.sdk.internal.crypto.model.rest.RestKeyInfo
 
 internal object CryptoInfoMapper {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/ImportRoomKeysResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/ImportRoomKeysResult.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/ImportRoomKeysResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/ImportRoomKeysResult.kt
index 03def499ae..0ecda951df 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/ImportRoomKeysResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/ImportRoomKeysResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
 data class ImportRoomKeysResult(val totalNumberOfKeys: Int,
                                 val successfullyNumberOfImportedKeys: Int)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXDeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXDeviceInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
index ae53694a0f..1733cc3913 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXDeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
@@ -2,6 +2,7 @@
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +17,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceKeys
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceKeys
 import java.io.Serializable
 
 @JsonClass(generateAdapter = true)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXEncryptEventContentResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXEncryptEventContentResult.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXEncryptEventContentResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXEncryptEventContentResult.kt
index 7eaeb5bb07..0f0b289bc6 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXEncryptEventContentResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXEncryptEventContentResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
-import im.vector.matrix.android.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Content
 
 data class MXEncryptEventContentResult(
         /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXKey.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXKey.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXKey.kt
index 701932f493..8808c83985 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXKey.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
-import im.vector.matrix.android.api.util.JsonDict
+import org.matrix.android.sdk.api.util.JsonDict
 import timber.log.Timber
 
 data class MXKey(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXOlmSessionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXOlmSessionResult.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXOlmSessionResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXOlmSessionResult.kt
index 3f0dfe8b57..30f4a6bba1 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXOlmSessionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXOlmSessionResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
 import java.io.Serializable
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXQueuedEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXQueuedEncryption.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt
index e005302e8b..598f16bdf3 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXQueuedEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.events.model.Content
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.events.model.Content
 
 class MXQueuedEncryption {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXUsersDevicesMap.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXUsersDevicesMap.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXUsersDevicesMap.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXUsersDevicesMap.kt
index 4188078522..aa0d9a2e6d 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXUsersDevicesMap.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXUsersDevicesMap.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
 class MXUsersDevicesMap<E> {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmInboundGroupSessionWrapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
index cf1a3b237a..1621db380d 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +16,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.MegolmSessionData
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.MegolmSessionData
 import org.matrix.olm.OlmInboundGroupSession
 import timber.log.Timber
 import java.io.Serializable
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
index c51e707aeb..091106c161 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.MegolmSessionData
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.MegolmSessionData
 import org.matrix.olm.OlmInboundGroupSession
 import timber.log.Timber
 import java.io.Serializable
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmSessionWrapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmSessionWrapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt
index acd056d9b9..448043024d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmSessionWrapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model
+package org.matrix.android.sdk.internal.crypto.model
 
 import org.matrix.olm.OlmSession
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptedEventContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptedEventContent.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptedEventContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptedEventContent.kt
index 3efb2f59ad..79f86bd28c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptedEventContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptedEventContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.event
+package org.matrix.android.sdk.internal.crypto.model.event
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
 /**
  * Class representing an encrypted event content
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptionEventContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptionEventContent.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptionEventContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptionEventContent.kt
index 05e97da68d..255e5e8d81 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptionEventContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptionEventContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.event
+package org.matrix.android.sdk.internal.crypto.model.event
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/NewDeviceContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/NewDeviceContent.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/NewDeviceContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/NewDeviceContent.kt
index 62fe4293e7..27ccc2d041 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/NewDeviceContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/NewDeviceContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.event
+package org.matrix.android.sdk.internal.crypto.model.event
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/OlmEventContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmEventContent.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/OlmEventContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmEventContent.kt
index 2b2b49120a..f9de805962 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/OlmEventContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmEventContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.event
+package org.matrix.android.sdk.internal.crypto.model.event
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/OlmPayloadContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/OlmPayloadContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt
index bf5833a44f..a3a9ee2e51 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/OlmPayloadContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.event
+package org.matrix.android.sdk.internal.crypto.model.event
 
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.MoshiProvider
 
 /**
  * Class representing the OLM payload content
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/RoomKeyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyContent.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/RoomKeyContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyContent.kt
index 81f450041a..eeaf52f0e1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/RoomKeyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.event
+package org.matrix.android.sdk.internal.crypto.model.event
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/RoomKeyWithHeldContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/RoomKeyWithHeldContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt
index 9c2b4ceb05..5d9a1937af 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/RoomKeyWithHeldContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.event
+package org.matrix.android.sdk.internal.crypto.model.event
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/SecretSendEventContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/SecretSendEventContent.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/SecretSendEventContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/SecretSendEventContent.kt
index 4a856b32a1..5b7a139488 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/SecretSendEventContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/SecretSendEventContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.event
+package org.matrix.android.sdk.internal.crypto.model.event
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeleteDeviceParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeleteDeviceParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt
index fa4daa112c..4b1530c9c6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeleteDeviceParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
index b058fac082..97c7c59b50 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
@@ -2,6 +2,7 @@
  * Copyright 2014 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.interfaces.DatedObject
+import org.matrix.android.sdk.api.interfaces.DatedObject
 
 /**
  * This class describes the device information
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceKeys.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeys.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceKeys.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeys.kt
index 81dac28898..efc036c4d8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceKeys.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeys.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceKeysWithUnsigned.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeysWithUnsigned.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceKeysWithUnsigned.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeysWithUnsigned.kt
index f702f1d387..c0f900f6c0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceKeysWithUnsigned.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeysWithUnsigned.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DevicesListResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DevicesListResponse.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DevicesListResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DevicesListResponse.kt
index 2bf3d06299..934a0cf43c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DevicesListResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DevicesListResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DummyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DummyContent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DummyContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DummyContent.kt
index b52354768d..8464566d7c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DummyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DummyContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 /**
  * Class representing the dummy content
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedBodyFileInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedBodyFileInfo.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedBodyFileInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedBodyFileInfo.kt
index a83001fe07..56156cf749 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedBodyFileInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedBodyFileInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import org.matrix.olm.OlmPkMessage
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedFileInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileInfo.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedFileInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileInfo.kt
index 93e8b4d211..65455e9fa3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedFileInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedFileKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedFileKey.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt
index fa5885de49..f0a680cfd3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedFileKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedMessage.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedMessage.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedMessage.kt
index e3ada0c0ab..d044815542 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedMessage.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/ForwardedRoomKeyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
index ea5fb26d83..927828c4a0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/GossipingToDeviceObject.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/GossipingToDeviceObject.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/GossipingToDeviceObject.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/GossipingToDeviceObject.kt
index deaccdef16..c3b156084d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/GossipingToDeviceObject.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/GossipingToDeviceObject.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyChangesResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyChangesResponse.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyChangesResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyChangesResponse.kt
index 3af7d7c8c5..5c677c7123 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyChangesResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyChangesResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 Vector Creations Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationAccept.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationAccept.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt
index 2168ac3b04..c4e3dd9297 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationAccept.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAccept
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAcceptFactory
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoAccept
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoAcceptFactory
 
 /**
  * Sent by Bob to accept a verification from a previously sent m.key.verification.start message.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationCancel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationCancel.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationCancel.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationCancel.kt
index e1bf84ea92..ea2cbf214b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationCancel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationCancel.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoCancel
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoCancel
 
 /**
  * To device event sent by either party to cancel a key verification.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationDone.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationDone.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationDone.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationDone.kt
index 1456183a55..e4d75a0de6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationDone.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationDone.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoDone
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoDone
 
 /**
  * Requests a key verification with another user's devices.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationKey.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationKey.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationKey.kt
index 55450ceaf1..bf1ded002e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationKey.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoKey
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoKeyFactory
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoKey
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoKeyFactory
 
 /**
  * Sent by both devices to send their ephemeral Curve25519 public key to the other device.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationMac.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationMac.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationMac.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationMac.kt
index 19e9176299..001cabaa4e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationMac.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationMac.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoMac
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoMacFactory
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoMac
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoMacFactory
 
 /**
  * Sent by both devices to send the MAC of their device key to the other device.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationReady.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationReady.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationReady.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationReady.kt
index fea01fd345..25d6984560 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationReady.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationReady.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoReady
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoReady
 
 /**
  * Requests a key verification with another user's devices.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationRequest.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationRequest.kt
index ed21747f27..1bf1d1a5c2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationRequest.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoRequest
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoRequest
 
 /**
  * Requests a key verification with another user's devices.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationStart.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationStart.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationStart.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationStart.kt
index a410a14dfe..bc99c71f09 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationStart.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationStart.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoStart
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoStart
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 
 /**
  * Sent by Alice to initiate an interactive key verification.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimBody.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimBody.kt
index 26ee1ebe38..f48936a80e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimResponse.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimResponse.kt
index 3483873fbb..a1eebcb694 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysQueryBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysQueryBody.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysQueryBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysQueryBody.kt
index 758967d05e..4232225cbe 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysQueryBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysQueryBody.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysQueryResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysQueryResponse.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysQueryResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysQueryResponse.kt
index 82ea793116..a099419c3c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysQueryResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysQueryResponse.kt
@@ -1,5 +1,5 @@
 /*
-
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysUploadBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadBody.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysUploadBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadBody.kt
index 516f64f40e..3d9652e328 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysUploadBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.util.JsonDict
+import org.matrix.android.sdk.api.util.JsonDict
 
 /**
  * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-keys-upload
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysUploadResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadResponse.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysUploadResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadResponse.kt
index 70eca3bf0b..07904969f0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysUploadResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RestKeyInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RestKeyInfo.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RestKeyInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RestKeyInfo.kt
index 4788f98a6d..cfdb300f16 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RestKeyInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RestKeyInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
-import im.vector.matrix.android.internal.crypto.model.CryptoInfoMapper
+import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
+import org.matrix.android.sdk.internal.crypto.model.CryptoInfoMapper
 
 @JsonClass(generateAdapter = true)
 internal data class RestKeyInfo(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyRequestBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyRequestBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt
index 0b7c3a201f..e3a65df5d0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyRequestBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.MoshiProvider
 
 /**
  * Class representing an room key request body content
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt
index c2fc6fe96b..299c084819 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SecretShareRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SecretShareRequest.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SecretShareRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SecretShareRequest.kt
index 86ae042166..98a586d136 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SecretShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SecretShareRequest.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SendToDeviceBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SendToDeviceBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt
index df4482f0bf..e7df20ee5e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SendToDeviceBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 internal data class SendToDeviceBody(
         /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SendToDeviceObject.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceObject.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SendToDeviceObject.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceObject.kt
index e69debbd95..a018d62ab4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SendToDeviceObject.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceObject.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +15,6 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 interface SendToDeviceObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/ShareRequestCancellation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ShareRequestCancellation.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/ShareRequestCancellation.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ShareRequestCancellation.kt
index 10be81be7d..b6449fe8ed 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/ShareRequestCancellation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ShareRequestCancellation.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.model.rest.GossipingToDeviceObject.Companion.ACTION_SHARE_CANCELLATION
+import org.matrix.android.sdk.internal.crypto.model.rest.GossipingToDeviceObject.Companion.ACTION_SHARE_CANCELLATION
 
 /**
  * Class representing a room key request cancellation content
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SignatureUploadResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SignatureUploadResponse.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SignatureUploadResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SignatureUploadResponse.kt
index b758489020..e21fd8fbd4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SignatureUploadResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SignatureUploadResponse.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UnsignedDeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UnsignedDeviceInfo.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UnsignedDeviceInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UnsignedDeviceInfo.kt
index 364e213e3a..1fc0d417e8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UnsignedDeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UnsignedDeviceInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UpdateDeviceInfoBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
index 8ae373ba8c..ac691e6e6e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt
index 05d2d88f95..dbb2822cdd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
-import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.toRest
+import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.toRest
 
 /**
  * Helper class to build CryptoApi#uploadSignatures params
@@ -38,11 +39,8 @@ internal data class UploadSignatureQueryBuilder(
     fun build(): Map<String, Map<String, @JvmSuppressWildcards Any>> {
         val map = HashMap<String, HashMap<String, Any>>()
 
-        val usersList = (
-                deviceInfoList.map { it.userId }
-                        + signingKeyInfoList
-                        .map { it.userId }
-                ).distinct()
+        val usersList = (deviceInfoList.map { it.userId } + signingKeyInfoList.map { it.userId })
+                .distinct()
 
         usersList.forEach { userID ->
             val userMap = HashMap<String, Any>()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UploadSigningKeysBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UploadSigningKeysBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt
index 2b485ea4b1..a7a61b282f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UploadSigningKeysBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UserPasswordAuth.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UserPasswordAuth.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt
index 0e0fa9002d..018f707105 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UserPasswordAuth.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 
 /**
  * This class provides the authentication data by using user and password
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/VerificationMethodValues.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/VerificationMethodValues.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/VerificationMethodValues.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/VerificationMethodValues.kt
index 98613e147a..99bbebf7eb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/VerificationMethodValues.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/VerificationMethodValues.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.model.rest
+package org.matrix.android.sdk.internal.crypto.model.rest
 
-import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
 
 internal const val VERIFICATION_METHOD_SAS = "m.sas.v1"
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
index 879e565b57..20b8ff1840 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.repository
+package org.matrix.android.sdk.internal.crypto.repository
 
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
 
 @SessionScope
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/secrets/DefaultSharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
index 7db3d6ead3..7186bc3cd0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,37 +15,37 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.secrets
+package org.matrix.android.sdk.internal.crypto.secrets
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.session.accountdata.AccountDataService
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.securestorage.EncryptedSecretContent
-import im.vector.matrix.android.api.session.securestorage.IntegrityResult
-import im.vector.matrix.android.api.session.securestorage.KeyInfo
-import im.vector.matrix.android.api.session.securestorage.KeyInfoResult
-import im.vector.matrix.android.api.session.securestorage.KeySigner
-import im.vector.matrix.android.api.session.securestorage.RawBytesKeySpec
-import im.vector.matrix.android.api.session.securestorage.SecretStorageKeyContent
-import im.vector.matrix.android.api.session.securestorage.SharedSecretStorageError
-import im.vector.matrix.android.api.session.securestorage.SharedSecretStorageService
-import im.vector.matrix.android.api.session.securestorage.SsssKeyCreationInfo
-import im.vector.matrix.android.api.session.securestorage.SsssKeySpec
-import im.vector.matrix.android.api.session.securestorage.SsssPassphrase
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.SSSS_ALGORITHM_AES_HMAC_SHA2
-import im.vector.matrix.android.internal.crypto.SSSS_ALGORITHM_CURVE25519_AES_SHA2
-import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64
-import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding
-import im.vector.matrix.android.internal.crypto.keysbackup.generatePrivateKeyWithPassword
-import im.vector.matrix.android.internal.crypto.keysbackup.util.computeRecoveryKey
-import im.vector.matrix.android.internal.crypto.tools.HkdfSha256
-import im.vector.matrix.android.internal.crypto.tools.withOlmDecryption
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.extensions.foldToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.session.accountdata.AccountDataService
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.securestorage.EncryptedSecretContent
+import org.matrix.android.sdk.api.session.securestorage.IntegrityResult
+import org.matrix.android.sdk.api.session.securestorage.KeyInfo
+import org.matrix.android.sdk.api.session.securestorage.KeyInfoResult
+import org.matrix.android.sdk.api.session.securestorage.KeySigner
+import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
+import org.matrix.android.sdk.api.session.securestorage.SecretStorageKeyContent
+import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageError
+import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
+import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
+import org.matrix.android.sdk.api.session.securestorage.SsssKeySpec
+import org.matrix.android.sdk.api.session.securestorage.SsssPassphrase
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.SSSS_ALGORITHM_AES_HMAC_SHA2
+import org.matrix.android.sdk.internal.crypto.SSSS_ALGORITHM_CURVE25519_AES_SHA2
+import org.matrix.android.sdk.internal.crypto.crosssigning.fromBase64
+import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
+import org.matrix.android.sdk.internal.crypto.keysbackup.generatePrivateKeyWithPassword
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.computeRecoveryKey
+import org.matrix.android.sdk.internal.crypto.tools.HkdfSha256
+import org.matrix.android.sdk.internal.crypto.tools.withOlmDecryption
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.extensions.foldToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.matrix.olm.OlmPkMessage
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/IMXCryptoStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
index f518332298..f248e464c2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/IMXCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
@@ -2,6 +2,7 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,28 +17,28 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store
+package org.matrix.android.sdk.internal.crypto.store
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.crypto.GossipingRequestState
-import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.IncomingShareRequestCommon
-import im.vector.matrix.android.internal.crypto.NewSessionListener
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestState
-import im.vector.matrix.android.internal.crypto.OutgoingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.OutgoingSecretRequest
-import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper2
-import im.vector.matrix.android.internal.crypto.model.OlmSessionWrapper
-import im.vector.matrix.android.internal.crypto.model.event.RoomKeyWithHeldContent
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
-import im.vector.matrix.android.internal.crypto.store.db.model.KeysBackupDataEntity
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.crypto.GossipingRequestState
+import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.IncomingShareRequestCommon
+import org.matrix.android.sdk.internal.crypto.NewSessionListener
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestState
+import org.matrix.android.sdk.internal.crypto.OutgoingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.OutgoingSecretRequest
+import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
+import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
+import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyWithHeldContent
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntity
 import org.matrix.olm.OlmAccount
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/PrivateKeysInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/PrivateKeysInfo.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/PrivateKeysInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/PrivateKeysInfo.kt
index d1591e35d8..5c8476ea1f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/PrivateKeysInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/PrivateKeysInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store
+package org.matrix.android.sdk.internal.crypto.store
 
 data class PrivateKeysInfo(
         val master: String? = null,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/SavedKeyBackupKeyInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/SavedKeyBackupKeyInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt
index fda9bb1d72..2d0c53a584 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/SavedKeyBackupKeyInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store
+package org.matrix.android.sdk.internal.crypto.store
 
 data class SavedKeyBackupKeyInfo(
         val recoveryKey : String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt
index ab4f4df354..978c82303e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db
+package org.matrix.android.sdk.internal.crypto.store.db
 
 import android.util.Base64
-import im.vector.matrix.android.internal.util.CompatUtil
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.RealmObject
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
-import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
 import java.util.zip.GZIPInputStream
+import java.util.zip.GZIPOutputStream
 
 /**
  * Get realm, invoke the action, close realm, and return the result of the action
@@ -78,7 +78,7 @@ fun serializeForRealm(o: Any?): String? {
     }
 
     val baos = ByteArrayOutputStream()
-    val gzis = CompatUtil.createGzipOutputStream(baos)
+    val gzis = GZIPOutputStream(baos)
     val out = ObjectOutputStream(gzis)
     out.use {
         it.writeObject(o)
@@ -98,7 +98,7 @@ fun <T> deserializeFromRealm(string: String?): T? {
 
     val bais = ByteArrayInputStream(decodedB64)
     val gzis = GZIPInputStream(bais)
-    val ois = ObjectInputStream(gzis)
+    val ois = SafeObjectInputStream(gzis)
     return ois.use {
         it.readObject() as T
     }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 0e67850304..a7b9503a84 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,76 +15,76 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db
+package org.matrix.android.sdk.internal.crypto.store.db
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.crypto.GossipRequestType
-import im.vector.matrix.android.internal.crypto.GossipingRequestState
-import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.IncomingSecretShareRequest
-import im.vector.matrix.android.internal.crypto.IncomingShareRequestCommon
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.NewSessionListener
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestState
-import im.vector.matrix.android.internal.crypto.OutgoingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.OutgoingSecretRequest
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper2
-import im.vector.matrix.android.internal.crypto.model.OlmSessionWrapper
-import im.vector.matrix.android.internal.crypto.model.event.RoomKeyWithHeldContent
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
-import im.vector.matrix.android.internal.crypto.model.toEntity
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.store.PrivateKeysInfo
-import im.vector.matrix.android.internal.crypto.store.SavedKeyBackupKeyInfo
-import im.vector.matrix.android.internal.crypto.store.db.mapper.CrossSigningKeysMapper
-import im.vector.matrix.android.internal.crypto.store.db.model.CrossSigningInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.CrossSigningInfoEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoMapper
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoMetadataEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoRoomEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoRoomEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.GossipingEventEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.IncomingGossipingRequestEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.IncomingGossipingRequestEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.KeysBackupDataEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.OlmInboundGroupSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.OlmInboundGroupSessionEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.OlmSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.OlmSessionEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.OutgoingGossipingRequestEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.OutgoingGossipingRequestEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.SharedSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.TrustLevelEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.UserEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.UserEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.WithHeldSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.createPrimaryKey
-import im.vector.matrix.android.internal.crypto.store.db.query.create
-import im.vector.matrix.android.internal.crypto.store.db.query.delete
-import im.vector.matrix.android.internal.crypto.store.db.query.get
-import im.vector.matrix.android.internal.crypto.store.db.query.getById
-import im.vector.matrix.android.internal.crypto.store.db.query.getOrCreate
-import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.di.CryptoDatabase
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.crypto.GossipRequestType
+import org.matrix.android.sdk.internal.crypto.GossipingRequestState
+import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.IncomingSecretShareRequest
+import org.matrix.android.sdk.internal.crypto.IncomingShareRequestCommon
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.NewSessionListener
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestState
+import org.matrix.android.sdk.internal.crypto.OutgoingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.OutgoingSecretRequest
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
+import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
+import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyWithHeldContent
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.internal.crypto.model.toEntity
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
+import org.matrix.android.sdk.internal.crypto.store.SavedKeyBackupKeyInfo
+import org.matrix.android.sdk.internal.crypto.store.db.mapper.CrossSigningKeysMapper
+import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMapper
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMetadataEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.GossipingEventEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.IncomingGossipingRequestEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.IncomingGossipingRequestEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmSessionEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.OutgoingGossipingRequestEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.OutgoingGossipingRequestEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.SharedSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.TrustLevelEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.createPrimaryKey
+import org.matrix.android.sdk.internal.crypto.store.db.query.create
+import org.matrix.android.sdk.internal.crypto.store.db.query.delete
+import org.matrix.android.sdk.internal.crypto.store.db.query.get
+import org.matrix.android.sdk.internal.crypto.store.db.query.getById
+import org.matrix.android.sdk.internal.crypto.store.db.query.getOrCreate
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.di.CryptoDatabase
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.session.SessionScope
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.Sort
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
index 0cca430799..fbc1eb6bb1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,33 +15,33 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db
+package org.matrix.android.sdk.internal.crypto.store.db
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper
-import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper2
-import im.vector.matrix.android.internal.crypto.store.db.mapper.CrossSigningKeysMapper
-import im.vector.matrix.android.internal.crypto.store.db.model.CrossSigningInfoEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoMetadataEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoRoomEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.GossipingEventEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.IncomingGossipingRequestEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.KeyInfoEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.KeysBackupDataEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.OlmInboundGroupSessionEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.OlmSessionEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.OutgoingGossipingRequestEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.SharedSessionEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.TrustLevelEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.UserEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.WithHeldSessionEntityFields
-import im.vector.matrix.android.internal.di.SerializeNulls
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.crypto.model.MXDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper
+import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
+import org.matrix.android.sdk.internal.crypto.store.db.mapper.CrossSigningKeysMapper
+import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMetadataEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.GossipingEventEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.IncomingGossipingRequestEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeyInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmSessionEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.OutgoingGossipingRequestEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.SharedSessionEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.TrustLevelEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEntityFields
+import org.matrix.android.sdk.internal.di.SerializeNulls
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
 import org.matrix.androidsdk.crypto.data.MXOlmInboundGroupSession2
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
similarity index 50%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
index a096c96e02..1103e69bbc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +15,24 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db
+package org.matrix.android.sdk.internal.crypto.store.db
 
-import im.vector.matrix.android.internal.crypto.store.db.model.CrossSigningInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoMetadataEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoRoomEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.GossipingEventEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.IncomingGossipingRequestEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.KeyInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.KeysBackupDataEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.OlmInboundGroupSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.OlmSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.OutgoingGossipingRequestEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.SharedSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.TrustLevelEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.UserEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.WithHeldSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMetadataEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.GossipingEventEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.IncomingGossipingRequestEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeyInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.OutgoingGossipingRequestEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.SharedSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.TrustLevelEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEntity
 import io.realm.annotations.RealmModule
 
 /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt
new file mode 100644
index 0000000000..17538c7cbe
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto.store.db
+
+import java.io.IOException
+import java.io.InputStream
+import java.io.ObjectInputStream
+import java.io.ObjectStreamClass
+
+/**
+ * Package has been renamed from `im.vector.matrix.android` to `org.matrix.android.sdk`
+ * so ensure deserialization of previously stored objects still works
+ *
+ * Ref: https://stackoverflow.com/questions/3884492/how-can-i-change-package-for-a-bunch-of-java-serializable-classes
+ */
+internal class SafeObjectInputStream(`in`: InputStream) : ObjectInputStream(`in`) {
+
+    init {
+        enableResolveObject(true)
+    }
+
+    @Throws(IOException::class, ClassNotFoundException::class)
+    override fun readClassDescriptor(): ObjectStreamClass {
+        val read = super.readClassDescriptor()
+        if (read.name.startsWith("im.vector.matrix.android.")) {
+            return ObjectStreamClass.lookup(Class.forName(read.name.replace("im.vector.matrix.android.", "org.matrix.android.sdk.")))
+        }
+        return read
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
index 0e2c9c7eb7..4a303de81c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.mapper
+package org.matrix.android.sdk.internal.crypto.store.db.mapper
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
-import im.vector.matrix.android.internal.crypto.store.db.model.KeyInfoEntity
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeyInfoEntity
 import io.realm.RealmList
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CrossSigningInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
index a967f8e002..94db368e05 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
-import im.vector.matrix.android.internal.crypto.model.KeyUsage
+import org.matrix.android.sdk.internal.crypto.model.KeyUsage
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
index b11c068413..3e3c12f20b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.UnsignedDeviceInfo
-import im.vector.matrix.android.internal.di.SerializeNulls
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.UnsignedDeviceInfo
+import org.matrix.android.sdk.internal.di.SerializeNulls
 import timber.log.Timber
 
 object CryptoMapper {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMetadataEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMetadataEntity.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMetadataEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMetadataEntity.kt
index f3c34af586..eb79af4747 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMetadataEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMetadataEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
-import im.vector.matrix.android.internal.crypto.store.db.deserializeFromRealm
-import im.vector.matrix.android.internal.crypto.store.db.serializeForRealm
+import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
+import org.matrix.android.sdk.internal.crypto.store.db.serializeForRealm
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import org.matrix.olm.OlmAccount
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoRoomEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoRoomEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
index 531f44a838..e1881e9157 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoRoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/DeviceInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/DeviceInfoEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt
index 6d81e11228..d0f4d49545 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/DeviceInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import io.realm.RealmObject
 import io.realm.RealmResults
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/GossipingEventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/GossipingEventEntity.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/GossipingEventEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/GossipingEventEntity.kt
index 131ddfafc6..c0a4625826 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/GossipingEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/GossipingEventEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import com.squareup.moshi.JsonDataException
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import io.realm.RealmObject
 import io.realm.annotations.Index
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/IncomingGossipingRequestEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/IncomingGossipingRequestEntity.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/IncomingGossipingRequestEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/IncomingGossipingRequestEntity.kt
index bb7d497a0e..c15df27874 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/IncomingGossipingRequestEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/IncomingGossipingRequestEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.internal.crypto.GossipRequestType
-import im.vector.matrix.android.internal.crypto.GossipingRequestState
-import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.IncomingSecretShareRequest
-import im.vector.matrix.android.internal.crypto.IncomingShareRequestCommon
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.internal.crypto.GossipRequestType
+import org.matrix.android.sdk.internal.crypto.GossipingRequestState
+import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.IncomingSecretShareRequest
+import org.matrix.android.sdk.internal.crypto.IncomingShareRequestCommon
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
 import io.realm.RealmObject
 import io.realm.annotations.Index
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/KeyInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/KeyInfoEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt
index 3ced818449..125fbd8118 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/KeyInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/KeysBackupDataEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeysBackupDataEntity.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/KeysBackupDataEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeysBackupDataEntity.kt
index f88202dead..0155ed9cce 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/KeysBackupDataEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeysBackupDataEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
index 04d258ed5f..64b04827d6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
index 125fc94d1e..7d20b7582d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
-import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper2
-import im.vector.matrix.android.internal.crypto.store.db.deserializeFromRealm
-import im.vector.matrix.android.internal.crypto.store.db.serializeForRealm
+import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
+import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
+import org.matrix.android.sdk.internal.crypto.store.db.serializeForRealm
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmSessionEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
index c051fe56a2..f804a64182 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
-import im.vector.matrix.android.internal.crypto.store.db.deserializeFromRealm
-import im.vector.matrix.android.internal.crypto.store.db.serializeForRealm
+import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
+import org.matrix.android.sdk.internal.crypto.store.db.serializeForRealm
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import org.matrix.olm.OlmSession
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OutgoingGossipingRequestEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingGossipingRequestEntity.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OutgoingGossipingRequestEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingGossipingRequestEntity.kt
index 21960ec9a0..2880735d6b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OutgoingGossipingRequestEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingGossipingRequestEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Types
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.internal.crypto.GossipRequestType
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequest
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestState
-import im.vector.matrix.android.internal.crypto.OutgoingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.OutgoingSecretRequest
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.internal.crypto.GossipRequestType
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequest
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestState
+import org.matrix.android.sdk.internal.crypto.OutgoingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.OutgoingSecretRequest
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import io.realm.RealmObject
 import io.realm.annotations.Index
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/SharedSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/SharedSessionEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/SharedSessionEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/SharedSessionEntity.kt
index fe4c1ced6b..aa647d02c1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/SharedSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/SharedSessionEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import io.realm.RealmObject
 import io.realm.annotations.Index
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/TrustLevelEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/TrustLevelEntity.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/TrustLevelEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/TrustLevelEntity.kt
index e2c0242193..cb2933e3c4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/TrustLevelEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/TrustLevelEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/UserEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/UserEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt
index 6b502c1403..2820f72ef4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/UserEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/WithHeldSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/WithHeldSessionEntity.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/WithHeldSessionEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/WithHeldSessionEntity.kt
index ad2945cfb3..36ffe85183 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/WithHeldSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/WithHeldSessionEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.model
+package org.matrix.android.sdk.internal.crypto.store.db.model
 
-import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode
+import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
 import io.realm.RealmObject
 import io.realm.annotations.Index
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/CrossSigningInfoEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CrossSigningInfoEntityQueries.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/CrossSigningInfoEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CrossSigningInfoEntityQueries.kt
index 4c81cb46fa..5864455027 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/CrossSigningInfoEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CrossSigningInfoEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.query
+package org.matrix.android.sdk.internal.crypto.store.db.query
 
-import im.vector.matrix.android.internal.crypto.store.db.model.CrossSigningInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.UserEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntityFields
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/CryptoRoomEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CryptoRoomEntityQueries.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/CryptoRoomEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CryptoRoomEntityQueries.kt
index 1e902f5133..f65b1a3c71 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/CryptoRoomEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CryptoRoomEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.query
+package org.matrix.android.sdk.internal.crypto.store.db.query
 
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoRoomEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.CryptoRoomEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntityFields
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt
index 08bbb8f920..b0e677e078 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.query
+package org.matrix.android.sdk.internal.crypto.store.db.query
 
-import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntityFields
-import im.vector.matrix.android.internal.crypto.store.db.model.createPrimaryKey
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.createPrimaryKey
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/SharedSessionQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/SharedSessionQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt
index 53a9d96a67..885cadb5e5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/SharedSessionQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.query
+package org.matrix.android.sdk.internal.crypto.store.db.query
 
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.store.db.model.SharedSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.SharedSessionEntityFields
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.store.db.model.SharedSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.SharedSessionEntityFields
 import io.realm.Realm
 import io.realm.RealmResults
 import io.realm.kotlin.createObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/UserEntitiesQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/UserEntitiesQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt
index b7f75cfead..e64dcb815d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/UserEntitiesQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.query
+package org.matrix.android.sdk.internal.crypto.store.db.query
 
-import im.vector.matrix.android.internal.crypto.store.db.model.UserEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.UserEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntityFields
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/WithHeldSessionQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/WithHeldSessionQueries.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/WithHeldSessionQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/WithHeldSessionQueries.kt
index 3effc5304e..b3a5560dd4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/WithHeldSessionQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/WithHeldSessionQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db.query
+package org.matrix.android.sdk.internal.crypto.store.db.query
 
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.store.db.model.WithHeldSessionEntity
-import im.vector.matrix.android.internal.crypto.store.db.model.WithHeldSessionEntityFields
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEntity
+import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEntityFields
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
index 052753d67f..f5ee6aa9bf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.MXKey
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.rest.KeysClaimBody
-import im.vector.matrix.android.internal.crypto.model.rest.KeysClaimResponse
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.MXKey
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysClaimBody
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysClaimResponse
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
index 809ec0be44..1f0d9eaaf9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.toRegistrationFlowResponse
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.rest.DeleteDeviceParams
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.DeleteDeviceParams
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt
index ef9a9ead8e..0f67ec666d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.rest.DeleteDeviceParams
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.DeleteDeviceParams
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DownloadKeysForUsersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DownloadKeysForUsersTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
index 5e4b2184b0..f053900598 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DownloadKeysForUsersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.rest.KeysQueryBody
-import im.vector.matrix.android.internal.crypto.model.rest.KeysQueryResponse
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryBody
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryResponse
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/EncryptEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/EncryptEventTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
index b44ff8ed1c..e0a85d50c0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/EncryptEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.crypto.model.MXEncryptEventContentResult
-import im.vector.matrix.android.internal.session.room.send.LocalEchoRepository
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitCallback
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.crypto.model.MXEncryptEventContentResult
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitCallback
 import javax.inject.Inject
 
 internal interface EncryptEventTask : Task<EncryptEventTask.Params, Event> {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetDeviceInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetDeviceInfoTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt
index 9d9513b773..e1db5e0c98 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetDeviceInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetDevicesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetDevicesTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt
index 7a805f6a08..ea8be725f0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetDevicesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.DevicesListResponse
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetKeyChangesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetKeyChangesTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt
index 84e2c293b9..57a4881a51 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetKeyChangesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.rest.KeyChangesResponse
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyChangesResponse
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/InitializeCrossSigningTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/InitializeCrossSigningTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
index 9a7d84e235..d2c7e87b67 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/InitializeCrossSigningTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
 import dagger.Lazy
-import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.MyDeviceInfoHolder
-import im.vector.matrix.android.internal.crypto.crosssigning.canonicalSignable
-import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding
-import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
-import im.vector.matrix.android.internal.crypto.model.KeyUsage
-import im.vector.matrix.android.internal.crypto.model.rest.UploadSignatureQueryBuilder
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.crypto.MXOlmDevice
+import org.matrix.android.sdk.internal.crypto.MyDeviceInfoHolder
+import org.matrix.android.sdk.internal.crypto.crosssigning.canonicalSignable
+import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
+import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
+import org.matrix.android.sdk.internal.crypto.model.KeyUsage
+import org.matrix.android.sdk.internal.crypto.model.rest.UploadSignatureQueryBuilder
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 import org.matrix.olm.OlmPkSigning
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendEventTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
index 2cffdcf267..870980bde2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.session.room.send.LocalEchoRepository
-import im.vector.matrix.android.internal.session.room.send.SendResponse
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
+import org.matrix.android.sdk.internal.session.room.send.SendResponse
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendToDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendToDeviceTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
index 361fd25cee..20153ef460 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendToDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.rest.SendToDeviceBody
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.rest.SendToDeviceBody
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 import kotlin.random.Random
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendVerificationMessageTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendVerificationMessageTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
index aede23f795..09baf88e59 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendVerificationMessageTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.session.room.send.LocalEchoRepository
-import im.vector.matrix.android.internal.session.room.send.SendResponse
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
+import org.matrix.android.sdk.internal.session.room.send.SendResponse
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SetDeviceNameTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SetDeviceNameTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt
index 74757c5cb3..d3900550c5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SetDeviceNameTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.rest.UpdateDeviceInfoBody
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.UpdateDeviceInfoBody
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadKeysTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadKeysTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt
index 2a11e5da5b..b41dcf6dd0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadKeysTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceKeys
-import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadBody
-import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadResponse
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceKeys
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysUploadBody
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysUploadResponse
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadSignaturesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadSignaturesTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
index f102479339..255d06ea7c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadSignaturesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.rest.SignatureUploadResponse
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.SignatureUploadResponse
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadSigningKeysTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadSigningKeysTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt
index 5d08532f68..c7844fbfe4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadSigningKeysTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +15,19 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tasks
+package org.matrix.android.sdk.internal.crypto.tasks
 
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.toRegistrationFlowResponse
-import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.CryptoCrossSigningKey
-import im.vector.matrix.android.internal.crypto.model.rest.KeysQueryResponse
-import im.vector.matrix.android.internal.crypto.model.rest.UploadSigningKeysBody
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.android.internal.crypto.model.toRest
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
+import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.UploadSigningKeysBody
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.crypto.model.toRest
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tools/HkdfSha256.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tools/HkdfSha256.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt
index 35eecc793d..f93dc7126a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tools/HkdfSha256.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  * Copyright (C) 2015 Square, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.tools
+package org.matrix.android.sdk.internal.crypto.tools
 
 import java.io.ByteArrayOutputStream
 import java.nio.ByteBuffer
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tools/Tools.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tools/Tools.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt
index 5e406fdc4f..1bd9e1282f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tools/Tools.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.tools
+package org.matrix.android.sdk.internal.crypto.tools
 
 import org.matrix.olm.OlmPkDecryption
 import org.matrix.olm.OlmPkEncryption
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
index b1368b45b4..009979db49 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
 import android.util.Base64
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.IncomingSasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.SasMode
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.internal.crypto.IncomingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.actions.SetDeviceVerificationAction
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.SasMode
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.internal.crypto.IncomingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import timber.log.Timber
 
 internal class DefaultIncomingSASDefaultVerificationTransaction(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
index 8081c07bcc..07e98f52b7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.OutgoingSasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.internal.crypto.IncomingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.actions.SetDeviceVerificationAction
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.OutgoingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.internal.crypto.IncomingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import timber.log.Timber
 
 internal class DefaultOutgoingSASDefaultVerificationTransaction(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
index 4d4eeb21fd..e61497fd31 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,76 +15,76 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
 import android.os.Handler
 import android.os.Looper
 import dagger.Lazy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest
-import im.vector.matrix.android.api.session.crypto.verification.QrCodeVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.SasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoReady
-import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.crypto.verification.safeValueOf
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageRelationContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationAcceptContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationCancelContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationDoneContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationKeyContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationMacContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationReadyContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationRequestContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationStartContent
-import im.vector.matrix.android.api.session.room.model.message.ValidVerificationDone
-import im.vector.matrix.android.internal.crypto.DeviceListManager
-import im.vector.matrix.android.internal.crypto.IncomingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.MyDeviceInfoHolder
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.actions.SetDeviceVerificationAction
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationAccept
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationCancel
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationDone
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationKey
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationMac
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationReady
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationRequest
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationStart
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_QR_CODE_SCAN
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_QR_CODE_SHOW
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_RECIPROCATE
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
-import im.vector.matrix.android.internal.crypto.model.rest.toValue
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.verification.qrcode.DefaultQrCodeVerificationTransaction
-import im.vector.matrix.android.internal.crypto.verification.qrcode.QrCodeData
-import im.vector.matrix.android.internal.crypto.verification.qrcode.generateSharedSecretV2
-import im.vector.matrix.android.internal.di.DeviceId
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.PendingVerificationRequest
+import org.matrix.android.sdk.api.session.crypto.verification.QrCodeVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.ValidVerificationInfoReady
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.crypto.verification.safeValueOf
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationAcceptContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationCancelContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationDoneContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationKeyContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationMacContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationReadyContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationStartContent
+import org.matrix.android.sdk.api.session.room.model.message.ValidVerificationDone
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
+import org.matrix.android.sdk.internal.crypto.IncomingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.MyDeviceInfoHolder
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationAccept
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationCancel
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationDone
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationKey
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationMac
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationReady
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationRequest
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationStart
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_QR_CODE_SCAN
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_QR_CODE_SHOW
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_RECIPROCATE
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
+import org.matrix.android.sdk.internal.crypto.model.rest.toValue
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.verification.qrcode.DefaultQrCodeVerificationTransaction
+import org.matrix.android.sdk.internal.crypto.verification.qrcode.QrCodeData
+import org.matrix.android.sdk.internal.crypto.verification.qrcode.generateSharedSecretV2
+import org.matrix.android.sdk.internal.di.DeviceId
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
index eb78aee42d..e4f559767c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.internal.crypto.IncomingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.actions.SetDeviceVerificationAction
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.internal.crypto.IncomingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
 import timber.log.Timber
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SASDefaultVerificationTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
index db97ba1052..7ebd3b51b0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation
-import im.vector.matrix.android.api.session.crypto.verification.SasMode
-import im.vector.matrix.android.api.session.crypto.verification.SasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.internal.crypto.IncomingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.actions.SetDeviceVerificationAction
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.extensions.toUnsignedInt
-import im.vector.matrix.android.internal.util.withoutPrefix
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
+import org.matrix.android.sdk.api.session.crypto.verification.SasMode
+import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.internal.crypto.IncomingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.extensions.toUnsignedInt
+import org.matrix.android.sdk.internal.util.withoutPrefix
 import org.matrix.olm.OlmSAS
 import org.matrix.olm.OlmUtility
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SendVerificationMessageWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SendVerificationMessageWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt
index 057a6732e4..2b7d26e76b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SendVerificationMessageWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.failure.shouldBeRetried
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.internal.crypto.tasks.SendVerificationMessageTask
-import im.vector.matrix.android.internal.worker.SessionWorkerParams
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.failure.shouldBeRetried
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.crypto.tasks.SendVerificationMessageTask
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationEmoji.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationEmoji.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt
index 396b609f41..5a55ec2a9c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationEmoji.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.R
-import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation
+import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
 
 internal fun getEmojiForCode(code: Int): EmojiRepresentation {
     return when (code % 64) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfo.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfo.kt
index d3d448236e..2f4c4e9c93 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.internal.crypto.model.rest.SendToDeviceObject
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.internal.crypto.model.rest.SendToDeviceObject
 
 interface VerificationInfo<ValidObjectType> {
     fun toEventContent(): Content? = null
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoAccept.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoAccept.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt
index a49d1c6da8..5c6435c1cd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoAccept.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
 internal interface VerificationInfoAccept : VerificationInfo<ValidVerificationInfoAccept> {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoCancel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoCancel.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoCancel.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoCancel.kt
index 55603f69a2..68282cb925 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoCancel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoCancel.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
 internal interface VerificationInfoCancel : VerificationInfo<ValidVerificationInfoCancel> {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoDone.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoDone.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoDone.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoDone.kt
index 8cf96d7d65..7dce847e30 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoDone.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoDone.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.session.room.model.message.ValidVerificationDone
+import org.matrix.android.sdk.api.session.room.model.message.ValidVerificationDone
 
 internal interface VerificationInfoDone : VerificationInfo<ValidVerificationDone> {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoKey.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoKey.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoKey.kt
index 4688aecd3c..745309df79 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoKey.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
 /**
  * Sent by both devices to send their ephemeral Curve25519 public key to the other device.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoMac.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoMac.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoMac.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoMac.kt
index 6cb20e81b3..6ffd0556f5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoMac.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoMac.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
 internal interface VerificationInfoMac : VerificationInfo<ValidVerificationInfoMac> {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoReady.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoReady.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoReady.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoReady.kt
index 2dfd239862..6617b6b7c2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoReady.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoReady.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoReady
+import org.matrix.android.sdk.api.session.crypto.verification.ValidVerificationInfoReady
 
 /**
  * A new event type is added to the key verification framework: m.key.verification.ready,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoRequest.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoRequest.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoRequest.kt
index 63172e8286..43843d8e29 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoRequest.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoRequest
+import org.matrix.android.sdk.api.session.crypto.verification.ValidVerificationInfoRequest
 
 internal interface VerificationInfoRequest : VerificationInfo<ValidVerificationInfoRequest> {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoStart.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoStart.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt
index 7fb2bddc47..9ac15a1056 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoStart.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.session.crypto.verification.SasMode
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_RECIPROCATE
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
+import org.matrix.android.sdk.api.session.crypto.verification.SasMode
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_RECIPROCATE
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
 
 internal interface VerificationInfoStart : VerificationInfo<ValidVerificationInfoStart> {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationMessageProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationMessageProcessor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
index c266d965cd..0c16fd970f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationMessageProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,26 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageRelationContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationReadyContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationRequestContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationStartContent
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.matrix.android.internal.database.model.EventInsertType
-import im.vector.matrix.android.internal.di.DeviceId
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.EventInsertLiveProcessor
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationReadyContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationStartContent
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.di.DeviceId
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import io.realm.Realm
 import timber.log.Timber
 import java.util.ArrayList
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransport.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt
index c5c4772c51..ffe0709932 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoRequest
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.crypto.verification.ValidVerificationInfoRequest
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
 
 /**
  * Verification can be performed using toDevice events or via DM.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransportRoomMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransportRoomMessage.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
index e0bbffc23b..69f00ce359 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransportRoomMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
 import androidx.lifecycle.Observer
 import androidx.work.BackoffPolicy
@@ -21,36 +22,36 @@ import androidx.work.Data
 import androidx.work.ExistingWorkPolicy
 import androidx.work.Operation
 import androidx.work.WorkInfo
-import im.vector.matrix.android.R
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoRequest
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.UnsignedData
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationAcceptContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationCancelContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationDoneContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationKeyContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationMacContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationReadyContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationRequestContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationStartContent
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_RECIPROCATE
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
-import im.vector.matrix.android.internal.di.DeviceId
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.session.room.send.LocalEchoEventFactory
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.StringProvider
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.ValidVerificationInfoRequest
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.UnsignedData
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationAcceptContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationCancelContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationDoneContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationKeyContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationMacContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationReadyContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationStartContent
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_RECIPROCATE
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
+import org.matrix.android.sdk.internal.di.DeviceId
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.StringProvider
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransportToDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransportToDevice.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
index 59a5b80b99..1dbcf31c78 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransportToDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,29 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package org.matrix.android.sdk.internal.crypto.verification
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoRequest
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationAccept
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationCancel
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationDone
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationKey
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationMac
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationReady
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationRequest
-import im.vector.matrix.android.internal.crypto.model.rest.KeyVerificationStart
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_RECIPROCATE
-import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
-import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.di.DeviceId
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.crypto.verification.ValidVerificationInfoRequest
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationAccept
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationCancel
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationDone
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationKey
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationMac
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationReady
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationRequest
+import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationStart
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_RECIPROCATE
+import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.di.DeviceId
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
index 53fecc4865..f0db2e0fee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification.qrcode
+package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
-import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.QrCodeVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.internal.crypto.IncomingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.OutgoingGossipingRequestManager
-import im.vector.matrix.android.internal.crypto.actions.SetDeviceVerificationAction
-import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64
-import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64Safe
-import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.verification.DefaultVerificationTransaction
-import im.vector.matrix.android.internal.crypto.verification.ValidVerificationInfoStart
-import im.vector.matrix.android.internal.util.exhaustive
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.QrCodeVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.internal.crypto.IncomingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
+import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
+import org.matrix.android.sdk.internal.crypto.crosssigning.fromBase64
+import org.matrix.android.sdk.internal.crypto.crosssigning.fromBase64Safe
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.verification.DefaultVerificationTransaction
+import org.matrix.android.sdk.internal.crypto.verification.ValidVerificationInfoStart
+import org.matrix.android.sdk.internal.util.exhaustive
 import timber.log.Timber
 
 internal class DefaultQrCodeVerificationTransaction(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/Extensions.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt
index a4c4e649cc..5e799f63cc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification.qrcode
+package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
-import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64
-import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding
-import im.vector.matrix.android.internal.extensions.toUnsignedInt
+import org.matrix.android.sdk.internal.crypto.crosssigning.fromBase64
+import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
+import org.matrix.android.sdk.internal.extensions.toUnsignedInt
 
 // MATRIX
 private val prefix = "MATRIX".toByteArray(Charsets.ISO_8859_1)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/QrCodeData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/QrCodeData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
index 934c0c82b9..9ae0c136f4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/QrCodeData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification.qrcode
+package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
 /**
  * Ref: https://github.com/uhoreg/matrix-doc/blob/qr_key_verification/proposals/1543-qr_code_key_verification.md#qr-code-format
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/SharedSecret.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecret.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/SharedSecret.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecret.kt
index 397cad0c53..edff103820 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/SharedSecret.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecret.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification.qrcode
+package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
-import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding
+import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
 import java.security.SecureRandom
 
 fun generateSharedSecretV2(): String {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/AsyncTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/AsyncTransaction.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
index 4075f95ae8..c633dc5860 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/AsyncTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
@@ -1,5 +1,6 @@
 /*
   * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
  */
-package im.vector.matrix.android.internal.database
+package org.matrix.android.sdk.internal.database
 
 import io.realm.Realm
 import io.realm.RealmConfiguration
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DBConstants.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DBConstants.kt
index 3dff2f2273..0f735eb558 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DBConstants.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database
+package org.matrix.android.sdk.internal.database
 
 internal object DBConstants {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DatabaseCleaner.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DatabaseCleaner.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
index ca2126e621..d12f8628b1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DatabaseCleaner.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +15,19 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database
+package org.matrix.android.sdk.internal.database
 
-import im.vector.matrix.android.internal.database.helper.nextDisplayIndex
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.model.ChunkEntityFields
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntityFields
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.SessionLifecycleObserver
-import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection
-import im.vector.matrix.android.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.database.helper.nextDisplayIndex
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
+import org.matrix.android.sdk.internal.task.TaskExecutor
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.Dispatchers
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/EventInsertLiveObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/EventInsertLiveObserver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
index 8913aa784a..1834961ff2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/EventInsertLiveObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database
+package org.matrix.android.sdk.internal.database
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.EventInsertEntity
-import im.vector.matrix.android.internal.database.model.EventInsertEntityFields
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.EventInsertLiveProcessor
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertEntityFields
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import io.realm.RealmConfiguration
 import io.realm.RealmResults
 import kotlinx.coroutines.launch
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmKeysUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmKeysUtils.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
index 5dac5d9f86..453cbae325 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmKeysUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database
+package org.matrix.android.sdk.internal.database
 
 import android.content.Context
 import android.util.Base64
 import androidx.core.content.edit
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.internal.session.securestorage.SecretStoringUtils
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.internal.session.securestorage.SecretStoringUtils
 import io.realm.RealmConfiguration
 import timber.log.Timber
 import java.security.SecureRandom
@@ -42,6 +43,7 @@ internal class RealmKeysUtils @Inject constructor(context: Context,
 
     private val rng = SecureRandom()
 
+    // Keep legacy preferences name for compatibility reason
     private val sharedPreferences = context.getSharedPreferences("im.vector.matrix.android.keys", Context.MODE_PRIVATE)
 
     private fun generateKeyForRealm(): ByteArray {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveEntityObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveEntityObserver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
index fe79833708..adf77840ae 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveEntityObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database
+package org.matrix.android.sdk.internal.database
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.session.SessionLifecycleObserver
-import im.vector.matrix.android.internal.util.createBackgroundHandler
+import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.internal.util.createBackgroundHandler
 import io.realm.Realm
 import io.realm.RealmChangeListener
 import io.realm.RealmConfiguration
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
index 446ecc32d1..712b01a69a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database
+package org.matrix.android.sdk.internal.database
 
 import io.realm.Realm
 import io.realm.RealmChangeListener
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
similarity index 71%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmSessionStoreMigration.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 142d0d119f..7d2a4ea581 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database
+package org.matrix.android.sdk.internal.database
 
-import im.vector.matrix.android.internal.database.model.HomeServerCapabilitiesEntityFields
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntityFields
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -30,6 +31,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
         if (oldVersion <= 0) migrateTo1(realm)
         if (oldVersion <= 1) migrateTo2(realm)
+        if (oldVersion <= 2) migrateTo3(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -51,4 +53,14 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                     obj.setBoolean(HomeServerCapabilitiesEntityFields.ADMIN_E2_E_BY_DEFAULT, true)
                 }
     }
+
+    private fun migrateTo3(realm: DynamicRealm) {
+        Timber.d("Step 2 -> 3")
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.PREFERRED_JITSI_DOMAIN, String::class.java)
+                ?.transform { obj ->
+                    // Schedule a refresh of the capabilities
+                    obj.setLong(HomeServerCapabilitiesEntityFields.LAST_UPDATED_TIMESTAMP, 0)
+                }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/SessionRealmConfigurationFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index 416e169022..456eecc54a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database
+package org.matrix.android.sdk.internal.database
 
 import android.content.Context
 import androidx.core.content.edit
-import im.vector.matrix.android.internal.database.model.SessionRealmModule
-import im.vector.matrix.android.internal.di.SessionFilesDirectory
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.di.UserMd5
-import im.vector.matrix.android.internal.session.SessionModule
+import org.matrix.android.sdk.internal.database.model.SessionRealmModule
+import org.matrix.android.sdk.internal.di.SessionFilesDirectory
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.UserMd5
+import org.matrix.android.sdk.internal.session.SessionModule
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import timber.log.Timber
@@ -46,9 +47,10 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
         context: Context) {
 
     companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 2L
+        const val SESSION_STORE_SCHEMA_VERSION = 3L
     }
 
+    // Keep legacy preferences name for compatibility reason
     private val sharedPreferences = context.getSharedPreferences("im.vector.matrix.android.realm", Context.MODE_PRIVATE)
 
     fun create(): RealmConfiguration {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
index a2965df27b..afe228a240 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,25 +15,25 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.helper
+package org.matrix.android.sdk.internal.database.helper
 
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntityFields
-import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.EventEntityFields
-import im.vector.matrix.android.internal.database.model.ReadReceiptEntity
-import im.vector.matrix.android.internal.database.model.ReadReceiptsSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntityFields
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntityFields
-import im.vector.matrix.android.internal.database.query.find
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.extensions.assertIsManaged
-import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
+import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.database.query.find
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.extensions.assertIsManaged
+import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import io.realm.Realm
 import io.realm.Sort
 import io.realm.kotlin.createObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/RoomEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/RoomEntityHelper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt
index 81e4d30abe..4874a1742b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/RoomEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.helper
+package org.matrix.android.sdk.internal.database.helper
 
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.model.RoomEntity
 
 internal fun RoomEntity.deleteOnCascade(chunkEntity: ChunkEntity) {
     chunks.remove(chunkEntity)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/TimelineEventEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/TimelineEventEntityHelper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt
index a46c49a706..95ae59f80f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/TimelineEventEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.helper
+package org.matrix.android.sdk.internal.database.helper
 
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntityFields
-import im.vector.matrix.android.internal.extensions.assertIsManaged
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.extensions.assertIsManaged
 import io.realm.Realm
 
 internal fun TimelineEventEntity.Companion.nextId(realm: Realm): Long {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/AccountDataMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/AccountDataMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt
index 621267ca40..9811afab8e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/AccountDataMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
 import com.squareup.moshi.Moshi
-import im.vector.matrix.android.api.util.JSON_DICT_PARAMETERIZED_TYPE
-import im.vector.matrix.android.internal.database.model.UserAccountDataEntity
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.api.util.JSON_DICT_PARAMETERIZED_TYPE
+import org.matrix.android.sdk.internal.database.model.UserAccountDataEntity
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import javax.inject.Inject
 
 internal class AccountDataMapper @Inject constructor(moshi: Moshi) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ContentMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ContentMapper.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ContentMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ContentMapper.kt
index 2406027f24..ab094e94b8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ContentMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ContentMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.util.JSON_DICT_PARAMETERIZED_TYPE
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.util.JSON_DICT_PARAMETERIZED_TYPE
+import org.matrix.android.sdk.internal.di.MoshiProvider
 
 internal object ContentMapper {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/DraftMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/DraftMapper.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/DraftMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/DraftMapper.kt
index 3bd6cf14e4..bc22c7ed3c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/DraftMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/DraftMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.room.send.UserDraft
-import im.vector.matrix.android.internal.database.model.DraftEntity
+import org.matrix.android.sdk.api.session.room.send.UserDraft
+import org.matrix.android.sdk.internal.database.model.DraftEntity
 
 /**
  * DraftEntity <-> UserDraft
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventAnnotationsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventAnnotationsSummaryMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
index ea0e34bf42..2f697d53ca 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventAnnotationsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.room.model.EditAggregatedSummary
-import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary
-import im.vector.matrix.android.api.session.room.model.ReactionAggregatedSummary
-import im.vector.matrix.android.api.session.room.model.ReferencesAggregatedSummary
-import im.vector.matrix.android.internal.database.model.EditAggregatedSummaryEntity
-import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity
-import im.vector.matrix.android.internal.database.model.ReactionAggregatedSummaryEntity
-import im.vector.matrix.android.internal.database.model.ReferencesAggregatedSummaryEntity
+import org.matrix.android.sdk.api.session.room.model.EditAggregatedSummary
+import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
+import org.matrix.android.sdk.api.session.room.model.ReactionAggregatedSummary
+import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedSummary
+import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.ReactionAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.ReferencesAggregatedSummaryEntity
 import io.realm.RealmList
 
 internal object EventAnnotationsSummaryMapper {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
index 11a5616bfb..61f09dcece 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
 import com.squareup.moshi.JsonDataException
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.UnsignedData
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.UnsignedData
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import timber.log.Timber
 
 internal object EventMapper {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/GroupSummaryMapper.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/GroupSummaryMapper.kt
index 52e4d61d40..09c96215b4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/GroupSummaryMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.internal.database.model.GroupSummaryEntity
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.internal.database.model.GroupSummaryEntity
 
 internal object GroupSummaryMapper {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/HomeServerCapabilitiesMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/HomeServerCapabilitiesMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
index 82a5ba79d1..e5de271d93 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/HomeServerCapabilitiesMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities
-import im.vector.matrix.android.internal.database.model.HomeServerCapabilitiesEntity
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
 
 /**
  * HomeServerCapabilitiesEntity -> HomeSeverCapabilities
@@ -30,7 +31,8 @@ internal object HomeServerCapabilitiesMapper {
                 maxUploadFileSize = entity.maxUploadFileSize,
                 lastVersionIdentityServerSupported = entity.lastVersionIdentityServerSupported,
                 defaultIdentityServerUrl = entity.defaultIdentityServerUrl,
-                adminE2EByDefault = entity.adminE2EByDefault
+                adminE2EByDefault = entity.adminE2EByDefault,
+                preferredJitsiDomain = entity.preferredJitsiDomain
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/IsUselessResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/IsUselessResolver.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/IsUselessResolver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/IsUselessResolver.kt
index 56ce488f1b..5dde01e15c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/IsUselessResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/IsUselessResolver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
 
 internal object IsUselessResolver {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PollResponseAggregatedSummaryEntityMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PollResponseAggregatedSummaryEntityMapper.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PollResponseAggregatedSummaryEntityMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PollResponseAggregatedSummaryEntityMapper.kt
index 1d34c660bc..18c774ac40 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PollResponseAggregatedSummaryEntityMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PollResponseAggregatedSummaryEntityMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.PollResponseAggregatedSummary
-import im.vector.matrix.android.internal.database.model.PollResponseAggregatedSummaryEntity
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.PollResponseAggregatedSummary
+import org.matrix.android.sdk.internal.database.model.PollResponseAggregatedSummaryEntity
 import io.realm.RealmList
 
 internal object PollResponseAggregatedSummaryEntityMapper {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushConditionMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushConditionMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt
index 3bc532fd93..cce780bad8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushConditionMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.pushrules.rest.PushCondition
-import im.vector.matrix.android.internal.database.model.PushConditionEntity
+import org.matrix.android.sdk.api.pushrules.rest.PushCondition
+import org.matrix.android.sdk.internal.database.model.PushConditionEntity
 
 internal object PushConditionMapper {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushRulesMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushRulesMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
index 4425582a9b..90fc62f8f3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushRulesMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
 import com.squareup.moshi.Types
-import im.vector.matrix.android.api.pushrules.Condition
-import im.vector.matrix.android.api.pushrules.rest.PushCondition
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.internal.database.model.PushRuleEntity
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.pushrules.Condition
+import org.matrix.android.sdk.api.pushrules.rest.PushCondition
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.internal.database.model.PushRuleEntity
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import io.realm.RealmList
 import timber.log.Timber
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt
index 315c8a766c..9912bcd4f6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.pushers.Pusher
-import im.vector.matrix.android.api.session.pushers.PusherData
-import im.vector.matrix.android.internal.database.model.PusherDataEntity
-import im.vector.matrix.android.internal.database.model.PusherEntity
-import im.vector.matrix.android.internal.session.pushers.JsonPusher
+import org.matrix.android.sdk.api.session.pushers.Pusher
+import org.matrix.android.sdk.api.session.pushers.PusherData
+import org.matrix.android.sdk.internal.database.model.PusherDataEntity
+import org.matrix.android.sdk.internal.database.model.PusherEntity
+import org.matrix.android.sdk.internal.session.pushers.JsonPusher
 
 internal object PushersMapper {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ReadReceiptsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ReadReceiptsSummaryMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt
index 952dfb9728..188ca4937c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ReadReceiptsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.room.model.ReadReceipt
-import im.vector.matrix.android.internal.database.model.ReadReceiptsSummaryEntity
-import im.vector.matrix.android.internal.database.model.UserEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
+import org.matrix.android.sdk.api.session.room.model.ReadReceipt
+import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.UserEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomMemberSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomMemberSummaryMapper.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomMemberSummaryMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomMemberSummaryMapper.kt
index 470772a40e..65ea7fa7c6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomMemberSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomMemberSummaryMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntity
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
 
 internal object RoomMemberSummaryMapper {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index cdd38ad2f6..bd2aba3e54 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.tag.RoomTag
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.session.typing.DefaultTypingUsersTracker
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
 import javax.inject.Inject
 
 internal class RoomSummaryMapper @Inject constructor(private val timelineEventMapper: TimelineEventMapper,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/TimelineEventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/TimelineEventMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
index a90e62e15c..71c586cffe 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/TimelineEventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.ReadReceipt
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.ReadReceipt
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import javax.inject.Inject
 
 internal class TimelineEventMapper @Inject constructor(private val readReceiptsSummaryMapper: ReadReceiptsSummaryMapper) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/UserMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/UserMapper.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/UserMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/UserMapper.kt
index bfbe40df03..5f5c541585 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/UserMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/UserMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.mapper
+package org.matrix.android.sdk.internal.database.mapper
 
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.internal.database.model.UserEntity
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.internal.database.model.UserEntity
 
 internal object UserMapper {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/BreadcrumbsEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/BreadcrumbsEntity.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/BreadcrumbsEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/BreadcrumbsEntity.kt
index c396795421..94306fadc8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/BreadcrumbsEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/BreadcrumbsEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
index 7014146539..a1f7fda7cf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/CurrentStateEventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/CurrentStateEventEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt
index 567d7f1490..bdd86cec7b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/CurrentStateEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  *
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 import io.realm.annotations.Index
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/DraftEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/DraftEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt
index 3b5aae8b13..7254e6241d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/DraftEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EditAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EditAggregatedSummaryEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
index 3a179eb1f0..5f98d2218a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EditAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventAnnotationsSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventAnnotationsSummaryEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
index 8913f76b99..140058fbaf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventAnnotationsSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
index 8ee5aeea8b..c76e1402ac 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import io.realm.RealmObject
 import io.realm.annotations.Index
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventInsertEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventInsertEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
index e23ea5c3d0..16ae051952 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventInsertEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventInsertType.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.java
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventInsertType.java
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.java
index 179b0f791c..41ecad003f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventInsertType.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model;
+package org.matrix.android.sdk.internal.database.model;
 
 public enum EventInsertType {
     INITIAL_SYNC,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/FilterEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/FilterEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/FilterEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/FilterEntity.kt
index eabcdce34d..b7a2f90521 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/FilterEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/FilterEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt
index a0054ae8d6..76ddb31678 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
-import im.vector.matrix.android.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.Membership
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt
index f3700b1dd7..00c39d4ee4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
-import im.vector.matrix.android.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.Membership
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/HomeServerCapabilitiesEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/HomeServerCapabilitiesEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
index 9dd150c6f0..7e3af69436 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/HomeServerCapabilitiesEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import io.realm.RealmObject
 
 internal open class HomeServerCapabilitiesEntity(
@@ -25,7 +26,8 @@ internal open class HomeServerCapabilitiesEntity(
         var lastVersionIdentityServerSupported: Boolean = false,
         var defaultIdentityServerUrl: String? = null,
         var adminE2EByDefault: Boolean = true,
-        var lastUpdatedTimestamp: Long = 0L
+        var lastUpdatedTimestamp: Long = 0L,
+        var preferredJitsiDomain: String? = null
 ) : RealmObject() {
 
     companion object
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/IgnoredUserEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/IgnoredUserEntity.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/IgnoredUserEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/IgnoredUserEntity.kt
index bd31046f82..d2b7e0492d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/IgnoredUserEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/IgnoredUserEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PollResponseAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PollResponseAggregatedSummaryEntity.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PollResponseAggregatedSummaryEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PollResponseAggregatedSummaryEntity.kt
index b17fbf07fa..267675ef8a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PollResponseAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PollResponseAggregatedSummaryEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushConditionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushConditionEntity.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushConditionEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushConditionEntity.kt
index 7922db5c0a..2fdcaa250f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushConditionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushConditionEntity.kt
@@ -1,5 +1,6 @@
 /*
- * copyright 2019 new vector ltd
+ * copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * licensed under the apache license, version 2.0 (the "license");
  * you may not use this file except in compliance with the license.
@@ -13,7 +14,7 @@
  * see the license for the specific language governing permissions and
  * limitations under the license.
  */
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRuleEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRuleEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt
index 1ef65d9dea..118d394e06 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRuleEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRulesEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRulesEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt
index 9527dafba4..e4a7ef5e0f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRulesEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
-import im.vector.matrix.android.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.pushrules.RuleKind
 import io.realm.RealmList
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherDataEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherDataEntity.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherDataEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherDataEntity.kt
index acc4f43bf9..9fff183b96 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherDataEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherDataEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt
index 9c4dcce3cd..7b299d4f33 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
-import im.vector.matrix.android.api.session.pushers.PusherState
+import org.matrix.android.sdk.api.session.pushers.PusherState
 import io.realm.RealmObject
 
 // TODO
@@ -24,8 +25,8 @@ import io.realm.RealmObject
 //        at io.realm.ProxyState.checkValidObject(ProxyState.java:213)
 //        at io.realm.im_vector_matrix_android_internal_database_model_PusherEntityRealmProxy
 //            .realmSet$data(im_vector_matrix_android_internal_database_model_PusherEntityRealmProxy.java:413)
-//        at im.vector.matrix.android.internal.database.model.PusherEntity.setData(PusherEntity.kt:16)
-//        at im.vector.matrix.android.internal.session.pushers.AddHttpPusherWorker$doWork$$inlined$fold$lambda$2.execute(AddHttpPusherWorker.kt:70)
+//        at org.matrix.android.sdk.internal.database.model.PusherEntity.setData(PusherEntity.kt:16)
+//        at org.matrix.android.sdk.internal.session.pushers.AddHttpPusherWorker$doWork$$inlined$fold$lambda$2.execute(AddHttpPusherWorker.kt:70)
 //        at io.realm.Realm.executeTransaction(Realm.java:1493)
 internal open class PusherEntity(
         var pushKey: String = "",
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReactionAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReactionAggregatedSummaryEntity.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReactionAggregatedSummaryEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReactionAggregatedSummaryEntity.kt
index 58da4faf6b..7da933c6e4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReactionAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReactionAggregatedSummaryEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadMarkerEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadMarkerEntity.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadMarkerEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadMarkerEntity.kt
index 4d16d120d8..739c0b9e88 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadMarkerEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadMarkerEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
index b0e6a440eb..f1e3bc4e65 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 import io.realm.RealmResults
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptsSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptsSummaryEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt
index b08ed0f728..8445abdb4c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptsSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReferencesAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReferencesAggregatedSummaryEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReferencesAggregatedSummaryEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReferencesAggregatedSummaryEntity.kt
index 1c3ea70e52..327648abbc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReferencesAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReferencesAggregatedSummaryEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
index 6dededff91..ae1e7865d2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
-import im.vector.matrix.android.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.Membership
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomMemberSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomMemberSummaryEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
index e2a9af649e..f2ea5a5f16 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomMemberSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
-import im.vector.matrix.android.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.Membership
 import io.realm.RealmObject
 import io.realm.annotations.Index
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index eb49844ed6..d6859f1d3f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.VersioningState
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.VersioningState
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomTagEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomTagEntity.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomTagEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomTagEntity.kt
index c78aa6ae84..8fdae3205d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomTagEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomTagEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ScalarTokenEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ScalarTokenEntity.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ScalarTokenEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ScalarTokenEntity.kt
index eab85357e3..a8fc454720 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ScalarTokenEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ScalarTokenEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SessionRealmModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index efe4c4955e..ea466db352 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.annotations.RealmModule
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
index 2eb39be325..5a1bcbc8d0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/TimelineEventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/TimelineEventEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
index 2a85064f87..36f6041fe6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/TimelineEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 import io.realm.RealmResults
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserAccountDataEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserAccountDataEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserAccountDataEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserAccountDataEntity.kt
index 90f73381dc..75aacd8dda 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserAccountDataEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserAccountDataEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 import io.realm.annotations.Index
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserDraftsEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserDraftsEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt
index 432b3367ad..f84a7b930f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserDraftsEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt
index baf7629fdc..e2150103d9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserThreePidEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserThreePidEntity.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserThreePidEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserThreePidEntity.kt
index f41ac1baa7..c7337f6a42 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserThreePidEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserThreePidEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/WellknownIntegrationManagerConfigEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/WellknownIntegrationManagerConfigEntity.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/WellknownIntegrationManagerConfigEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/WellknownIntegrationManagerConfigEntity.kt
index 56d66782aa..fdabed3c23 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/WellknownIntegrationManagerConfigEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/WellknownIntegrationManagerConfigEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.model
+package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/BreadcrumbsEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/BreadcrumbsEntityQuery.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/BreadcrumbsEntityQuery.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/BreadcrumbsEntityQuery.kt
index 60ed8aae7c..e711e30188 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/BreadcrumbsEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/BreadcrumbsEntityQuery.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.BreadcrumbsEntity
+import org.matrix.android.sdk.internal.database.model.BreadcrumbsEntity
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
index 5efb84a105..79b611115c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.model.ChunkEntityFields
-import im.vector.matrix.android.internal.database.model.RoomEntityFields
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.RealmResults
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/CurrentStateEventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/CurrentStateEventEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt
index 45f33ae8df..ac00f791b8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/CurrentStateEventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +16,10 @@
  *
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntityFields
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.createObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventAnnotationsSummaryEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
index 03025cb9bb..9fa710a94b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity
-import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntityFields
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
index 3618f3f7a8..ee41729e2a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.EventEntityFields
-import im.vector.matrix.android.internal.database.model.EventInsertEntity
-import im.vector.matrix.android.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.EventInsertEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertType
 import io.realm.Realm
 import io.realm.RealmList
 import io.realm.RealmQuery
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/FilterEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/FilterEntityQueries.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/FilterEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/FilterEntityQueries.kt
index 42a84113ca..33a7bff606 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/FilterEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/FilterEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.FilterEntity
-import im.vector.matrix.android.internal.session.filter.FilterFactory
+import org.matrix.android.sdk.internal.database.model.FilterEntity
+import org.matrix.android.sdk.internal.session.filter.FilterFactory
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupEntityQueries.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupEntityQueries.kt
index 1e4f5639c4..1097cce463 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.internal.database.model.GroupEntity
-import im.vector.matrix.android.internal.database.model.GroupEntityFields
-import im.vector.matrix.android.internal.query.process
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.database.model.GroupEntity
+import org.matrix.android.sdk.internal.database.model.GroupEntityFields
+import org.matrix.android.sdk.internal.query.process
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupSummaryEntityQueries.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupSummaryEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupSummaryEntityQueries.kt
index 18d40d0e68..650558ee2f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupSummaryEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.GroupSummaryEntity
-import im.vector.matrix.android.internal.database.model.GroupSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.GroupSummaryEntity
+import org.matrix.android.sdk.internal.database.model.GroupSummaryEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.createObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/HomeServerCapabilitiesQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/HomeServerCapabilitiesQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt
index e7002a9005..1ebe276fbe 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/HomeServerCapabilitiesQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.HomeServerCapabilitiesEntity
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/PushersQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/PushersQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
index cdec6b590e..cf34bc0cd1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/PushersQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.api.pushrules.RuleKind
-import im.vector.matrix.android.internal.database.model.PushRuleEntity
-import im.vector.matrix.android.internal.database.model.PushRuleEntityFields
-import im.vector.matrix.android.internal.database.model.PushRulesEntity
-import im.vector.matrix.android.internal.database.model.PushRulesEntityFields
-import im.vector.matrix.android.internal.database.model.PusherEntity
-import im.vector.matrix.android.internal.database.model.PusherEntityFields
+import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.internal.database.model.PushRuleEntity
+import org.matrix.android.sdk.internal.database.model.PushRuleEntityFields
+import org.matrix.android.sdk.internal.database.model.PushRulesEntity
+import org.matrix.android.sdk.internal.database.model.PushRulesEntityFields
+import org.matrix.android.sdk.internal.database.model.PusherEntity
+import org.matrix.android.sdk.internal.database.model.PusherEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadMarkerEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadMarkerEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt
index 5f96c12953..636fc9ac73 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadMarkerEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.ReadMarkerEntity
-import im.vector.matrix.android.internal.database.model.ReadMarkerEntityFields
+import org.matrix.android.sdk.internal.database.model.ReadMarkerEntity
+import org.matrix.android.sdk.internal.database.model.ReadMarkerEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.createObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
index df1f817f47..8ccc12a514 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.model.ReadMarkerEntity
-import im.vector.matrix.android.internal.database.model.ReadReceiptEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.model.ReadMarkerEntity
+import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import io.realm.Realm
 import io.realm.RealmConfiguration
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt
index 2aa40dd2a1..1eb438190a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.ReadReceiptEntity
-import im.vector.matrix.android.internal.database.model.ReadReceiptEntityFields
+import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
+import org.matrix.android.sdk.internal.database.model.ReadReceiptEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.createObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptsSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
index 1773297727..1d384a1de6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.ReadReceiptsSummaryEntity
-import im.vector.matrix.android.internal.database.model.ReadReceiptsSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReferencesAggregatedSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReferencesAggregatedSummaryEntityQueries.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReferencesAggregatedSummaryEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReferencesAggregatedSummaryEntityQueries.kt
index 7d2ed98232..60f665d460 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReferencesAggregatedSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReferencesAggregatedSummaryEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.ReferencesAggregatedSummaryEntity
-import im.vector.matrix.android.internal.database.model.ReferencesAggregatedSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.ReferencesAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.ReferencesAggregatedSummaryEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt
index 81818e53fe..35d21f8f5f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.RoomEntityFields
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomMemberEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomMemberEntityQueries.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomMemberEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomMemberEntityQueries.kt
index e2dd2a7d8c..ae1d42772d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomMemberEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomMemberEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomSummaryEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
index 1f242ce83a..7eee63c7d5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.RealmResults
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ScalarTokenQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ScalarTokenQuery.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ScalarTokenQuery.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ScalarTokenQuery.kt
index 02210394f5..24387856b6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ScalarTokenQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ScalarTokenQuery.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.ScalarTokenEntity
-import im.vector.matrix.android.internal.database.model.ScalarTokenEntityFields
+import org.matrix.android.sdk.internal.database.model.ScalarTokenEntity
+import org.matrix.android.sdk.internal.database.model.ScalarTokenEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
index db1b01fd7a..83075a192c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import io.realm.Realm
 import io.realm.RealmList
 import io.realm.RealmQuery
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventFilter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt
index f313205c4d..068ec0eb8e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
 /**
  * Query strings used to filter the timeline events regarding the Json raw string of the Event
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/UserDraftsEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/UserDraftsEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt
index 149efee492..6c3bc70787 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/UserDraftsEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntityFields
-import im.vector.matrix.android.internal.database.model.UserDraftsEntity
-import im.vector.matrix.android.internal.database.model.UserDraftsEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.UserDraftsEntity
+import org.matrix.android.sdk.internal.database.model.UserDraftsEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/UserEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserEntityQueries.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/UserEntityQueries.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserEntityQueries.kt
index fc8df1aa89..5566028d60 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/UserEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserEntityQueries.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.database.query
+package org.matrix.android.sdk.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.UserEntity
-import im.vector.matrix.android.internal.database.model.UserEntityFields
+import org.matrix.android.sdk.internal.database.model.UserEntity
+import org.matrix.android.sdk.internal.database.model.UserEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/AuthQualifiers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/AuthQualifiers.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/AuthQualifiers.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/AuthQualifiers.kt
index 8ef2710fc5..237eae38ec 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/AuthQualifiers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/AuthQualifiers.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import javax.inject.Qualifier
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/DbQualifiers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/DbQualifiers.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/DbQualifiers.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/DbQualifiers.kt
index 4501ae5746..9442dc4865 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/DbQualifiers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/DbQualifiers.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import javax.inject.Qualifier
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/FileQualifiers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/FileQualifiers.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/FileQualifiers.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/FileQualifiers.kt
index 5a7ac1bb24..5d140232df 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/FileQualifiers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/FileQualifiers.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import javax.inject.Qualifier
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
similarity index 72%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixComponent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
index af8a16b451..816a674d81 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +15,24 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import android.content.Context
 import android.content.res.Resources
 import com.squareup.moshi.Moshi
 import dagger.BindsInstance
 import dagger.Component
-import im.vector.matrix.android.api.Matrix
-import im.vector.matrix.android.api.MatrixConfiguration
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.internal.SessionManager
-import im.vector.matrix.android.internal.auth.AuthModule
-import im.vector.matrix.android.internal.auth.SessionParamsStore
-import im.vector.matrix.android.internal.session.MockHttpInterceptor
-import im.vector.matrix.android.internal.session.TestInterceptor
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.BackgroundDetectionObserver
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.internal.SessionManager
+import org.matrix.android.sdk.internal.auth.AuthModule
+import org.matrix.android.sdk.internal.auth.SessionParamsStore
+import org.matrix.android.sdk.internal.session.MockHttpInterceptor
+import org.matrix.android.sdk.internal.session.TestInterceptor
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import okhttp3.OkHttpClient
 import org.matrix.olm.OlmManager
 import java.io.File
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
index 785aecdf8e..be3175c22f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import android.content.Context
 import android.content.res.Resources
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.util.createBackgroundHandler
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.createBackgroundHandler
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.android.asCoroutineDispatcher
 import kotlinx.coroutines.asCoroutineDispatcher
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixScope.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixScope.kt
index 54e1467695..8cfa48f26c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixScope.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import javax.inject.Scope
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MoshiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
similarity index 59%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MoshiProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
index 8a2cc50456..5e16d0b455 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MoshiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,26 +15,26 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import com.squareup.moshi.Moshi
-import im.vector.matrix.android.api.session.room.model.message.MessageAudioContent
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageDefaultContent
-import im.vector.matrix.android.api.session.room.model.message.MessageEmoteContent
-import im.vector.matrix.android.api.session.room.model.message.MessageFileContent
-import im.vector.matrix.android.api.session.room.model.message.MessageImageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageLocationContent
-import im.vector.matrix.android.api.session.room.model.message.MessageNoticeContent
-import im.vector.matrix.android.api.session.room.model.message.MessageOptionsContent
-import im.vector.matrix.android.api.session.room.model.message.MessagePollResponseContent
-import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationRequestContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent
-import im.vector.matrix.android.internal.network.parsing.ForceToBooleanJsonAdapter
-import im.vector.matrix.android.internal.network.parsing.RuntimeJsonAdapterFactory
-import im.vector.matrix.android.internal.network.parsing.UriMoshiAdapter
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageDefaultContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageEmoteContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageFileContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageLocationContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageNoticeContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageOptionsContent
+import org.matrix.android.sdk.api.session.room.model.message.MessagePollResponseContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.internal.network.parsing.ForceToBooleanJsonAdapter
+import org.matrix.android.sdk.internal.network.parsing.RuntimeJsonAdapterFactory
+import org.matrix.android.sdk.internal.network.parsing.UriMoshiAdapter
 
 object MoshiProvider {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/NetworkModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/NetworkModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
index ddde4fc7d6..5fff658a56 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/NetworkModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import com.facebook.stetho.okhttp3.StethoInterceptor
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.api.MatrixConfiguration
-import im.vector.matrix.android.internal.network.TimeOutInterceptor
-import im.vector.matrix.android.internal.network.UserAgentInterceptor
-import im.vector.matrix.android.internal.network.interceptors.CurlLoggingInterceptor
-import im.vector.matrix.android.internal.network.interceptors.FormattedJsonHttpLogger
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.internal.network.TimeOutInterceptor
+import org.matrix.android.sdk.internal.network.UserAgentInterceptor
+import org.matrix.android.sdk.internal.network.interceptors.CurlLoggingInterceptor
+import org.matrix.android.sdk.internal.network.interceptors.FormattedJsonHttpLogger
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import okreplay.OkReplayInterceptor
@@ -76,7 +77,11 @@ internal object NetworkModule {
                 .connectTimeout(30, TimeUnit.SECONDS)
                 .readTimeout(60, TimeUnit.SECONDS)
                 .writeTimeout(60, TimeUnit.SECONDS)
-                .addNetworkInterceptor(stethoInterceptor)
+                .apply {
+                    if (BuildConfig.DEBUG) {
+                        addNetworkInterceptor(stethoInterceptor)
+                    }
+                }
                 .addInterceptor(timeoutInterceptor)
                 .addInterceptor(userAgentInterceptor)
                 .addInterceptor(httpLoggingInterceptor)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/NoOpTestModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NoOpTestModule.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/NoOpTestModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NoOpTestModule.kt
index 3041070056..d74c6055b1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/NoOpTestModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NoOpTestModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.internal.session.MockHttpInterceptor
-import im.vector.matrix.android.internal.session.TestInterceptor
+import org.matrix.android.sdk.internal.session.MockHttpInterceptor
+import org.matrix.android.sdk.internal.session.TestInterceptor
 
 @Module
 internal object NoOpTestModule {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/SerializeNulls.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SerializeNulls.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/SerializeNulls.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SerializeNulls.kt
index 28c853cde1..a66c7ff713 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/SerializeNulls.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SerializeNulls.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import androidx.annotation.Nullable
 import com.squareup.moshi.JsonAdapter
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/SessionAssistedInjectModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SessionAssistedInjectModule.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/SessionAssistedInjectModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SessionAssistedInjectModule.kt
index 52100a598a..b9ea7a0ad8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/SessionAssistedInjectModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SessionAssistedInjectModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import com.squareup.inject.assisted.dagger2.AssistedModule
 import dagger.Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/StringQualifiers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/StringQualifiers.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/StringQualifiers.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/StringQualifiers.kt
index a0a36d9982..10a523bbf7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/StringQualifiers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/StringQualifiers.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import javax.inject.Qualifier
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/WorkManagerProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/WorkManagerProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
index a7d1b68c92..737b5335d4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/WorkManagerProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.di
+package org.matrix.android.sdk.internal.di
 
 import android.content.Context
 import androidx.work.Constraints
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/eventbus/EventBusTimberLogger.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/eventbus/EventBusTimberLogger.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/eventbus/EventBusTimberLogger.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/eventbus/EventBusTimberLogger.kt
index 79d828dcab..b60d60a61b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/eventbus/EventBusTimberLogger.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/eventbus/EventBusTimberLogger.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.eventbus
+package org.matrix.android.sdk.internal.eventbus
 
 import org.greenrobot.eventbus.Logger
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/LiveData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/LiveData.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/LiveData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/LiveData.kt
index 55c9e238e6..64fb72e537 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/LiveData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/LiveData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.extensions
+package org.matrix.android.sdk.internal.extensions
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Primitives.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Primitives.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Primitives.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Primitives.kt
index 0a0ca1a1bd..ab45f08e42 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Primitives.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Primitives.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.extensions
+package org.matrix.android.sdk.internal.extensions
 
 /**
  * Convert a signed byte to a int value
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/RealmExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/RealmExtensions.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
index 8934bdb0b6..ebe9ab7ecb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/RealmExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.extensions
+package org.matrix.android.sdk.internal.extensions
 
 import io.realm.RealmObject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Result.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Result.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Result.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Result.kt
index 7d4ba7aaca..0b812736cb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Result.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Result.kt
@@ -1,6 +1,7 @@
 /*
 
   * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -15,9 +16,9 @@
   * limitations under the License.
 
  */
-package im.vector.matrix.android.internal.extensions
+package org.matrix.android.sdk.internal.extensions
 
-import im.vector.matrix.android.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixCallback
 
 fun <A> Result<A>.foldToCallback(callback: MatrixCallback<A>): Unit = fold(
         { callback.onSuccess(it) },
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Try.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Try.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt
index 8918362ff5..1030d6717b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Try.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.extensions
+package org.matrix.android.sdk.internal.extensions
 
 import arrow.core.Failure
 import arrow.core.Success
 import arrow.core.Try
 import arrow.core.TryOf
 import arrow.core.fix
-import im.vector.matrix.android.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixCallback
 
 inline fun <A> TryOf<A>.onError(f: (Throwable) -> Unit): Try<A> = fix()
         .fold(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/DefaultLegacySessionImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/DefaultLegacySessionImporter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
index 82e339776a..1741ca4845 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/DefaultLegacySessionImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,30 +15,30 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.legacy
+package org.matrix.android.sdk.internal.legacy
 
 import android.content.Context
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.DiscoveryInformation
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.api.auth.data.WellKnownBaseConfig
-import im.vector.matrix.android.api.legacy.LegacySessionImporter
-import im.vector.matrix.android.internal.auth.SessionParamsStore
-import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreMigration
-import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreModule
-import im.vector.matrix.android.internal.database.RealmKeysUtils
-import im.vector.matrix.android.internal.legacy.riot.LoginStorage
-import im.vector.matrix.android.internal.network.ssl.Fingerprint
-import im.vector.matrix.android.internal.util.md5
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.DiscoveryInformation
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.auth.data.WellKnownBaseConfig
+import org.matrix.android.sdk.api.legacy.LegacySessionImporter
+import org.matrix.android.sdk.internal.auth.SessionParamsStore
+import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreMigration
+import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreModule
+import org.matrix.android.sdk.internal.database.RealmKeysUtils
+import org.matrix.android.sdk.internal.legacy.riot.LoginStorage
+import org.matrix.android.sdk.internal.network.ssl.Fingerprint
+import org.matrix.android.sdk.internal.util.md5
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
-import im.vector.matrix.android.internal.legacy.riot.Fingerprint as LegacyFingerprint
-import im.vector.matrix.android.internal.legacy.riot.HomeServerConnectionConfig as LegacyHomeServerConnectionConfig
+import org.matrix.android.sdk.internal.legacy.riot.Fingerprint as LegacyFingerprint
+import org.matrix.android.sdk.internal.legacy.riot.HomeServerConnectionConfig as LegacyHomeServerConnectionConfig
 
 internal class DefaultLegacySessionImporter @Inject constructor(
         private val context: Context,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/Credentials.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Credentials.java
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/Credentials.java
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Credentials.java
index f11f3291e0..59ad3be4c5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/Credentials.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Credentials.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.legacy.riot;
+package org.matrix.android.sdk.internal.legacy.riot;
 
 import android.text.TextUtils;
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/Fingerprint.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Fingerprint.java
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/Fingerprint.java
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Fingerprint.java
index bee345e42f..3975618f39 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/Fingerprint.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Fingerprint.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.legacy.riot;
+package org.matrix.android.sdk.internal.legacy.riot;
 
 import android.util.Base64;
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/HomeServerConnectionConfig.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java
similarity index 99%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/HomeServerConnectionConfig.java
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java
index 9a84b2a25c..6732a2cd92 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/HomeServerConnectionConfig.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.legacy.riot;
+package org.matrix.android.sdk.internal.legacy.riot;
 
 import android.net.Uri;
 import android.text.TextUtils;
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/LoginStorage.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java
similarity index 98%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/LoginStorage.java
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java
index 325d8b3bc6..672053d4cc 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/LoginStorage.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.legacy.riot;
+package org.matrix.android.sdk.internal.legacy.riot;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnown.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnown.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
index 457741d910..234cd72689 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnown.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.legacy.riot
+package org.matrix.android.sdk.internal.legacy.riot
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnownBaseConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownBaseConfig.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnownBaseConfig.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownBaseConfig.kt
index 8b0df815e2..e9efccce3c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnownBaseConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownBaseConfig.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.legacy.riot
+package org.matrix.android.sdk.internal.legacy.riot
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnownManagerConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnownManagerConfig.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt
index 56291f60ff..f93d90af26 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnownManagerConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.legacy.riot
+package org.matrix.android.sdk.internal.legacy.riot
 
 /*
  * IMPORTANT: This class is imported from Riot-Android to be able to perform a migration. Do not use it for any other purpose
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnownPreferredConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownPreferredConfig.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnownPreferredConfig.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownPreferredConfig.kt
index 4581459928..5a918d6f0d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/riot/WellKnownPreferredConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownPreferredConfig.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.legacy.riot
+package org.matrix.android.sdk.internal.legacy.riot
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/AccessTokenInterceptor.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/AccessTokenInterceptor.kt
index a15f660790..6f5b07b229 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/AccessTokenInterceptor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
-import im.vector.matrix.android.internal.network.token.AccessTokenProvider
+import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
 import okhttp3.Interceptor
 import okhttp3.Response
 
@@ -25,10 +26,10 @@ internal class AccessTokenInterceptor(private val accessTokenProvider: AccessTok
     override fun intercept(chain: Interceptor.Chain): Response {
         var request = chain.request()
 
-        accessTokenProvider.getToken()?.let {
+        // Add the access token to all requests if it is set
+        accessTokenProvider.getToken()?.let { token ->
             val newRequestBuilder = request.newBuilder()
-            // Add the access token to all requests if it is set
-            newRequestBuilder.addHeader(HttpHeaders.Authorization, "Bearer $it")
+            newRequestBuilder.header(HttpHeaders.Authorization, "Bearer $token")
             request = newRequestBuilder.build()
         }
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/HttpHeaders.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/HttpHeaders.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/HttpHeaders.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/HttpHeaders.kt
index 11fafd5c5a..f15b0353e2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/HttpHeaders.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/HttpHeaders.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 object HttpHeaders {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkCallbackStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkCallbackStrategy.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
index a639c61678..caf5090ad6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkCallbackStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 import android.annotation.TargetApi
 import android.content.Context
@@ -22,6 +23,7 @@ import android.content.IntentFilter
 import android.net.ConnectivityManager
 import android.net.Network
 import android.os.Build
+import androidx.core.content.getSystemService
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -53,7 +55,7 @@ internal class FallbackNetworkCallbackStrategy @Inject constructor(private val c
 internal class PreferredNetworkCallbackStrategy @Inject constructor(context: Context) : NetworkCallbackStrategy {
 
     private var hasChangedCallback: (() -> Unit)? = null
-    private val conn = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    private val conn = context.getSystemService<ConnectivityManager>()!!
     private val networkCallback = object : ConnectivityManager.NetworkCallback() {
 
         override fun onLost(network: Network) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
index 881a6a45b1..ae55324d53 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 import androidx.annotation.WorkerThread
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.homeserver.HomeServerPinger
-import im.vector.matrix.android.internal.util.BackgroundDetectionObserver
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.homeserver.HomeServerPinger
+import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
 import kotlinx.coroutines.runBlocking
 import java.util.Collections
 import java.util.concurrent.atomic.AtomicBoolean
@@ -74,9 +75,7 @@ internal class DefaultNetworkConnectivityChecker @Inject constructor(private val
 
     override fun register(listener: NetworkConnectivityChecker.Listener) {
         if (listeners.isEmpty()) {
-            if (backgroundDetectionObserver.isInBackground) {
-                unbind()
-            } else {
+            if (!backgroundDetectionObserver.isInBackground) {
                 bind()
             }
             backgroundDetectionObserver.register(backgroundDetectionObserverListener)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConstants.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
index 9fb8b463a0..eb8ea2dc68 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 internal object NetworkConstants {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkInfoReceiver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkInfoReceiver.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkInfoReceiver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkInfoReceiver.kt
index 645329628b..85a69c853e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkInfoReceiver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkInfoReceiver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +18,14 @@
 // This BroadcastReceiver is used only if the build code is below 24.
 @file:Suppress("DEPRECATION")
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.ConnectivityManager
 import android.net.NetworkInfo
+import androidx.core.content.getSystemService
 import javax.inject.Inject
 
 internal class NetworkInfoReceiver @Inject constructor() : BroadcastReceiver() {
@@ -31,7 +33,7 @@ internal class NetworkInfoReceiver @Inject constructor() : BroadcastReceiver() {
     var isConnectedCallback: ((Boolean) -> Unit)? = null
 
     override fun onReceive(context: Context, intent: Intent) {
-        val conn = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val conn = context.getSystemService<ConnectivityManager>()!!
         val networkInfo: NetworkInfo? = conn.activeNetworkInfo
         isConnectedCallback?.invoke(networkInfo?.isConnected ?: false)
     }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ProgressRequestBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ProgressRequestBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
index b02af88270..7ce260e54e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ProgressRequestBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 import okhttp3.MediaType
 import okhttp3.RequestBody
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index 2ba058d0db..52556e4c2d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.shouldBeRetried
-import im.vector.matrix.android.internal.network.ssl.CertUtil
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.shouldBeRetried
+import org.matrix.android.sdk.internal.network.ssl.CertUtil
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import org.greenrobot.eventbus.EventBus
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitExtensions.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
index aa8fe46795..b7eacfb4f5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
@@ -1,6 +1,7 @@
 /*
  *
  *  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *  *
  *  * Licensed under the Apache License, Version 2.0 (the "License");
  *  * you may not use this file except in compliance with the License.
@@ -16,13 +17,13 @@
  *
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 import com.squareup.moshi.JsonEncodingException
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.GlobalError
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt
index 9da7b1f488..368611dd7d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 import com.squareup.moshi.Moshi
 import dagger.Lazy
-import im.vector.matrix.android.internal.util.ensureTrailingSlash
+import org.matrix.android.sdk.internal.util.ensureTrailingSlash
 import okhttp3.Call
 import okhttp3.OkHttpClient
 import okhttp3.Request
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/TimeOutInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/TimeOutInterceptor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt
index 5adb4e89f1..4fb8f513d0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/TimeOutInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 import okhttp3.Interceptor
 import okhttp3.Response
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/UnitConverterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/UnitConverterFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
index 945a064a74..dfcf041261 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/UnitConverterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 import okhttp3.ResponseBody
 import retrofit2.Converter
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/UserAgentHolder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/UserAgentHolder.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
index 15c91a629a..9a5451bdde 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/UserAgentHolder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 import android.content.Context
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.api.MatrixConfiguration
-import im.vector.matrix.android.internal.di.MatrixScope
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.internal.di.MatrixScope
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/UserAgentInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentInterceptor.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/UserAgentInterceptor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentInterceptor.kt
index 41b93ef3d8..1099751112 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/UserAgentInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentInterceptor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network
+package org.matrix.android.sdk.internal.network
 
 import okhttp3.Interceptor
 import okhttp3.Response
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/httpclient/OkHttpClientUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/httpclient/OkHttpClientUtil.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/httpclient/OkHttpClientUtil.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/httpclient/OkHttpClientUtil.kt
index 605d6b4a8c..94d1d95857 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/httpclient/OkHttpClientUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/httpclient/OkHttpClientUtil.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.httpclient
+package org.matrix.android.sdk.internal.network.httpclient
 
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.internal.network.AccessTokenInterceptor
-import im.vector.matrix.android.internal.network.interceptors.CurlLoggingInterceptor
-import im.vector.matrix.android.internal.network.ssl.CertUtil
-import im.vector.matrix.android.internal.network.token.AccessTokenProvider
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.internal.network.AccessTokenInterceptor
+import org.matrix.android.sdk.internal.network.interceptors.CurlLoggingInterceptor
+import org.matrix.android.sdk.internal.network.ssl.CertUtil
+import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
 import okhttp3.OkHttpClient
 import timber.log.Timber
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/ForceToBoolean.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/ForceToBoolean.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/ForceToBoolean.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/ForceToBoolean.kt
index b823104b4d..42a63e0c56 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/ForceToBoolean.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/ForceToBoolean.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.parsing
+package org.matrix.android.sdk.internal.network.parsing
 
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonQualifier
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/RuntimeJsonAdapterFactory.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.java
similarity index 98%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/RuntimeJsonAdapterFactory.java
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.java
index 58cf4ed8f2..a49660523e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/RuntimeJsonAdapterFactory.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.parsing;
+package org.matrix.android.sdk.internal.network.parsing;
 
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.JsonDataException;
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/UriMoshiAdapter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/UriMoshiAdapter.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/UriMoshiAdapter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/UriMoshiAdapter.kt
index 9223c12259..f45c89304b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/UriMoshiAdapter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/UriMoshiAdapter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.parsing
+package org.matrix.android.sdk.internal.network.parsing
 
 import android.net.Uri
 import com.squareup.moshi.FromJson
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/CertUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/CertUtil.kt
similarity index 98%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/CertUtil.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/CertUtil.kt
index e375c3d364..40a8e29829 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/CertUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/CertUtil.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.ssl
+package org.matrix.android.sdk.internal.network.ssl
 
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import okhttp3.ConnectionSpec
 import okhttp3.internal.tls.OkHostnameVerifier
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/Fingerprint.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/Fingerprint.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/Fingerprint.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/Fingerprint.kt
index e6139f3f9d..f1280b879b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/Fingerprint.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/Fingerprint.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.ssl
+package org.matrix.android.sdk.internal.network.ssl
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManager.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt
index 615358310f..289a4ee04f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.ssl
+package org.matrix.android.sdk.internal.network.ssl
 
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManagerApi24.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt
similarity index 98%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManagerApi24.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt
index 98257caefc..ed5a099ee4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManagerApi24.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.ssl
+package org.matrix.android.sdk.internal.network.ssl
 
 import android.os.Build
 import androidx.annotation.RequiresApi
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManagerProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManagerProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt
index d47adbfd07..7dcff0294f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManagerProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.ssl
+package org.matrix.android.sdk.internal.network.ssl
 
 import android.os.Build
 import javax.net.ssl.X509ExtendedTrustManager
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/TLSSocketFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/TLSSocketFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt
index 9b6d16a4d7..4ebeafd0c3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/TLSSocketFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.ssl
+package org.matrix.android.sdk.internal.network.ssl
 
 import okhttp3.TlsVersion
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/UnrecognizedCertificateException.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/UnrecognizedCertificateException.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/UnrecognizedCertificateException.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/UnrecognizedCertificateException.kt
index 42c23bbfbe..ba68a51344 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/UnrecognizedCertificateException.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/UnrecognizedCertificateException.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.ssl
+package org.matrix.android.sdk.internal.network.ssl
 
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/token/AccessTokenProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/AccessTokenProvider.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/token/AccessTokenProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/AccessTokenProvider.kt
index 08176392fa..c1e20aaa58 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/token/AccessTokenProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/AccessTokenProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.token
+package org.matrix.android.sdk.internal.network.token
 
 internal interface AccessTokenProvider {
     fun getToken(): String?
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/token/HomeserverAccessTokenProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/HomeserverAccessTokenProvider.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/token/HomeserverAccessTokenProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/HomeserverAccessTokenProvider.kt
index b570cb362e..1bb0f34222 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/token/HomeserverAccessTokenProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/HomeserverAccessTokenProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.token
+package org.matrix.android.sdk.internal.network.token
 
-import im.vector.matrix.android.internal.auth.SessionParamsStore
-import im.vector.matrix.android.internal.di.SessionId
+import org.matrix.android.sdk.internal.auth.SessionParamsStore
+import org.matrix.android.sdk.internal.di.SessionId
 import javax.inject.Inject
 
 internal class HomeserverAccessTokenProvider @Inject constructor(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/query/QueryEnumListProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/query/QueryEnumListProcessor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt
index 2bc05eacec..6e0cb3e677 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/query/QueryEnumListProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.query
+package org.matrix.android.sdk.internal.query
 
 import io.realm.RealmObject
 import io.realm.RealmQuery
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/query/QueryStringValueProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/query/QueryStringValueProcessor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
index ebe10cad9c..fadea5ada7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/query/QueryStringValueProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.query
+package org.matrix.android.sdk.internal.query
 
-import im.vector.matrix.android.api.query.QueryStringValue
+import org.matrix.android.sdk.api.query.QueryStringValue
 import io.realm.Case
 import io.realm.RealmObject
 import io.realm.RealmQuery
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultFileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultFileService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
index 6d0c9b7b96..97ebe943ec 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultFileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,30 +15,30 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session
+package org.matrix.android.sdk.internal.session
 
 import android.content.Context
 import android.net.Uri
 import android.webkit.MimeTypeMap
 import androidx.core.content.FileProvider
 import arrow.core.Try
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.api.session.content.ContentUrlResolver
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.NoOpCancellable
-import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
-import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments
-import im.vector.matrix.android.internal.di.CacheDirectory
-import im.vector.matrix.android.internal.di.ExternalFilesDirectory
-import im.vector.matrix.android.internal.di.SessionDownloadsDirectory
-import im.vector.matrix.android.internal.di.UnauthenticatedWithCertificateWithProgress
-import im.vector.matrix.android.internal.session.download.DownloadProgressInterceptor.Companion.DOWNLOAD_PROGRESS_INTERCEPTOR_HEADER
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.util.toCancelable
-import im.vector.matrix.android.internal.util.writeToFile
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
+import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
+import org.matrix.android.sdk.internal.di.CacheDirectory
+import org.matrix.android.sdk.internal.di.ExternalFilesDirectory
+import org.matrix.android.sdk.internal.di.SessionDownloadsDirectory
+import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificateWithProgress
+import org.matrix.android.sdk.internal.session.download.DownloadProgressInterceptor.Companion.DOWNLOAD_PROGRESS_INTERCEPTOR_HEADER
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.toCancelable
+import org.matrix.android.sdk.internal.util.writeToFile
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultInitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultInitialSyncProgressService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
index 0d551bc99b..ff1f44341b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultInitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session
+package org.matrix.android.sdk.internal.session
 
 import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import im.vector.matrix.android.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.session.InitialSyncProgressService
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 16179dd64a..f8ba625947 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,54 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session
+package org.matrix.android.sdk.internal.session
 
 import androidx.annotation.MainThread
 import dagger.Lazy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.api.failure.GlobalError
-import im.vector.matrix.android.api.pushrules.PushRuleService
-import im.vector.matrix.android.api.session.InitialSyncProgressService
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.account.AccountService
-import im.vector.matrix.android.api.session.accountdata.AccountDataService
-import im.vector.matrix.android.api.session.cache.CacheService
-import im.vector.matrix.android.api.session.call.CallSignalingService
-import im.vector.matrix.android.api.session.content.ContentUploadStateTracker
-import im.vector.matrix.android.api.session.content.ContentUrlResolver
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.file.ContentDownloadStateTracker
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.matrix.android.api.session.group.GroupService
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilitiesService
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService
-import im.vector.matrix.android.api.session.profile.ProfileService
-import im.vector.matrix.android.api.session.pushers.PushersService
-import im.vector.matrix.android.api.session.room.RoomDirectoryService
-import im.vector.matrix.android.api.session.room.RoomService
-import im.vector.matrix.android.api.session.securestorage.SecureStorageService
-import im.vector.matrix.android.api.session.securestorage.SharedSecretStorageService
-import im.vector.matrix.android.api.session.signout.SignOutService
-import im.vector.matrix.android.api.session.sync.FilterService
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.matrix.android.api.session.typing.TypingUsersTracker
-import im.vector.matrix.android.api.session.user.UserService
-import im.vector.matrix.android.api.session.widgets.WidgetService
-import im.vector.matrix.android.internal.auth.SessionParamsStore
-import im.vector.matrix.android.internal.crypto.DefaultCryptoService
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.di.UnauthenticatedWithCertificate
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.session.identity.DefaultIdentityService
-import im.vector.matrix.android.internal.session.room.timeline.TimelineEventDecryptor
-import im.vector.matrix.android.internal.session.sync.SyncTokenStore
-import im.vector.matrix.android.internal.session.sync.job.SyncThread
-import im.vector.matrix.android.internal.session.sync.job.SyncWorker
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.util.createUIHandler
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -69,6 +26,51 @@ import okhttp3.OkHttpClient
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.pushrules.PushRuleService
+import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.account.AccountService
+import org.matrix.android.sdk.api.session.accountdata.AccountDataService
+import org.matrix.android.sdk.api.session.cache.CacheService
+import org.matrix.android.sdk.api.session.call.CallSignalingService
+import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
+import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker
+import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.api.session.group.GroupService
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.api.session.permalinks.PermalinkService
+import org.matrix.android.sdk.api.session.profile.ProfileService
+import org.matrix.android.sdk.api.session.pushers.PushersService
+import org.matrix.android.sdk.api.session.room.RoomDirectoryService
+import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
+import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
+import org.matrix.android.sdk.api.session.signout.SignOutService
+import org.matrix.android.sdk.api.session.sync.FilterService
+import org.matrix.android.sdk.api.session.terms.TermsService
+import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
+import org.matrix.android.sdk.api.session.user.UserService
+import org.matrix.android.sdk.api.session.widgets.WidgetService
+import org.matrix.android.sdk.internal.auth.SessionParamsStore
+import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.identity.DefaultIdentityService
+import org.matrix.android.sdk.internal.session.room.timeline.TimelineEventDecryptor
+import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
+import org.matrix.android.sdk.internal.session.sync.job.SyncThread
+import org.matrix.android.sdk.internal.session.sync.job.SyncWorker
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.createUIHandler
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Provider
@@ -95,6 +97,7 @@ internal class DefaultSession @Inject constructor(
         private val termsService: Lazy<TermsService>,
         private val cryptoService: Lazy<DefaultCryptoService>,
         private val defaultFileService: Lazy<FileService>,
+        private val permalinkService: Lazy<PermalinkService>,
         private val secureStorageService: Lazy<SecureStorageService>,
         private val profileService: Lazy<ProfileService>,
         private val widgetService: Lazy<WidgetService>,
@@ -253,6 +256,8 @@ internal class DefaultSession @Inject constructor(
 
     override fun fileService(): FileService = defaultFileService.get()
 
+    override fun permalinkService(): PermalinkService = permalinkService.get()
+
     override fun widgetService(): WidgetService = widgetService.get()
 
     override fun integrationManagerService() = integrationManagerService
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/EventInsertLiveProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/EventInsertLiveProcessor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt
index 70d0a0d99f..85d714698f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/EventInsertLiveProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session
+package org.matrix.android.sdk.internal.session
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.internal.database.model.EventInsertType
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.database.model.EventInsertType
 import io.realm.Realm
 
 internal interface EventInsertLiveProcessor {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
new file mode 100644
index 0000000000..475450837e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session
+
+import dagger.BindsInstance
+import dagger.Component
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.crypto.CancelGossipRequestWorker
+import org.matrix.android.sdk.internal.crypto.CryptoModule
+import org.matrix.android.sdk.internal.crypto.SendGossipRequestWorker
+import org.matrix.android.sdk.internal.crypto.SendGossipWorker
+import org.matrix.android.sdk.internal.crypto.verification.SendVerificationMessageWorker
+import org.matrix.android.sdk.internal.di.MatrixComponent
+import org.matrix.android.sdk.internal.di.SessionAssistedInjectModule
+import org.matrix.android.sdk.internal.network.NetworkConnectivityChecker
+import org.matrix.android.sdk.internal.session.account.AccountModule
+import org.matrix.android.sdk.internal.session.cache.CacheModule
+import org.matrix.android.sdk.internal.session.call.CallModule
+import org.matrix.android.sdk.internal.session.content.ContentModule
+import org.matrix.android.sdk.internal.session.content.UploadContentWorker
+import org.matrix.android.sdk.internal.session.filter.FilterModule
+import org.matrix.android.sdk.internal.session.group.GetGroupDataWorker
+import org.matrix.android.sdk.internal.session.group.GroupModule
+import org.matrix.android.sdk.internal.session.homeserver.HomeServerCapabilitiesModule
+import org.matrix.android.sdk.internal.session.identity.IdentityModule
+import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManagerModule
+import org.matrix.android.sdk.internal.session.openid.OpenIdModule
+import org.matrix.android.sdk.internal.session.profile.ProfileModule
+import org.matrix.android.sdk.internal.session.pushers.AddHttpPusherWorker
+import org.matrix.android.sdk.internal.session.pushers.PushersModule
+import org.matrix.android.sdk.internal.session.room.RoomModule
+import org.matrix.android.sdk.internal.session.room.relation.SendRelationWorker
+import org.matrix.android.sdk.internal.session.room.send.EncryptEventWorker
+import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
+import org.matrix.android.sdk.internal.session.room.send.RedactEventWorker
+import org.matrix.android.sdk.internal.session.room.send.SendEventWorker
+import org.matrix.android.sdk.internal.session.signout.SignOutModule
+import org.matrix.android.sdk.internal.session.sync.SyncModule
+import org.matrix.android.sdk.internal.session.sync.SyncTask
+import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
+import org.matrix.android.sdk.internal.session.sync.job.SyncWorker
+import org.matrix.android.sdk.internal.session.terms.TermsModule
+import org.matrix.android.sdk.internal.session.user.UserModule
+import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataModule
+import org.matrix.android.sdk.internal.session.widgets.WidgetModule
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+
+@Component(dependencies = [MatrixComponent::class],
+        modules = [
+            SessionModule::class,
+            RoomModule::class,
+            SyncModule::class,
+            HomeServerCapabilitiesModule::class,
+            SignOutModule::class,
+            GroupModule::class,
+            UserModule::class,
+            FilterModule::class,
+            GroupModule::class,
+            ContentModule::class,
+            CacheModule::class,
+            CryptoModule::class,
+            PushersModule::class,
+            OpenIdModule::class,
+            WidgetModule::class,
+            IntegrationManagerModule::class,
+            IdentityModule::class,
+            TermsModule::class,
+            AccountDataModule::class,
+            ProfileModule::class,
+            SessionAssistedInjectModule::class,
+            AccountModule::class,
+            CallModule::class
+        ]
+)
+@SessionScope
+internal interface SessionComponent {
+
+    fun coroutineDispatchers(): MatrixCoroutineDispatchers
+
+    fun session(): Session
+
+    fun syncTask(): SyncTask
+
+    fun syncTokenStore(): SyncTokenStore
+
+    fun networkConnectivityChecker(): NetworkConnectivityChecker
+
+    fun taskExecutor(): TaskExecutor
+
+    fun inject(worker: SendEventWorker)
+
+    fun inject(worker: SendRelationWorker)
+
+    fun inject(worker: EncryptEventWorker)
+
+    fun inject(worker: MultipleEventSendingDispatcherWorker)
+
+    fun inject(worker: RedactEventWorker)
+
+    fun inject(worker: GetGroupDataWorker)
+
+    fun inject(worker: UploadContentWorker)
+
+    fun inject(worker: SyncWorker)
+
+    fun inject(worker: AddHttpPusherWorker)
+
+    fun inject(worker: SendVerificationMessageWorker)
+
+    fun inject(worker: SendGossipRequestWorker)
+
+    fun inject(worker: CancelGossipRequestWorker)
+
+    fun inject(worker: SendGossipWorker)
+
+    @Component.Factory
+    interface Factory {
+        fun create(
+                matrixComponent: MatrixComponent,
+                @BindsInstance sessionParams: SessionParams): SessionComponent
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionLifecycleObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionLifecycleObserver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
index 2147fc7bce..3cc73599ff 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionLifecycleObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session
+package org.matrix.android.sdk.internal.session
 
 import androidx.annotation.MainThread
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionListeners.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionListeners.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt
index 83b90b16b9..36242616ff 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionListeners.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session
+package org.matrix.android.sdk.internal.session
 
-import im.vector.matrix.android.api.failure.GlobalError
-import im.vector.matrix.android.api.session.Session
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 
 internal class SessionListeners @Inject constructor() {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
similarity index 70%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index 0feb944b38..d404cecc51 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session
+package org.matrix.android.sdk.internal.session
 
 import android.content.Context
 import android.os.Build
@@ -24,65 +25,67 @@ import dagger.Lazy
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoSet
-import im.vector.matrix.android.api.MatrixConfiguration
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.api.auth.data.sessionId
-import im.vector.matrix.android.api.crypto.MXCryptoConfig
-import im.vector.matrix.android.api.session.InitialSyncProgressService
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.accountdata.AccountDataService
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilitiesService
-import im.vector.matrix.android.api.session.securestorage.SecureStorageService
-import im.vector.matrix.android.api.session.securestorage.SharedSecretStorageService
-import im.vector.matrix.android.api.session.typing.TypingUsersTracker
-import im.vector.matrix.android.internal.crypto.crosssigning.ShieldTrustUpdater
-import im.vector.matrix.android.internal.crypto.secrets.DefaultSharedSecretStorageService
-import im.vector.matrix.android.internal.crypto.verification.VerificationMessageProcessor
-import im.vector.matrix.android.internal.database.DatabaseCleaner
-import im.vector.matrix.android.internal.database.EventInsertLiveObserver
-import im.vector.matrix.android.internal.database.SessionRealmConfigurationFactory
-import im.vector.matrix.android.internal.di.Authenticated
-import im.vector.matrix.android.internal.di.DeviceId
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.SessionDownloadsDirectory
-import im.vector.matrix.android.internal.di.SessionFilesDirectory
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.di.Unauthenticated
-import im.vector.matrix.android.internal.di.UnauthenticatedWithCertificate
-import im.vector.matrix.android.internal.di.UnauthenticatedWithCertificateWithProgress
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.di.UserMd5
-import im.vector.matrix.android.internal.eventbus.EventBusTimberLogger
-import im.vector.matrix.android.internal.network.DefaultNetworkConnectivityChecker
-import im.vector.matrix.android.internal.network.FallbackNetworkCallbackStrategy
-import im.vector.matrix.android.internal.network.NetworkCallbackStrategy
-import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
-import im.vector.matrix.android.internal.network.PreferredNetworkCallbackStrategy
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.network.httpclient.addAccessTokenInterceptor
-import im.vector.matrix.android.internal.network.httpclient.addSocketFactory
-import im.vector.matrix.android.internal.network.interceptors.CurlLoggingInterceptor
-import im.vector.matrix.android.internal.network.token.AccessTokenProvider
-import im.vector.matrix.android.internal.network.token.HomeserverAccessTokenProvider
-import im.vector.matrix.android.internal.session.call.CallEventProcessor
-import im.vector.matrix.android.internal.session.download.DownloadProgressInterceptor
-import im.vector.matrix.android.internal.session.homeserver.DefaultHomeServerCapabilitiesService
-import im.vector.matrix.android.internal.session.identity.DefaultIdentityService
-import im.vector.matrix.android.internal.session.integrationmanager.IntegrationManager
-import im.vector.matrix.android.internal.session.room.EventRelationsAggregationProcessor
-import im.vector.matrix.android.internal.session.room.create.RoomCreateEventProcessor
-import im.vector.matrix.android.internal.session.room.prune.RedactionEventProcessor
-import im.vector.matrix.android.internal.session.room.tombstone.RoomTombstoneEventProcessor
-import im.vector.matrix.android.internal.session.securestorage.DefaultSecureStorageService
-import im.vector.matrix.android.internal.session.typing.DefaultTypingUsersTracker
-import im.vector.matrix.android.internal.session.user.accountdata.DefaultAccountDataService
-import im.vector.matrix.android.internal.session.widgets.DefaultWidgetURLFormatter
-import im.vector.matrix.android.internal.util.md5
 import io.realm.RealmConfiguration
 import okhttp3.OkHttpClient
 import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.auth.data.sessionId
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
+import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.accountdata.AccountDataService
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
+import org.matrix.android.sdk.api.session.permalinks.PermalinkService
+import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
+import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
+import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
+import org.matrix.android.sdk.internal.crypto.crosssigning.ShieldTrustUpdater
+import org.matrix.android.sdk.internal.crypto.secrets.DefaultSharedSecretStorageService
+import org.matrix.android.sdk.internal.crypto.verification.VerificationMessageProcessor
+import org.matrix.android.sdk.internal.database.DatabaseCleaner
+import org.matrix.android.sdk.internal.database.EventInsertLiveObserver
+import org.matrix.android.sdk.internal.database.SessionRealmConfigurationFactory
+import org.matrix.android.sdk.internal.di.Authenticated
+import org.matrix.android.sdk.internal.di.DeviceId
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.SessionDownloadsDirectory
+import org.matrix.android.sdk.internal.di.SessionFilesDirectory
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
+import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificateWithProgress
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.di.UserMd5
+import org.matrix.android.sdk.internal.eventbus.EventBusTimberLogger
+import org.matrix.android.sdk.internal.network.DefaultNetworkConnectivityChecker
+import org.matrix.android.sdk.internal.network.FallbackNetworkCallbackStrategy
+import org.matrix.android.sdk.internal.network.NetworkCallbackStrategy
+import org.matrix.android.sdk.internal.network.NetworkConnectivityChecker
+import org.matrix.android.sdk.internal.network.PreferredNetworkCallbackStrategy
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.httpclient.addAccessTokenInterceptor
+import org.matrix.android.sdk.internal.network.httpclient.addSocketFactory
+import org.matrix.android.sdk.internal.network.interceptors.CurlLoggingInterceptor
+import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
+import org.matrix.android.sdk.internal.network.token.HomeserverAccessTokenProvider
+import org.matrix.android.sdk.internal.session.call.CallEventProcessor
+import org.matrix.android.sdk.internal.session.download.DownloadProgressInterceptor
+import org.matrix.android.sdk.internal.session.homeserver.DefaultHomeServerCapabilitiesService
+import org.matrix.android.sdk.internal.session.identity.DefaultIdentityService
+import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManager
+import org.matrix.android.sdk.internal.session.permalinks.DefaultPermalinkService
+import org.matrix.android.sdk.internal.session.room.EventRelationsAggregationProcessor
+import org.matrix.android.sdk.internal.session.room.create.RoomCreateEventProcessor
+import org.matrix.android.sdk.internal.session.room.prune.RedactionEventProcessor
+import org.matrix.android.sdk.internal.session.room.tombstone.RoomTombstoneEventProcessor
+import org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService
+import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
+import org.matrix.android.sdk.internal.session.user.accountdata.DefaultAccountDataService
+import org.matrix.android.sdk.internal.session.widgets.DefaultWidgetURLFormatter
+import org.matrix.android.sdk.internal.util.md5
 import retrofit2.Retrofit
 import java.io.File
 import javax.inject.Provider
@@ -355,6 +358,9 @@ internal abstract class SessionModule {
     @Binds
     abstract fun bindSharedSecretStorageService(service: DefaultSharedSecretStorageService): SharedSecretStorageService
 
+    @Binds
+    abstract fun bindPermalinkService(service: DefaultPermalinkService): PermalinkService
+
     @Binds
     abstract fun bindTypingUsersTracker(tracker: DefaultTypingUsersTracker): TypingUsersTracker
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionScope.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionScope.kt
index ab0c3f5770..1fb950bad4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionScope.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session
+package org.matrix.android.sdk.internal.session
 
 import javax.inject.Scope
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/TestInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/TestInterceptor.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/TestInterceptor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/TestInterceptor.kt
index fc8589bd28..cf8701ab86 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/TestInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/TestInterceptor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session
+package org.matrix.android.sdk.internal.session
 
 import okhttp3.Interceptor
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/AccountAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/AccountAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt
index 62aded3f03..be25c680a5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/AccountAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.account
+package org.matrix.android.sdk.internal.session.account
 
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/AccountModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountModule.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/AccountModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountModule.kt
index 032139ce5d..50469f99b0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/AccountModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.account
+package org.matrix.android.sdk.internal.session.account
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.account.AccountService
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.account.AccountService
+import org.matrix.android.sdk.internal.session.SessionScope
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/ChangePasswordParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/ChangePasswordParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt
index 8aa1f9834c..347e39ae39 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/ChangePasswordParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.account
+package org.matrix.android.sdk.internal.session.account
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
 
 /**
  * Class to pass request parameters to update the password.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/ChangePasswordTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/ChangePasswordTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt
index 60cf92e5d1..9338f58e6f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/ChangePasswordTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.account
+package org.matrix.android.sdk.internal.session.account
 
-import im.vector.matrix.android.api.failure.toRegistrationFlowResponse
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/DeactivateAccountParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/DeactivateAccountParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt
index 9960f61dbc..a8fa999c98 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/DeactivateAccountParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.account
+package org.matrix.android.sdk.internal.session.account
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
 
 @JsonClass(generateAdapter = true)
 internal data class DeactivateAccountParams(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/DeactivateAccountTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/DeactivateAccountTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
index b993534ba1..b31a0a4c97 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/DeactivateAccountTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.account
+package org.matrix.android.sdk.internal.session.account
 
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.cleanup.CleanupSession
-import im.vector.matrix.android.internal.session.identity.IdentityDisconnectTask
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.cleanup.CleanupSession
+import org.matrix.android.sdk.internal.session.identity.IdentityDisconnectTask
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/DefaultAccountService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/DefaultAccountService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt
index f6db1dd3db..892d91fe34 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/account/DefaultAccountService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.account
+package org.matrix.android.sdk.internal.session.account
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.account.AccountService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.account.AccountService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
 internal class DefaultAccountService @Inject constructor(private val changePasswordTask: ChangePasswordTask,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/CacheModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/CacheModule.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/CacheModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/CacheModule.kt
index a1feb3e176..b6e2a8d0c4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/CacheModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/CacheModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.cache
+package org.matrix.android.sdk.internal.session.cache
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.cache.CacheService
-import im.vector.matrix.android.internal.di.SessionDatabase
+import org.matrix.android.sdk.api.session.cache.CacheService
+import org.matrix.android.sdk.internal.di.SessionDatabase
 import io.realm.RealmConfiguration
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/ClearCacheTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/ClearCacheTask.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/ClearCacheTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/ClearCacheTask.kt
index cd802d40dc..9b968f3d03 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/ClearCacheTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/ClearCacheTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.cache
+package org.matrix.android.sdk.internal.session.cache
 
-import im.vector.matrix.android.internal.database.awaitTransaction
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.database.awaitTransaction
+import org.matrix.android.sdk.internal.task.Task
 import io.realm.RealmConfiguration
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/DefaultCacheService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/DefaultCacheService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt
index 63db2b4b86..ab53e87067 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/DefaultCacheService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.cache
+package org.matrix.android.sdk.internal.session.cache
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.cache.CacheService
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.cache.CacheService
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
 internal class DefaultCacheService @Inject constructor(@SessionDatabase
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallEventProcessor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
index 34ee7b2c54..5d1d5808e3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.call
+package org.matrix.android.sdk.internal.session.call
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.internal.database.model.EventInsertType
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.EventInsertLiveProcessor
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import io.realm.Realm
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallModule.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallModule.kt
index bc4cef8772..60887db497 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.call
+package org.matrix.android.sdk.internal.session.call
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.call.CallSignalingService
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.call.CallSignalingService
+import org.matrix.android.sdk.internal.session.SessionScope
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/DefaultCallSignalingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/DefaultCallSignalingService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt
index b8ecd5abe4..6a17f0e925 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/DefaultCallSignalingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,31 +15,31 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.call
+package org.matrix.android.sdk.internal.session.call
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.api.session.call.CallSignalingService
-import im.vector.matrix.android.api.session.call.CallState
-import im.vector.matrix.android.api.session.call.CallsListener
-import im.vector.matrix.android.api.session.call.MxCall
-import im.vector.matrix.android.api.session.call.TurnServerResponse
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.call.CallAnswerContent
-import im.vector.matrix.android.api.session.room.model.call.CallCandidatesContent
-import im.vector.matrix.android.api.session.room.model.call.CallHangupContent
-import im.vector.matrix.android.api.session.room.model.call.CallInviteContent
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.NoOpCancellable
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.call.model.MxCallImpl
-import im.vector.matrix.android.internal.session.room.send.LocalEchoEventFactory
-import im.vector.matrix.android.internal.session.room.send.RoomEventSender
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.session.call.CallSignalingService
+import org.matrix.android.sdk.api.session.call.CallState
+import org.matrix.android.sdk.api.session.call.CallsListener
+import org.matrix.android.sdk.api.session.call.MxCall
+import org.matrix.android.sdk.api.session.call.TurnServerResponse
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.call.CallAnswerContent
+import org.matrix.android.sdk.api.session.room.model.call.CallCandidatesContent
+import org.matrix.android.sdk.api.session.room.model.call.CallHangupContent
+import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.call.model.MxCallImpl
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
+import org.matrix.android.sdk.internal.session.room.send.RoomEventSender
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import timber.log.Timber
 import java.util.UUID
 import javax.inject.Inject
@@ -57,18 +58,32 @@ internal class DefaultCallSignalingService @Inject constructor(
 
     private val activeCalls = mutableListOf<MxCall>()
 
-    private var cachedTurnServerResponse: TurnServerResponse? = null
+    private val cachedTurnServerResponse = object {
+
+        private val MIN_TTL = 60
+
+        private val now = { System.currentTimeMillis() / 1000 }
+
+        private var expiresAt: Long = 0
+
+        var data: TurnServerResponse? = null
+            get() = if (expiresAt > now()) field else null
+            set(value) {
+                expiresAt = now() + (value?.ttl ?: 0) - MIN_TTL
+                field = value
+            }
+    }
 
     override fun getTurnServer(callback: MatrixCallback<TurnServerResponse>): Cancelable {
-        if (cachedTurnServerResponse != null) {
-            cachedTurnServerResponse?.let { callback.onSuccess(it) }
+        if (cachedTurnServerResponse.data != null) {
+            cachedTurnServerResponse.data?.let { callback.onSuccess(it) }
             return NoOpCancellable
         }
         return turnServerTask
                 .configureWith(GetTurnServerTask.Params) {
                     this.callback = object : MatrixCallback<TurnServerResponse> {
                         override fun onSuccess(data: TurnServerResponse) {
-                            cachedTurnServerResponse = data
+                            cachedTurnServerResponse.data = data
                             callback.onSuccess(data)
                         }
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/GetTurnServerTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/GetTurnServerTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt
index f644bb22e9..c38a00d1bd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/GetTurnServerTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.call
+package org.matrix.android.sdk.internal.session.call
 
-import im.vector.matrix.android.api.session.call.TurnServerResponse
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.call.TurnServerResponse
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/VoipApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/VoipApi.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt
index 29b9141489..ea2f55cf67 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/VoipApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.call
+package org.matrix.android.sdk.internal.session.call
 
-import im.vector.matrix.android.api.session.call.TurnServerResponse
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.api.session.call.TurnServerResponse
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.GET
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/model/MxCallImpl.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/model/MxCallImpl.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
index fe9b9e447c..1e724706f3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/model/MxCallImpl.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +15,23 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.call.model
+package org.matrix.android.sdk.internal.session.call.model
 
-import im.vector.matrix.android.api.session.call.CallState
-import im.vector.matrix.android.api.session.call.MxCall
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.events.model.UnsignedData
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.call.CallAnswerContent
-import im.vector.matrix.android.api.session.room.model.call.CallCandidatesContent
-import im.vector.matrix.android.api.session.room.model.call.CallHangupContent
-import im.vector.matrix.android.api.session.room.model.call.CallInviteContent
-import im.vector.matrix.android.internal.session.call.DefaultCallSignalingService
-import im.vector.matrix.android.internal.session.room.send.LocalEchoEventFactory
-import im.vector.matrix.android.internal.session.room.send.RoomEventSender
+import org.matrix.android.sdk.api.session.call.CallState
+import org.matrix.android.sdk.api.session.call.MxCall
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.UnsignedData
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.call.CallAnswerContent
+import org.matrix.android.sdk.api.session.room.model.call.CallCandidatesContent
+import org.matrix.android.sdk.api.session.room.model.call.CallHangupContent
+import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
+import org.matrix.android.sdk.internal.session.call.DefaultCallSignalingService
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
+import org.matrix.android.sdk.internal.session.room.send.RoomEventSender
 import org.webrtc.IceCandidate
 import org.webrtc.SessionDescription
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cleanup/CleanupSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cleanup/CleanupSession.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt
index 56c7eb557b..427fb59898 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cleanup/CleanupSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.cleanup
+package org.matrix.android.sdk.internal.session.cleanup
 
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.internal.SessionManager
-import im.vector.matrix.android.internal.auth.SessionParamsStore
-import im.vector.matrix.android.internal.crypto.CryptoModule
-import im.vector.matrix.android.internal.database.RealmKeysUtils
-import im.vector.matrix.android.internal.di.CryptoDatabase
-import im.vector.matrix.android.internal.di.SessionDownloadsDirectory
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.SessionFilesDirectory
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.di.UserMd5
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.session.SessionModule
-import im.vector.matrix.android.internal.session.cache.ClearCacheTask
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.internal.SessionManager
+import org.matrix.android.sdk.internal.auth.SessionParamsStore
+import org.matrix.android.sdk.internal.crypto.CryptoModule
+import org.matrix.android.sdk.internal.database.RealmKeysUtils
+import org.matrix.android.sdk.internal.di.CryptoDatabase
+import org.matrix.android.sdk.internal.di.SessionDownloadsDirectory
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.SessionFilesDirectory
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.UserMd5
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.SessionModule
+import org.matrix.android.sdk.internal.session.cache.ClearCacheTask
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ContentModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentModule.kt
similarity index 71%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ContentModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentModule.kt
index 016a1252bc..ba87d06097 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ContentModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.content
+package org.matrix.android.sdk.internal.session.content
 
 import dagger.Binds
 import dagger.Module
-import im.vector.matrix.android.api.session.content.ContentUploadStateTracker
-import im.vector.matrix.android.api.session.content.ContentUrlResolver
-import im.vector.matrix.android.api.session.file.ContentDownloadStateTracker
-import im.vector.matrix.android.internal.session.download.DefaultContentDownloadStateTracker
+import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
+import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker
+import org.matrix.android.sdk.internal.session.download.DefaultContentDownloadStateTracker
 
 @Module
 internal abstract class ContentModule {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ContentUploadResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ContentUploadResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt
index 242502a5bc..cb0c11d1b8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ContentUploadResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.content
+package org.matrix.android.sdk.internal.session.content
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUploadStateTracker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
index 7a13d5f8a5..aa8b98ae62 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUploadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.content
+package org.matrix.android.sdk.internal.session.content
 
 import android.os.Handler
 import android.os.Looper
-import im.vector.matrix.android.api.session.content.ContentUploadStateTracker
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
+import org.matrix.android.sdk.internal.session.SessionScope
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUrlResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUrlResolver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
index f039628fd4..80f69f8890 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUrlResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.content
+package org.matrix.android.sdk.internal.session.content
 
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.session.content.ContentUrlResolver
-import im.vector.matrix.android.internal.network.NetworkConstants
-import im.vector.matrix.android.internal.util.ensureTrailingSlash
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.util.ensureTrailingSlash
 import javax.inject.Inject
 
 private const val MATRIX_CONTENT_URI_SCHEME = "mxc://"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/FileUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/FileUploader.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
index 6ee508b02a..5e5380fce1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/FileUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.content
+package org.matrix.android.sdk.internal.session.content
 
 import android.content.Context
 import android.net.Uri
 import com.squareup.moshi.Moshi
-import im.vector.matrix.android.api.session.content.ContentUrlResolver
-import im.vector.matrix.android.internal.di.Authenticated
-import im.vector.matrix.android.internal.network.ProgressRequestBody
-import im.vector.matrix.android.internal.network.awaitResponse
-import im.vector.matrix.android.internal.network.toFailure
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
@@ -34,6 +30,11 @@ import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.internal.di.Authenticated
+import org.matrix.android.sdk.internal.network.ProgressRequestBody
+import org.matrix.android.sdk.internal.network.awaitResponse
+import org.matrix.android.sdk.internal.network.toFailure
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -69,15 +70,14 @@ internal class FileUploader @Inject constructor(@Authenticated
                               filename: String?,
                               mimeType: String?,
                               progressListener: ProgressRequestBody.Listener? = null): ContentUploadResponse {
-        val inputStream = withContext(Dispatchers.IO) {
-            context.contentResolver.openInputStream(uri)
-        } ?: throw FileNotFoundException()
+        return withContext(Dispatchers.IO) {
+            val inputStream = context.contentResolver.openInputStream(uri) ?: throw FileNotFoundException()
 
-        inputStream.use {
-            return uploadByteArray(it.readBytes(), filename, mimeType, progressListener)
+            inputStream.use {
+                uploadByteArray(it.readBytes(), filename, mimeType, progressListener)
+            }
         }
     }
-
     private suspend fun upload(uploadBody: RequestBody, filename: String?, progressListener: ProgressRequestBody.Listener?): ContentUploadResponse {
         val urlBuilder = uploadUrl.toHttpUrlOrNull()?.newBuilder() ?: throw RuntimeException()
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ThumbnailExtractor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ThumbnailExtractor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt
index eae2bf8f6d..05558fcf4c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ThumbnailExtractor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.content
+package org.matrix.android.sdk.internal.session.content
 
 import android.content.Context
 import android.graphics.Bitmap
 import android.media.MediaMetadataRetriever
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import timber.log.Timber
 import java.io.ByteArrayOutputStream
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index dfab8c5f7e..6d354cdcbe 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.content
+package org.matrix.android.sdk.internal.session.content
 
 import android.content.Context
 import android.graphics.BitmapFactory
@@ -23,23 +24,23 @@ import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
 import id.zelory.compressor.Compressor
 import id.zelory.compressor.constraint.default
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageAudioContent
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageFileContent
-import im.vector.matrix.android.api.session.room.model.message.MessageImageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent
-import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments
-import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
-import im.vector.matrix.android.internal.network.ProgressRequestBody
-import im.vector.matrix.android.internal.session.DefaultFileService
-import im.vector.matrix.android.internal.session.room.send.MultipleEventSendingDispatcherWorker
-import im.vector.matrix.android.internal.worker.SessionWorkerParams
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageFileContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.network.ProgressRequestBody
+import org.matrix.android.sdk.internal.session.DefaultFileService
+import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import timber.log.Timber
 import java.io.ByteArrayInputStream
 import java.io.File
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/download/DefaultContentDownloadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/download/DefaultContentDownloadStateTracker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt
index bdae5b10ef..295a829b08 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/download/DefaultContentDownloadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.download
+package org.matrix.android.sdk.internal.session.download
 
 import android.os.Handler
 import android.os.Looper
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.api.session.file.ContentDownloadStateTracker
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker
+import org.matrix.android.sdk.internal.session.SessionScope
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/download/DownloadProgressInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DownloadProgressInterceptor.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/download/DownloadProgressInterceptor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DownloadProgressInterceptor.kt
index 3fdc252cbc..d8ef0c3323 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/download/DownloadProgressInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DownloadProgressInterceptor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.download
+package org.matrix.android.sdk.internal.session.download
 
 import okhttp3.Interceptor
 import okhttp3.Response
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/download/ProgressResponseBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/download/ProgressResponseBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt
index dc41b94321..8bfe74862d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/download/ProgressResponseBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.download
+package org.matrix.android.sdk.internal.session.download
 
 import okhttp3.MediaType
 import okhttp3.ResponseBody
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultFilterRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultFilterRepository.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt
index 7a0d47e165..e07778b536 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultFilterRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.FilterEntity
-import im.vector.matrix.android.internal.database.model.FilterEntityFields
-import im.vector.matrix.android.internal.database.query.get
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.database.model.FilterEntity
+import org.matrix.android.sdk.internal.database.model.FilterEntityFields
+import org.matrix.android.sdk.internal.database.query.get
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import io.realm.Realm
 import io.realm.kotlin.where
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultFilterService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultFilterService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
index c85d949d0a..d120312a1f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultFilterService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
-import im.vector.matrix.android.api.session.sync.FilterService
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.session.sync.FilterService
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
 internal class DefaultFilterService @Inject constructor(private val saveFilterTask: SaveFilterTask,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultSaveFilterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultSaveFilterTask.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultSaveFilterTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultSaveFilterTask.kt
index f396e01e86..b5c214dbaa 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultSaveFilterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultSaveFilterTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
-import im.vector.matrix.android.api.session.sync.FilterService
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.sync.FilterService
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/EventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/EventFilter.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/EventFilter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/EventFilter.kt
index f5d159588b..fdfda09633 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/EventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/EventFilter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/Filter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/Filter.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/Filter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/Filter.kt
index 4b826a00f8..4c4a4d6181 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/Filter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/Filter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.MoshiProvider
 
 /**
  * Class which can be parsed to a filter json string. Used for POST and GET
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterApi.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
index deae2d5b3a..8a45a6d66f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
@@ -1,6 +1,7 @@
 /*
  * Copyright 2018 Matthias Kesler
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -32,7 +33,8 @@ internal interface FilterApi {
      * @param body   the Json representation of a FilterBody object
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/filter")
-    fun uploadFilter(@Path("userId") userId: String, @Body body: Filter): Call<FilterResponse>
+    fun uploadFilter(@Path("userId") userId: String,
+                     @Body body: Filter): Call<FilterResponse>
 
     /**
      * Gets a filter with a given filterId from the homeserver
@@ -42,5 +44,6 @@ internal interface FilterApi {
      * @return Filter
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/filter/{filterId}")
-    fun getFilterById(@Path("userId") userId: String, @Path("filterId") filterId: String): Call<Filter>
+    fun getFilterById(@Path("userId") userId: String,
+                      @Path("filterId") filterId: String): Call<Filter>
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
index 15c57ab1c8..12764248ef 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
-import im.vector.matrix.android.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.EventType
 
 internal object FilterFactory {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt
index ce1a58d1b7..f5052d57ac 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.sync.FilterService
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.sync.FilterService
+import org.matrix.android.sdk.internal.session.SessionScope
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterRepository.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt
index c558732f44..b19478c42f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
 internal interface FilterRepository {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterResponse.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterResponse.kt
index a9bfb70d5e..951b7e8ca2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterUtil.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterUtil.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterUtil.kt
index 53ede5ad45..3a030cc470 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/FilterUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterUtil.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
 internal object FilterUtil {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/RoomEventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/RoomEventFilter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
index 81e7b672b4..cefa9e8ece 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/RoomEventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.MoshiProvider
 
 /**
  * Represents "RoomEventFilter" as mentioned in the SPEC
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/RoomFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomFilter.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/RoomFilter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomFilter.kt
index e79a0a624e..c0694aee51 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/RoomFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomFilter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.filter
+package org.matrix.android.sdk.internal.session.filter
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGetGroupDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGetGroupDataTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGetGroupDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGetGroupDataTask.kt
index ee43441453..c91bd381a4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGetGroupDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGetGroupDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,21 +15,21 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group
+package org.matrix.android.sdk.internal.session.group
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.internal.database.model.GroupEntity
-import im.vector.matrix.android.internal.database.model.GroupSummaryEntity
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.group.model.GroupRooms
-import im.vector.matrix.android.internal.session.group.model.GroupSummaryResponse
-import im.vector.matrix.android.internal.session.group.model.GroupUsers
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.database.model.GroupEntity
+import org.matrix.android.sdk.internal.database.model.GroupSummaryEntity
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.group.model.GroupRooms
+import org.matrix.android.sdk.internal.session.group.model.GroupSummaryResponse
+import org.matrix.android.sdk.internal.session.group.model.GroupUsers
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroup.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroup.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt
index a9e77a73d0..3fbed5d992 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroup.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group
+package org.matrix.android.sdk.internal.session.group
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.group.Group
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.group.Group
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 
 internal class DefaultGroup(override val groupId: String,
                             private val taskExecutor: TaskExecutor,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroupService.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroupService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroupService.kt
index 4dd162276f..25c9d1dff7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroupService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group
+package org.matrix.android.sdk.internal.session.group
 
 import androidx.lifecycle.LiveData
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.group.Group
-import im.vector.matrix.android.api.session.group.GroupService
-import im.vector.matrix.android.api.session.group.GroupSummaryQueryParams
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.GroupEntity
-import im.vector.matrix.android.internal.database.model.GroupSummaryEntity
-import im.vector.matrix.android.internal.database.model.GroupSummaryEntityFields
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.query.process
-import im.vector.matrix.android.internal.util.fetchCopyMap
+import org.matrix.android.sdk.api.session.group.Group
+import org.matrix.android.sdk.api.session.group.GroupService
+import org.matrix.android.sdk.api.session.group.GroupSummaryQueryParams
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.GroupEntity
+import org.matrix.android.sdk.internal.database.model.GroupSummaryEntity
+import org.matrix.android.sdk.internal.database.model.GroupSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.query.process
+import org.matrix.android.sdk.internal.util.fetchCopyMap
 import io.realm.Realm
 import io.realm.RealmQuery
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GetGroupDataWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataWorker.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GetGroupDataWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataWorker.kt
index f025040c39..7a04f076e9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GetGroupDataWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group
+package org.matrix.android.sdk.internal.session.group
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.worker.SessionWorkerParams
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt
index 8d5dd03fb2..f5156017ea 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group
+package org.matrix.android.sdk.internal.session.group
 
-import im.vector.matrix.android.internal.network.NetworkConstants
-import im.vector.matrix.android.internal.session.group.model.GroupRooms
-import im.vector.matrix.android.internal.session.group.model.GroupSummaryResponse
-import im.vector.matrix.android.internal.session.group.model.GroupUsers
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.session.group.model.GroupRooms
+import org.matrix.android.sdk.internal.session.group.model.GroupSummaryResponse
+import org.matrix.android.sdk.internal.session.group.model.GroupUsers
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt
index a5046d45d4..d9566fe5f1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group
+package org.matrix.android.sdk.internal.session.group
 
-import im.vector.matrix.android.api.session.group.Group
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.task.TaskExecutor
+import org.matrix.android.sdk.api.session.group.Group
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
 
 internal interface GroupFactory {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupModule.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupModule.kt
index 6799ffd3e5..b47bb0a5ad 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group
+package org.matrix.android.sdk.internal.session.group
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.group.GroupService
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.group.GroupService
+import org.matrix.android.sdk.internal.session.SessionScope
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupProfile.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupProfile.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupProfile.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupProfile.kt
index fed60d8aab..9990e3d821 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupProfile.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupProfile.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group.model
+package org.matrix.android.sdk.internal.session.group.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRoom.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRoom.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRoom.kt
index 4b96903152..c93878a0d4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRoom.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group.model
+package org.matrix.android.sdk.internal.session.group.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRooms.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRooms.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRooms.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRooms.kt
index b2db6bb957..f7e36ad8bc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRooms.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRooms.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group.model
+package org.matrix.android.sdk.internal.session.group.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryResponse.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryResponse.kt
index 9e0f52f093..a11ba1ecdc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group.model
+package org.matrix.android.sdk.internal.session.group.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryRoomsSection.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryRoomsSection.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryRoomsSection.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryRoomsSection.kt
index 75d35f07ce..428caaa209 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryRoomsSection.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryRoomsSection.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group.model
+package org.matrix.android.sdk.internal.session.group.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUser.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUser.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUser.kt
index ceb9f954fc..f61160fb1a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUser.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group.model
+package org.matrix.android.sdk.internal.session.group.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUsersSection.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUsersSection.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUsersSection.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUsersSection.kt
index 52bced1c39..a8ade1ab5e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUsersSection.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUsersSection.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group.model
+package org.matrix.android.sdk.internal.session.group.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUser.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUser.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUser.kt
index f2e504dd47..d9a9631ef7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUser.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group.model
+package org.matrix.android.sdk.internal.session.group.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUsers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUsers.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUsers.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUsers.kt
index b98d467c55..1ce283756d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUsers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUsers.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.group.model
+package org.matrix.android.sdk.internal.session.group.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/CapabilitiesAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/CapabilitiesAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt
index f96863bea6..33ebf3e548 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/CapabilitiesAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.homeserver
+package org.matrix.android.sdk.internal.session.homeserver
 
-import im.vector.matrix.android.internal.auth.version.Versions
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.auth.version.Versions
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.GET
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
index 865b2513a8..13ce84cf90 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +15,23 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.homeserver
+package org.matrix.android.sdk.internal.session.homeserver
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.auth.wellknown.WellknownResult
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities
-import im.vector.matrix.android.internal.auth.version.Versions
-import im.vector.matrix.android.internal.auth.version.isLoginAndRegistrationSupportedBySdk
-import im.vector.matrix.android.internal.database.model.HomeServerCapabilitiesEntity
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.integrationmanager.IntegrationManagerConfigExtractor
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
-import im.vector.matrix.android.internal.wellknown.GetWellknownTask
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.internal.auth.version.Versions
+import org.matrix.android.sdk.internal.auth.version.isLoginAndRegistrationSupportedBySdk
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManagerConfigExtractor
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.wellknown.GetWellknownTask
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import java.util.Date
@@ -109,6 +110,7 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
             if (getWellknownResult != null && getWellknownResult is WellknownResult.Prompt) {
                 homeServerCapabilitiesEntity.defaultIdentityServerUrl = getWellknownResult.identityServerUrl
                 homeServerCapabilitiesEntity.adminE2EByDefault = getWellknownResult.wellKnown.e2eAdminSetting?.e2eDefault ?: true
+                homeServerCapabilitiesEntity.preferredJitsiDomain = getWellknownResult.wellKnown.jitsiServer?.preferredDomain
                 // We are also checking for integration manager configurations
                 val config = configExtractor.extract(getWellknownResult.wellKnown)
                 if (config != null) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
similarity index 68%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
index b5d96f7d69..0989d6c191 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.homeserver
+package org.matrix.android.sdk.internal.session.homeserver
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilitiesService
-import im.vector.matrix.android.internal.database.mapper.HomeServerCapabilitiesMapper
-import im.vector.matrix.android.internal.database.model.HomeServerCapabilitiesEntity
-import im.vector.matrix.android.internal.database.query.get
-import im.vector.matrix.android.internal.di.SessionDatabase
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
+import org.matrix.android.sdk.internal.database.mapper.HomeServerCapabilitiesMapper
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
+import org.matrix.android.sdk.internal.database.query.get
+import org.matrix.android.sdk.internal.di.SessionDatabase
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/GetCapabilitiesResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/GetCapabilitiesResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
index 9a625571a8..54d8cc7839 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/GetCapabilitiesResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.homeserver
+package org.matrix.android.sdk.internal.session.homeserver
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.extensions.orTrue
+import org.matrix.android.sdk.api.extensions.orTrue
 
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-capabilities
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/GetUploadCapabilitiesResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetUploadCapabilitiesResult.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/GetUploadCapabilitiesResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetUploadCapabilitiesResult.kt
index c98119db6c..43395aae3e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/GetUploadCapabilitiesResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetUploadCapabilitiesResult.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.homeserver
+package org.matrix.android.sdk.internal.session.homeserver
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/HomeServerCapabilitiesModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesModule.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/HomeServerCapabilitiesModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesModule.kt
index 91ec3fe305..240839cf7b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/HomeServerCapabilitiesModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.homeserver
+package org.matrix.android.sdk.internal.session.homeserver
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.wellknown.WellknownModule
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.wellknown.WellknownModule
 import retrofit2.Retrofit
 
 @Module(includes = [WellknownModule::class])
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/HomeServerPinger.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/HomeServerPinger.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
index 705deb4e57..dee73f08f1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/HomeServerPinger.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.homeserver
+package org.matrix.android.sdk.internal.session.homeserver
 
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.TaskExecutor
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.TaskExecutor
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/DefaultIdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/DefaultIdentityService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
index c0462d7af6..d3a10764d3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/DefaultIdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,45 +15,45 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import dagger.Lazy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilitiesService
-import im.vector.matrix.android.api.session.identity.FoundThreePid
-import im.vector.matrix.android.api.session.identity.IdentityService
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.api.session.identity.IdentityServiceListener
-import im.vector.matrix.android.api.session.identity.SharedState
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.NoOpCancellable
-import im.vector.matrix.android.internal.di.AuthenticatedIdentity
-import im.vector.matrix.android.internal.di.UnauthenticatedWithCertificate
-import im.vector.matrix.android.internal.extensions.observeNotNull
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.session.SessionLifecycleObserver
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.openid.GetOpenIdTokenTask
-import im.vector.matrix.android.internal.session.profile.BindThreePidsTask
-import im.vector.matrix.android.internal.session.profile.UnbindThreePidsTask
-import im.vector.matrix.android.internal.session.sync.model.accountdata.IdentityServerContent
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataTypes
-import im.vector.matrix.android.internal.session.user.accountdata.AccountDataDataSource
-import im.vector.matrix.android.internal.session.user.accountdata.UpdateUserAccountDataTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.launchToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.util.ensureProtocol
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
+import org.matrix.android.sdk.api.session.identity.FoundThreePid
+import org.matrix.android.sdk.api.session.identity.IdentityService
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.api.session.identity.IdentityServiceListener
+import org.matrix.android.sdk.api.session.identity.SharedState
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.internal.di.AuthenticatedIdentity
+import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
+import org.matrix.android.sdk.internal.extensions.observeNotNull
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.openid.GetOpenIdTokenTask
+import org.matrix.android.sdk.internal.session.profile.BindThreePidsTask
+import org.matrix.android.sdk.internal.session.profile.UnbindThreePidsTask
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.IdentityServerContent
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataDataSource
+import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.launchToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.ensureProtocol
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/EnsureIdentityToken.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/EnsureIdentityToken.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/EnsureIdentityToken.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/EnsureIdentityToken.kt
index e727cd69bc..838b9975b7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/EnsureIdentityToken.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/EnsureIdentityToken.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
 import dagger.Lazy
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.internal.di.UnauthenticatedWithCertificate
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.openid.GetOpenIdTokenTask
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.openid.GetOpenIdTokenTask
+import org.matrix.android.sdk.internal.task.Task
 import okhttp3.OkHttpClient
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
index ca361b4265..f2c889f024 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.internal.auth.registration.SuccessResult
-import im.vector.matrix.android.internal.network.NetworkConstants
-import im.vector.matrix.android.internal.session.identity.model.IdentityAccountResponse
-import im.vector.matrix.android.internal.session.identity.model.IdentityHashDetailResponse
-import im.vector.matrix.android.internal.session.identity.model.IdentityLookUpParams
-import im.vector.matrix.android.internal.session.identity.model.IdentityLookUpResponse
-import im.vector.matrix.android.internal.session.identity.model.IdentityRequestOwnershipParams
-import im.vector.matrix.android.internal.session.identity.model.IdentityRequestTokenForEmailBody
-import im.vector.matrix.android.internal.session.identity.model.IdentityRequestTokenForMsisdnBody
-import im.vector.matrix.android.internal.session.identity.model.IdentityRequestTokenResponse
+import org.matrix.android.sdk.internal.auth.registration.SuccessResult
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.session.identity.model.IdentityAccountResponse
+import org.matrix.android.sdk.internal.session.identity.model.IdentityHashDetailResponse
+import org.matrix.android.sdk.internal.session.identity.model.IdentityLookUpParams
+import org.matrix.android.sdk.internal.session.identity.model.IdentityLookUpResponse
+import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestOwnershipParams
+import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenForEmailBody
+import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenForMsisdnBody
+import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenResponse
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -94,5 +95,6 @@ internal interface IdentityAPI {
      * - https://matrix.org/docs/spec/identity_service/latest#post-matrix-identity-v2-validate-email-submittoken
      */
     @POST(NetworkConstants.URI_IDENTITY_PATH_V2 + "validate/{medium}/submitToken")
-    fun submitToken(@Path("medium") medium: String, @Body body: IdentityRequestOwnershipParams): Call<SuccessResult>
+    fun submitToken(@Path("medium") medium: String,
+                    @Body body: IdentityRequestOwnershipParams): Call<SuccessResult>
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityAccessTokenProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAccessTokenProvider.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityAccessTokenProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAccessTokenProvider.kt
index ee2f18c767..cf9ba0ee89 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityAccessTokenProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAccessTokenProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.internal.network.token.AccessTokenProvider
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
 import javax.inject.Inject
 
 internal class IdentityAccessTokenProvider @Inject constructor(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityApiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityApiProvider.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityApiProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityApiProvider.kt
index 3262a56398..09922cb475 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityApiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityApiProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
 
 @SessionScope
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityAuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityAuthAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt
index 04abf5fe6c..7ebe775ce5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityAuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.internal.network.NetworkConstants
-import im.vector.matrix.android.internal.session.identity.model.IdentityRegisterResponse
-import im.vector.matrix.android.internal.session.openid.RequestOpenIdTokenResponse
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.session.identity.model.IdentityRegisterResponse
+import org.matrix.android.sdk.internal.session.openid.RequestOpenIdTokenResponse
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityBulkLookupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityBulkLookupTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
index 9f1579af60..ac33c2666f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityBulkLookupTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +15,23 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.api.session.identity.FoundThreePid
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.identity.toMedium
-import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments.base64ToBase64Url
-import im.vector.matrix.android.internal.crypto.tools.withOlmUtility
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.identity.model.IdentityHashDetailResponse
-import im.vector.matrix.android.internal.session.identity.model.IdentityLookUpParams
-import im.vector.matrix.android.internal.session.identity.model.IdentityLookUpResponse
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.session.identity.FoundThreePid
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.toMedium
+import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments.base64ToBase64Url
+import org.matrix.android.sdk.internal.crypto.tools.withOlmUtility
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.identity.model.IdentityHashDetailResponse
+import org.matrix.android.sdk.internal.session.identity.model.IdentityLookUpParams
+import org.matrix.android.sdk.internal.session.identity.model.IdentityLookUpResponse
+import org.matrix.android.sdk.internal.task.Task
 import java.util.Locale
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityDisconnectTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityDisconnectTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt
index abed3962bc..0e68689ce7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityDisconnectTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.internal.di.AuthenticatedIdentity
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.network.token.AccessTokenProvider
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.internal.di.AuthenticatedIdentity
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
+import org.matrix.android.sdk.internal.task.Task
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
index 79160b8c59..0c35eef642 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +15,24 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.internal.database.RealmKeysUtils
-import im.vector.matrix.android.internal.di.AuthenticatedIdentity
-import im.vector.matrix.android.internal.di.IdentityDatabase
-import im.vector.matrix.android.internal.di.SessionFilesDirectory
-import im.vector.matrix.android.internal.di.UnauthenticatedWithCertificate
-import im.vector.matrix.android.internal.di.UserMd5
-import im.vector.matrix.android.internal.network.httpclient.addAccessTokenInterceptor
-import im.vector.matrix.android.internal.network.token.AccessTokenProvider
-import im.vector.matrix.android.internal.session.SessionModule
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.identity.db.IdentityRealmModule
-import im.vector.matrix.android.internal.session.identity.db.RealmIdentityStore
+import org.matrix.android.sdk.internal.database.RealmKeysUtils
+import org.matrix.android.sdk.internal.di.AuthenticatedIdentity
+import org.matrix.android.sdk.internal.di.IdentityDatabase
+import org.matrix.android.sdk.internal.di.SessionFilesDirectory
+import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
+import org.matrix.android.sdk.internal.di.UserMd5
+import org.matrix.android.sdk.internal.network.httpclient.addAccessTokenInterceptor
+import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
+import org.matrix.android.sdk.internal.session.SessionModule
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.identity.db.IdentityRealmModule
+import org.matrix.android.sdk.internal.session.identity.db.RealmIdentityStore
 import io.realm.RealmConfiguration
 import okhttp3.OkHttpClient
 import java.io.File
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityPingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityPingTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt
index 50a36097a1..6994ef1bce 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityPingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 import javax.net.ssl.HttpsURLConnection
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityRegisterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityRegisterTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt
index c72e364ef8..bba6f99178 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityRegisterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.identity.model.IdentityRegisterResponse
-import im.vector.matrix.android.internal.session.openid.RequestOpenIdTokenResponse
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.identity.model.IdentityRegisterResponse
+import org.matrix.android.sdk.internal.session.openid.RequestOpenIdTokenResponse
+import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
 internal interface IdentityRegisterTask : Task<IdentityRegisterTask.Params, IdentityRegisterResponse> {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityRequestTokenForBindingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityRequestTokenForBindingTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
index 313f5f6662..3155e19943 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityRequestTokenForBindingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +15,19 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.identity.getCountryCode
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.identity.data.IdentityPendingBinding
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.identity.model.IdentityRequestTokenForEmailBody
-import im.vector.matrix.android.internal.session.identity.model.IdentityRequestTokenForMsisdnBody
-import im.vector.matrix.android.internal.session.identity.model.IdentityRequestTokenResponse
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.getCountryCode
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.identity.data.IdentityPendingBinding
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenForEmailBody
+import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenForMsisdnBody
+import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenResponse
+import org.matrix.android.sdk.internal.task.Task
 import java.util.UUID
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentitySubmitTokenForBindingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
index fae1dd1eba..7b25986ae3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.identity.toMedium
-import im.vector.matrix.android.internal.auth.registration.SuccessResult
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.identity.model.IdentityRequestOwnershipParams
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.toMedium
+import org.matrix.android.sdk.internal.auth.registration.SuccessResult
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestOwnershipParams
+import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
 internal interface IdentitySubmitTokenForBindingTask : Task<IdentitySubmitTokenForBindingTask.Params, Unit> {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityTaskHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityTaskHelper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt
index bd97a0af2b..52f29c857b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityTaskHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity
+package org.matrix.android.sdk.internal.session.identity
 
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.identity.model.IdentityAccountResponse
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.identity.model.IdentityAccountResponse
 
 internal suspend fun getIdentityApiAndEnsureTerms(identityApiProvider: IdentityApiProvider, userId: String): IdentityAPI {
     val identityAPI = identityApiProvider.identityApi ?: throw IdentityServiceError.NoIdentityServerConfigured
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/data/IdentityData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/data/IdentityData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt
index f1e57e1ed5..4574d9d598 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/data/IdentityData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.data
+package org.matrix.android.sdk.internal.session.identity.data
 
 internal data class IdentityData(
         val identityServerUrl: String?,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/data/IdentityPendingBinding.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityPendingBinding.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/data/IdentityPendingBinding.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityPendingBinding.kt
index b7f405cb0a..85bf65d741 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/data/IdentityPendingBinding.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityPendingBinding.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.data
+package org.matrix.android.sdk.internal.session.identity.data
 
 internal data class IdentityPendingBinding(
         /* Managed by Riot */
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/data/IdentityStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/data/IdentityStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt
index d5cd3277ec..61334f188d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/data/IdentityStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.data
+package org.matrix.android.sdk.internal.session.identity.data
 
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.internal.session.identity.model.IdentityHashDetailResponse
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.session.identity.model.IdentityHashDetailResponse
 
 internal interface IdentityStore {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityDataEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityDataEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt
index 76e480bdc9..41645bc07b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityDataEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.db
+package org.matrix.android.sdk.internal.session.identity.db
 
 import io.realm.RealmList
 import io.realm.RealmObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityDataEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityDataEntityQuery.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt
index 0a07359642..1c612d6bf4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityDataEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.db
+package org.matrix.android.sdk.internal.session.identity.db
 
 import io.realm.Realm
 import io.realm.RealmList
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt
index 1335e38565..4b99ba17d3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.db
+package org.matrix.android.sdk.internal.session.identity.db
 
-import im.vector.matrix.android.internal.session.identity.data.IdentityData
-import im.vector.matrix.android.internal.session.identity.data.IdentityPendingBinding
+import org.matrix.android.sdk.internal.session.identity.data.IdentityData
+import org.matrix.android.sdk.internal.session.identity.data.IdentityPendingBinding
 
 internal object IdentityMapper {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityPendingBindingEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntity.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityPendingBindingEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntity.kt
index 51b195a7fc..94a359f4d1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityPendingBindingEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntity.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.db
+package org.matrix.android.sdk.internal.session.identity.db
 
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.identity.toMedium
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.toMedium
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityPendingBindingEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntityQuery.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityPendingBindingEntityQuery.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntityQuery.kt
index e358be6bbb..30de96e557 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityPendingBindingEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntityQuery.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.db
+package org.matrix.android.sdk.internal.session.identity.db
 
-import im.vector.matrix.android.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.ThreePid
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityRealmModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
index 19bd90ee1f..85ea903ab6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/IdentityRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.db
+package org.matrix.android.sdk.internal.session.identity.db
 
 import io.realm.annotations.RealmModule
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt
index c294fbbf4b..244f09f06a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.db
+package org.matrix.android.sdk.internal.session.identity.db
 
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.internal.di.IdentityDatabase
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.identity.data.IdentityPendingBinding
-import im.vector.matrix.android.internal.session.identity.data.IdentityData
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.identity.model.IdentityHashDetailResponse
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.di.IdentityDatabase
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.identity.data.IdentityPendingBinding
+import org.matrix.android.sdk.internal.session.identity.data.IdentityData
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.identity.model.IdentityHashDetailResponse
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityAccountResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityAccountResponse.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityAccountResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityAccountResponse.kt
index a72eb75537..f23c493206 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityAccountResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityAccountResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.model
+package org.matrix.android.sdk.internal.session.identity.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityHashDetailResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityHashDetailResponse.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityHashDetailResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityHashDetailResponse.kt
index 16a4e1fc71..04ed62bddd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityHashDetailResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityHashDetailResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.model
+package org.matrix.android.sdk.internal.session.identity.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityLookUpParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpParams.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityLookUpParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpParams.kt
index f87d14e1fe..f737e4742c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityLookUpParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.model
+package org.matrix.android.sdk.internal.session.identity.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityLookUpResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpResponse.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityLookUpResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpResponse.kt
index a71e2f7366..0a274ebe44 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityLookUpResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.model
+package org.matrix.android.sdk.internal.session.identity.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRegisterResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRegisterResponse.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRegisterResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRegisterResponse.kt
index 86999d570d..1769b3654e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRegisterResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRegisterResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.model
+package org.matrix.android.sdk.internal.session.identity.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRequestOwnershipParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestOwnershipParams.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRequestOwnershipParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestOwnershipParams.kt
index 9da86cbc48..bd263e1dc6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRequestOwnershipParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestOwnershipParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.identity.model
+package org.matrix.android.sdk.internal.session.identity.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRequestTokenBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenBody.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRequestTokenBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenBody.kt
index 3e92ebb1d2..b93a3f43ae 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRequestTokenBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.model
+package org.matrix.android.sdk.internal.session.identity.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRequestTokenResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenResponse.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRequestTokenResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenResponse.kt
index cb3c257ddb..5f4209cac8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/model/IdentityRequestTokenResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.identity.model
+package org.matrix.android.sdk.internal.session.identity.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/AllowedWidgetsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/AllowedWidgetsContent.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/AllowedWidgetsContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/AllowedWidgetsContent.kt
index 99959f9514..5ea6e4d4d7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/AllowedWidgetsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/AllowedWidgetsContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.integrationmanager
+package org.matrix.android.sdk.internal.session.integrationmanager
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/DefaultIntegrationManagerService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/DefaultIntegrationManagerService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt
index 4de4a24738..4f1185929f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/DefaultIntegrationManagerService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.integrationmanager
+package org.matrix.android.sdk.internal.session.integrationmanager
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerConfig
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.api.util.Cancelable
 import javax.inject.Inject
 
 internal class DefaultIntegrationManagerService @Inject constructor(private val integrationManager: IntegrationManager) : IntegrationManagerService {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManager.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
index 27e035e093..0f7b3f85c7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,34 +15,34 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.integrationmanager
+package org.matrix.android.sdk.internal.session.integrationmanager
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.MatrixConfiguration
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerConfig
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService
-import im.vector.matrix.android.api.session.widgets.model.WidgetContent
-import im.vector.matrix.android.api.session.widgets.model.WidgetType
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.NoOpCancellable
-import im.vector.matrix.android.internal.database.model.WellknownIntegrationManagerConfigEntity
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.extensions.observeNotNull
-import im.vector.matrix.android.internal.session.SessionLifecycleObserver
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataTypes
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
-import im.vector.matrix.android.internal.session.user.accountdata.AccountDataDataSource
-import im.vector.matrix.android.internal.session.user.accountdata.UpdateUserAccountDataTask
-import im.vector.matrix.android.internal.session.widgets.helper.WidgetFactory
-import im.vector.matrix.android.internal.session.widgets.helper.extractWidgetSequence
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.api.session.widgets.model.WidgetContent
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.internal.database.model.WellknownIntegrationManagerConfigEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.extensions.observeNotNull
+import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataDataSource
+import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
+import org.matrix.android.sdk.internal.session.widgets.helper.WidgetFactory
+import org.matrix.android.sdk.internal.session.widgets.helper.extractWidgetSequence
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt
index cd2621ab13..78edc59fca 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.integrationmanager
+package org.matrix.android.sdk.internal.session.integrationmanager
 
-import im.vector.matrix.android.api.auth.data.WellKnown
-import im.vector.matrix.android.internal.database.model.WellknownIntegrationManagerConfigEntity
+import org.matrix.android.sdk.api.auth.data.WellKnown
+import org.matrix.android.sdk.internal.database.model.WellknownIntegrationManagerConfigEntity
 import javax.inject.Inject
 
 internal class IntegrationManagerConfigExtractor @Inject constructor() {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerModule.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerModule.kt
index 1c29f9c38c..fb7f835d9b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.integrationmanager
+package org.matrix.android.sdk.internal.session.integrationmanager
 
 import dagger.Binds
 import dagger.Module
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 
 @Module
 internal abstract class IntegrationManagerModule {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerWidgetData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerWidgetData.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerWidgetData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerWidgetData.kt
index 1b77b21bc2..c592237a1f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerWidgetData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerWidgetData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.integrationmanager
+package org.matrix.android.sdk.internal.session.integrationmanager
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationProvisioningContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationProvisioningContent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationProvisioningContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationProvisioningContent.kt
index 51485df762..e48a6fd84f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationProvisioningContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationProvisioningContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.integrationmanager
+package org.matrix.android.sdk.internal.session.integrationmanager
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
index 020248aba2..ffe11ee04b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,30 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.notification
+package org.matrix.android.sdk.internal.session.notification
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.pushrules.PushRuleService
-import im.vector.matrix.android.api.pushrules.RuleKind
-import im.vector.matrix.android.api.pushrules.RuleSetKey
-import im.vector.matrix.android.api.pushrules.getActions
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.api.pushrules.rest.RuleSet
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.database.mapper.PushRulesMapper
-import im.vector.matrix.android.internal.database.model.PushRulesEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.pushers.AddPushRuleTask
-import im.vector.matrix.android.internal.session.pushers.GetPushRulesTask
-import im.vector.matrix.android.internal.session.pushers.RemovePushRuleTask
-import im.vector.matrix.android.internal.session.pushers.UpdatePushRuleActionsTask
-import im.vector.matrix.android.internal.session.pushers.UpdatePushRuleEnableStatusTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.pushrules.PushRuleService
+import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.pushrules.RuleSetKey
+import org.matrix.android.sdk.api.pushrules.getActions
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.pushrules.rest.RuleSet
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.database.mapper.PushRulesMapper
+import org.matrix.android.sdk.internal.database.model.PushRulesEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.pushers.AddPushRuleTask
+import org.matrix.android.sdk.internal.session.pushers.GetPushRulesTask
+import org.matrix.android.sdk.internal.session.pushers.RemovePushRuleTask
+import org.matrix.android.sdk.internal.session.pushers.UpdatePushRuleActionsTask
+import org.matrix.android.sdk.internal.session.pushers.UpdatePushRuleEnableStatusTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/ProcessEventForPushTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
index 9774f04625..49a92acc54 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/ProcessEventForPushTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.notification
+package org.matrix.android.sdk.internal.session.notification
 
-import im.vector.matrix.android.api.pushrules.ConditionResolver
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.sync.model.RoomsSyncResponse
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.pushrules.ConditionResolver
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
+import org.matrix.android.sdk.internal.task.Task
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/GetOpenIdTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/GetOpenIdTokenTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
index c8f394dc47..3da6fdca93 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/GetOpenIdTokenTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.openid
+package org.matrix.android.sdk.internal.session.openid
 
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/OpenIdAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/OpenIdAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
index ee2e85a33e..e56e2e630e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/OpenIdAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.openid
+package org.matrix.android.sdk.internal.session.openid
 
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
@@ -34,5 +35,6 @@ internal interface OpenIdAPI {
      * @param userId the user id
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/openid/request_token")
-    fun openIdToken(@Path("userId") userId: String, @Body body: JsonDict = emptyMap()): Call<RequestOpenIdTokenResponse>
+    fun openIdToken(@Path("userId") userId: String,
+                    @Body body: JsonDict = emptyMap()): Call<RequestOpenIdTokenResponse>
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/OpenIdModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdModule.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/OpenIdModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdModule.kt
index c6993167e8..60ee7fb747 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/OpenIdModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.openid
+package org.matrix.android.sdk.internal.session.openid
 
 import dagger.Binds
 import dagger.Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/RequestOpenIdTokenResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/RequestOpenIdTokenResponse.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/RequestOpenIdTokenResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/RequestOpenIdTokenResponse.kt
index 4beb3fe420..8103efb895 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/openid/RequestOpenIdTokenResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/RequestOpenIdTokenResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.openid
+package org.matrix.android.sdk.internal.session.openid
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt
new file mode 100644
index 0000000000..cef1fce05c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.permalinks
+
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.permalinks.PermalinkService
+import org.matrix.android.sdk.api.session.permalinks.PermalinkService.Companion.MATRIX_TO_URL_BASE
+import javax.inject.Inject
+
+internal class DefaultPermalinkService @Inject constructor(
+        private val permalinkFactory: PermalinkFactory
+) : PermalinkService {
+
+    override fun createPermalink(event: Event): String? {
+        return permalinkFactory.createPermalink(event)
+    }
+
+    override fun createPermalink(id: String): String? {
+        return permalinkFactory.createPermalink(id)
+    }
+
+    override fun createRoomPermalink(roomId: String): String? {
+        return permalinkFactory.createRoomPermalink(roomId)
+    }
+
+    override fun createPermalink(roomId: String, eventId: String): String {
+        return permalinkFactory.createPermalink(roomId, eventId)
+    }
+
+    override fun getLinkedId(url: String): String? {
+        return url
+                .takeIf { it.startsWith(MATRIX_TO_URL_BASE) }
+                ?.substring(MATRIX_TO_URL_BASE.length)
+                ?.substringBeforeLast("?")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
new file mode 100644
index 0000000000..3ec8fe8397
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.permalinks
+
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.permalinks.PermalinkService.Companion.MATRIX_TO_URL_BASE
+import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.RoomGetter
+import java.net.URLEncoder
+import javax.inject.Inject
+import javax.inject.Provider
+
+internal class PermalinkFactory @Inject constructor(
+        @UserId
+        private val userId: String,
+        // Use a provider to fix circular Dagger dependency
+        private val roomGetterProvider: Provider<RoomGetter>
+) {
+
+    fun createPermalink(event: Event): String? {
+        if (event.roomId.isNullOrEmpty() || event.eventId.isNullOrEmpty()) {
+            return null
+        }
+        return createPermalink(event.roomId, event.eventId)
+    }
+
+    fun createPermalink(id: String): String? {
+        return if (id.isEmpty()) {
+            null
+        } else MATRIX_TO_URL_BASE + escape(id)
+    }
+
+    fun createRoomPermalink(roomId: String): String? {
+        return if (roomId.isEmpty()) {
+            null
+        } else {
+            MATRIX_TO_URL_BASE + escape(roomId) + computeViaParams(userId, roomId)
+        }
+    }
+
+    fun createPermalink(roomId: String, eventId: String): String {
+        return MATRIX_TO_URL_BASE + escape(roomId) + "/" + escape(eventId) + computeViaParams(userId, roomId)
+    }
+
+    fun getLinkedId(url: String): String? {
+        val isSupported = url.startsWith(MATRIX_TO_URL_BASE)
+
+        return if (isSupported) {
+            url.substring(MATRIX_TO_URL_BASE.length)
+        } else null
+    }
+
+    /**
+     * Compute the via parameters.
+     * Take up to 3 homeserver domains, taking the most representative one regarding room members and including the
+     * current user one.
+     */
+    private fun computeViaParams(userId: String, roomId: String): String {
+        val userHomeserver = userId.substringAfter(":")
+        return getUserIdsOfJoinedMembers(roomId)
+                .map { it.substringAfter(":") }
+                .groupBy { it }
+                .mapValues { it.value.size }
+                .toMutableMap()
+                // Ensure the user homeserver will be included
+                .apply { this[userHomeserver] = Int.MAX_VALUE }
+                .let { map -> map.keys.sortedByDescending { map[it] } }
+                .take(3)
+                .joinToString(prefix = "?via=", separator = "&via=") { URLEncoder.encode(it, "utf-8") }
+    }
+
+    /**
+     * Escape '/' in id, because it is used as a separator
+     *
+     * @param id the id to escape
+     * @return the escaped id
+     */
+    private fun escape(id: String): String {
+        return id.replace("/", "%2F")
+    }
+
+    /**
+     * Unescape '/' in id
+     *
+     * @param id the id to escape
+     * @return the escaped id
+     */
+    private fun unescape(id: String): String {
+        return id.replace("%2F", "/")
+    }
+
+    /**
+     * Get a set of userIds of joined members of a room
+     */
+    private fun getUserIdsOfJoinedMembers(roomId: String): Set<String> {
+        return roomGetterProvider.get().getRoom(roomId)
+                ?.getRoomMembers(roomMemberQueryParams { memberships = listOf(Membership.JOIN) })
+                ?.map { it.userId }
+                .orEmpty()
+                .toSet()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/AccountThreePidsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AccountThreePidsResponse.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/AccountThreePidsResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AccountThreePidsResponse.kt
index 17f12113dd..185294fd3b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/AccountThreePidsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AccountThreePidsResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/BindThreePidBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidBody.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/BindThreePidBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidBody.kt
index 6ba3ddda4a..dff246e6f1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/BindThreePidBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/BindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/BindThreePidsTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
index 0e1987dd5f..52fbcb5185 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/BindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.internal.di.AuthenticatedIdentity
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.network.token.AccessTokenProvider
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.identity.data.getIdentityServerUrlWithoutProtocol
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.di.AuthenticatedIdentity
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.identity.data.getIdentityServerUrlWithoutProtocol
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/DefaultProfileService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
index 06127b6c6d..633b047994 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,25 +16,25 @@
  *
  */
 
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.profile.ProfileService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.database.model.UserThreePidEntity
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.content.FileUploader
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.task.launchToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
 import io.realm.kotlin.where
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.profile.ProfileService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.database.model.UserThreePidEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.content.FileUploader
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.task.launchToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import javax.inject.Inject
 
 internal class DefaultProfileService @Inject constructor(private val taskExecutor: TaskExecutor,
@@ -74,11 +75,7 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
     override fun updateAvatar(userId: String, newAvatarUri: Uri, fileName: String, matrixCallback: MatrixCallback<Unit>): Cancelable {
         return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, matrixCallback) {
             val response = fileUploader.uploadFromUri(newAvatarUri, fileName, "image/jpeg")
-            setAvatarUrlTask
-                    .configureWith(SetAvatarUrlTask.Params(userId = userId, newAvatarUrl = response.contentUri)) {
-                        callback = matrixCallback
-                    }
-                    .executeBy(taskExecutor)
+            setAvatarUrlTask.execute(SetAvatarUrlTask.Params(userId = userId, newAvatarUrl = response.contentUri))
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/GetProfileInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/GetProfileInfoTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
index f51092434e..7889dbf240 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/GetProfileInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
  *
  */
 
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
index 7dc4763403..31e1f09bbd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +16,10 @@
  *
  */
 
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -47,13 +48,15 @@ internal interface ProfileAPI {
      * Change user display name
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}/displayname")
-    fun setDisplayName(@Path("userId") userId: String, @Body body: SetDisplayNameBody): Call<Unit>
+    fun setDisplayName(@Path("userId") userId: String,
+                       @Body body: SetDisplayNameBody): Call<Unit>
 
     /**
      * Change user avatar url.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}/avatar_url")
-    fun setAvatarUrl(@Path("userId") userId: String, @Body body: SetAvatarUrlBody): Call<Unit>
+    fun setAvatarUrl(@Path("userId") userId: String,
+                     @Body body: SetAvatarUrlBody): Call<Unit>
 
     /**
      * Bind a threePid
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
index b86d0ee07a..57a86d03e0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +16,13 @@
  *
  */
 
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.profile.ProfileService
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.profile.ProfileService
+import org.matrix.android.sdk.internal.session.SessionScope
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/RefreshUserThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/RefreshUserThreePidsTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
index ceed27a0d3..dcc0db8ad1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/RefreshUserThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.UserThreePidEntity
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.database.model.UserThreePidEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetAvatarUrlBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlBody.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetAvatarUrlBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlBody.kt
index 0288853e28..25d995fbdf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetAvatarUrlBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetAvatarUrlTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetAvatarUrlTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
index 263922ca78..1eaedb0220 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetAvatarUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetDisplayNameBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameBody.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetDisplayNameBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameBody.kt
index c9bcbff688..306aca6f44 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetDisplayNameBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetDisplayNameTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetDisplayNameTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
index bca2f73f26..66406a480c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetDisplayNameTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ThirdPartyIdentifier.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ThirdPartyIdentifier.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ThirdPartyIdentifier.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ThirdPartyIdentifier.kt
index 76fa3bd80f..b7c756cbb7 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ThirdPartyIdentifier.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ThirdPartyIdentifier.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidBody.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidBody.kt
index 705569ba87..1a91245894 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidResponse.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidResponse.kt
index 51467ad201..df31efdb6c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidsTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
index 5206ea9bda..b08c283765 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/UnbindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.profile
+package org.matrix.android.sdk.internal.session.profile
 
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.identity.toMedium
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.identity.data.getIdentityServerUrlWithoutProtocol
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.toMedium
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.identity.data.getIdentityServerUrlWithoutProtocol
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddHttpPusherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddHttpPusherWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
index 44cbf3adbe..b7f1fb2b93 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddHttpPusherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.pushers.PusherState
-import im.vector.matrix.android.internal.database.mapper.toEntity
-import im.vector.matrix.android.internal.database.model.PusherEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.util.awaitTransaction
-import im.vector.matrix.android.internal.worker.SessionWorkerParams
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.pushers.PusherState
+import org.matrix.android.sdk.internal.database.mapper.toEntity
+import org.matrix.android.sdk.internal.database.model.PusherEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddPushRuleTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddPushRuleTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
index b310ba7cd1..1c8f11a12d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddPushRuleTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
-import im.vector.matrix.android.api.pushrules.RuleKind
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultConditionResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
similarity index 72%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultConditionResolver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
index 7490ca54ad..0d3ad340f5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultConditionResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
-import im.vector.matrix.android.api.pushrules.ConditionResolver
-import im.vector.matrix.android.api.pushrules.ContainsDisplayNameCondition
-import im.vector.matrix.android.api.pushrules.EventMatchCondition
-import im.vector.matrix.android.api.pushrules.RoomMemberCountCondition
-import im.vector.matrix.android.api.pushrules.SenderNotificationPermissionCondition
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.room.RoomGetter
+import org.matrix.android.sdk.api.pushrules.ConditionResolver
+import org.matrix.android.sdk.api.pushrules.ContainsDisplayNameCondition
+import org.matrix.android.sdk.api.pushrules.EventMatchCondition
+import org.matrix.android.sdk.api.pushrules.RoomMemberCountCondition
+import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.RoomGetter
 import javax.inject.Inject
 
 internal class DefaultConditionResolver @Inject constructor(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPushersService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index b20d6617ad..3ef46785b2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
 import androidx.lifecycle.LiveData
 import androidx.work.BackoffPolicy
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.pushers.Pusher
-import im.vector.matrix.android.api.session.pushers.PushersService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.PusherEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.pushers.Pusher
+import org.matrix.android.sdk.api.session.pushers.PushersService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.PusherEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import java.security.InvalidParameterException
 import java.util.UUID
 import java.util.concurrent.TimeUnit
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/GetPushRulesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/GetPushRulesTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt
index 4f3b39d1a7..de96db01dd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/GetPushRulesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
-import im.vector.matrix.android.api.pushrules.rest.GetPushRulesResponse
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/GetPushersResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/GetPushersResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt
index 1a46dcc8be..a36705cc57 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/GetPushersResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/GetPushersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/GetPushersTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt
index 5af839fec7..bad507555d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/GetPushersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.pushers.PusherState
-import im.vector.matrix.android.internal.database.mapper.toEntity
-import im.vector.matrix.android.internal.database.model.PusherEntity
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.api.session.pushers.PusherState
+import org.matrix.android.sdk.internal.database.mapper.toEntity
+import org.matrix.android.sdk.internal.database.model.PusherEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/JsonPusher.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/JsonPusher.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt
index 06b9a56af7..89dae0c7e9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/JsonPusher.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.di.SerializeNulls
+import org.matrix.android.sdk.internal.di.SerializeNulls
 
 /**
  * Example:
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/JsonPusherData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/JsonPusherData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt
index 980c409a1b..d2520a915b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/JsonPusherData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/PushRulesApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/PushRulesApi.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
index 6dc7c1cd5a..166e8ac3be 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/PushRulesApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
-import im.vector.matrix.android.api.pushrules.rest.GetPushRulesResponse
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/PushersAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/PushersAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt
index 9f1859548e..6ad70db5e4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/PushersAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/PushersModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/PushersModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
index e80fca09e7..9569574fce 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/PushersModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +15,19 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.pushrules.ConditionResolver
-import im.vector.matrix.android.api.pushrules.PushRuleService
-import im.vector.matrix.android.api.session.pushers.PushersService
-import im.vector.matrix.android.internal.session.notification.DefaultProcessEventForPushTask
-import im.vector.matrix.android.internal.session.notification.DefaultPushRuleService
-import im.vector.matrix.android.internal.session.notification.ProcessEventForPushTask
-import im.vector.matrix.android.internal.session.room.notification.DefaultSetRoomNotificationStateTask
-import im.vector.matrix.android.internal.session.room.notification.SetRoomNotificationStateTask
+import org.matrix.android.sdk.api.pushrules.ConditionResolver
+import org.matrix.android.sdk.api.pushrules.PushRuleService
+import org.matrix.android.sdk.api.session.pushers.PushersService
+import org.matrix.android.sdk.internal.session.notification.DefaultProcessEventForPushTask
+import org.matrix.android.sdk.internal.session.notification.DefaultPushRuleService
+import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
+import org.matrix.android.sdk.internal.session.room.notification.DefaultSetRoomNotificationStateTask
+import org.matrix.android.sdk.internal.session.room.notification.SetRoomNotificationStateTask
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/RemovePushRuleTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/RemovePushRuleTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
index d0edda9cfb..cb46c1342d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/RemovePushRuleTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
-import im.vector.matrix.android.api.pushrules.RuleKind
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/RemovePusherTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/RemovePusherTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
index 0658876b0b..cf8cd1e10b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/RemovePusherTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.pushers.PusherState
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.PusherEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.api.session.pushers.PusherState
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.PusherEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import io.realm.Realm
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/SavePushRulesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/SavePushRulesTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt
index 8a238c1afb..7761544d48 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/SavePushRulesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.pushrules.RuleScope
-import im.vector.matrix.android.api.pushrules.RuleSetKey
-import im.vector.matrix.android.api.pushrules.rest.GetPushRulesResponse
-import im.vector.matrix.android.internal.database.mapper.PushRulesMapper
-import im.vector.matrix.android.internal.database.model.PushRulesEntity
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.api.pushrules.RuleScope
+import org.matrix.android.sdk.api.pushrules.RuleSetKey
+import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
+import org.matrix.android.sdk.internal.database.mapper.PushRulesMapper
+import org.matrix.android.sdk.internal.database.model.PushRulesEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import javax.inject.Inject
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/UpdatePushRuleActionsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/UpdatePushRuleActionsTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
index d8025be14d..d68888a3f5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/UpdatePushRuleActionsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
-import im.vector.matrix.android.api.pushrules.RuleKind
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
index c5d593c263..2f9ac3edc0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.pushers
+package org.matrix.android.sdk.internal.session.pushers
 
-import im.vector.matrix.android.api.pushrules.RuleKind
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index bcaa25c88d..27a51594c3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,33 +15,33 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room
+package org.matrix.android.sdk.internal.session.room
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.call.RoomCallService
-import im.vector.matrix.android.api.session.room.members.MembershipService
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.relation.RelationService
-import im.vector.matrix.android.api.session.room.notification.RoomPushRuleService
-import im.vector.matrix.android.api.session.room.read.ReadService
-import im.vector.matrix.android.api.session.room.reporting.ReportingService
-import im.vector.matrix.android.api.session.room.send.DraftService
-import im.vector.matrix.android.api.session.room.send.SendService
-import im.vector.matrix.android.api.session.room.state.StateService
-import im.vector.matrix.android.api.session.room.tags.TagsService
-import im.vector.matrix.android.api.session.room.timeline.TimelineService
-import im.vector.matrix.android.api.session.room.typing.TypingService
-import im.vector.matrix.android.api.session.room.uploads.UploadsService
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.session.room.state.SendStateTask
-import im.vector.matrix.android.internal.session.room.summary.RoomSummaryDataSource
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.call.RoomCallService
+import org.matrix.android.sdk.api.session.room.members.MembershipService
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.relation.RelationService
+import org.matrix.android.sdk.api.session.room.notification.RoomPushRuleService
+import org.matrix.android.sdk.api.session.room.read.ReadService
+import org.matrix.android.sdk.api.session.room.reporting.ReportingService
+import org.matrix.android.sdk.api.session.room.send.DraftService
+import org.matrix.android.sdk.api.session.room.send.SendService
+import org.matrix.android.sdk.api.session.room.state.StateService
+import org.matrix.android.sdk.api.session.room.tags.TagsService
+import org.matrix.android.sdk.api.session.room.timeline.TimelineService
+import org.matrix.android.sdk.api.session.room.typing.TypingService
+import org.matrix.android.sdk.api.session.room.uploads.UploadsService
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.session.room.state.SendStateTask
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import java.security.InvalidParameterException
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomDirectoryService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
similarity index 68%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomDirectoryService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
index 288ee603b6..12d9d5bcdc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomDirectoryService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room
+package org.matrix.android.sdk.internal.session.room
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.room.RoomDirectoryService
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsParams
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsResponse
-import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.session.room.directory.GetPublicRoomTask
-import im.vector.matrix.android.internal.session.room.directory.GetThirdPartyProtocolsTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.RoomDirectoryService
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
+import org.matrix.android.sdk.api.session.room.model.thirdparty.ThirdPartyProtocol
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.session.room.directory.GetPublicRoomTask
+import org.matrix.android.sdk.internal.session.room.directory.GetThirdPartyProtocolsTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
 internal class DefaultRoomDirectoryService @Inject constructor(private val getPublicRoomTask: GetPublicRoomTask,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index b8b4c968b1..17c724368d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,27 +15,27 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room
+package org.matrix.android.sdk.internal.session.room
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.RoomService
-import im.vector.matrix.android.api.session.room.RoomSummaryQueryParams
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.session.room.alias.GetRoomIdByAliasTask
-import im.vector.matrix.android.internal.session.room.create.CreateRoomTask
-import im.vector.matrix.android.internal.session.room.membership.RoomChangeMembershipStateDataSource
-import im.vector.matrix.android.internal.session.room.membership.joining.JoinRoomTask
-import im.vector.matrix.android.internal.session.room.read.MarkAllRoomsReadTask
-import im.vector.matrix.android.internal.session.room.summary.RoomSummaryDataSource
-import im.vector.matrix.android.internal.session.user.accountdata.UpdateBreadcrumbsTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.session.room.alias.GetRoomIdByAliasTask
+import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
+import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
+import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
+import org.matrix.android.sdk.internal.session.user.accountdata.UpdateBreadcrumbsTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
 internal class DefaultRoomService @Inject constructor(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationProcessor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 5214317f3b..4893947fc3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,40 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room
+package org.matrix.android.sdk.internal.session.room
 
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.events.model.AggregatedAnnotation
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.PollSummaryContent
-import im.vector.matrix.android.api.session.room.model.ReferencesAggregatedContent
-import im.vector.matrix.android.api.session.room.model.VoteInfo
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessagePollResponseContent
-import im.vector.matrix.android.api.session.room.model.message.MessageRelationContent
-import im.vector.matrix.android.api.session.room.model.relation.ReactionContent
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.database.mapper.EventMapper
-import im.vector.matrix.android.internal.database.model.EditAggregatedSummaryEntity
-import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.EventInsertType
-import im.vector.matrix.android.internal.database.model.PollResponseAggregatedSummaryEntity
-import im.vector.matrix.android.internal.database.model.ReactionAggregatedSummaryEntity
-import im.vector.matrix.android.internal.database.model.ReactionAggregatedSummaryEntityFields
-import im.vector.matrix.android.internal.database.model.ReferencesAggregatedSummaryEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.query.create
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.EventInsertLiveProcessor
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.AggregatedAnnotation
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.PollSummaryContent
+import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent
+import org.matrix.android.sdk.api.session.room.model.VoteInfo
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessagePollResponseContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
+import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.database.mapper.EventMapper
+import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.model.PollResponseAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.ReactionAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.ReactionAggregatedSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.ReferencesAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.query.create
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import io.realm.Realm
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index 14090ab62f..25dcc69fa8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,31 +15,31 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room
+package org.matrix.android.sdk.internal.session.room
 
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsParams
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsResponse
-import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.network.NetworkConstants
-import im.vector.matrix.android.internal.session.room.alias.AddRoomAliasBody
-import im.vector.matrix.android.internal.session.room.alias.RoomAliasDescription
-import im.vector.matrix.android.internal.session.room.create.CreateRoomBody
-import im.vector.matrix.android.internal.session.room.create.CreateRoomResponse
-import im.vector.matrix.android.internal.session.room.create.JoinRoomResponse
-import im.vector.matrix.android.internal.session.room.membership.RoomMembersResponse
-import im.vector.matrix.android.internal.session.room.membership.admin.UserIdAndReason
-import im.vector.matrix.android.internal.session.room.membership.joining.InviteBody
-import im.vector.matrix.android.internal.session.room.membership.threepid.ThreePidInviteBody
-import im.vector.matrix.android.internal.session.room.relation.RelationsResponse
-import im.vector.matrix.android.internal.session.room.reporting.ReportContentBody
-import im.vector.matrix.android.internal.session.room.send.SendResponse
-import im.vector.matrix.android.internal.session.room.tags.TagBody
-import im.vector.matrix.android.internal.session.room.timeline.EventContextResponse
-import im.vector.matrix.android.internal.session.room.timeline.PaginationResponse
-import im.vector.matrix.android.internal.session.room.typing.TypingBody
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
+import org.matrix.android.sdk.api.session.room.model.thirdparty.ThirdPartyProtocol
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.session.room.alias.AddRoomAliasBody
+import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
+import org.matrix.android.sdk.internal.session.room.create.CreateRoomBody
+import org.matrix.android.sdk.internal.session.room.create.CreateRoomResponse
+import org.matrix.android.sdk.internal.session.room.create.JoinRoomResponse
+import org.matrix.android.sdk.internal.session.room.membership.RoomMembersResponse
+import org.matrix.android.sdk.internal.session.room.membership.admin.UserIdAndReason
+import org.matrix.android.sdk.internal.session.room.membership.joining.InviteBody
+import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
+import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
+import org.matrix.android.sdk.internal.session.room.reporting.ReportContentBody
+import org.matrix.android.sdk.internal.session.room.send.SendResponse
+import org.matrix.android.sdk.internal.session.room.tags.TagBody
+import org.matrix.android.sdk.internal.session.room.timeline.EventContextResponse
+import org.matrix.android.sdk.internal.session.room.timeline.PaginationResponse
+import org.matrix.android.sdk.internal.session.room.typing.TypingBody
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -165,7 +166,8 @@ internal interface RoomAPI {
      * @param eventId the event Id
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/event/{eventId}")
-    fun getEvent(@Path("roomId") roomId: String, @Path("eventId") eventId: String): Call<Event>
+    fun getEvent(@Path("roomId") roomId: String,
+                 @Path("eventId") eventId: String): Call<Event>
 
     /**
      * Send read markers.
@@ -174,7 +176,8 @@ internal interface RoomAPI {
      * @param markers the read markers
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/read_markers")
-    fun sendReadMarker(@Path("roomId") roomId: String, @Body markers: Map<String, String>): Call<Unit>
+    fun sendReadMarker(@Path("roomId") roomId: String,
+                       @Body markers: Map<String, String>): Call<Unit>
 
     /**
      * Invite a user to the given room.
@@ -184,7 +187,8 @@ internal interface RoomAPI {
      * @param body   a object that just contains a user id
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/invite")
-    fun invite(@Path("roomId") roomId: String, @Body body: InviteBody): Call<Unit>
+    fun invite(@Path("roomId") roomId: String,
+               @Body body: InviteBody): Call<Unit>
 
     /**
      * Invite a user to a room, using a ThreePid
@@ -192,7 +196,8 @@ internal interface RoomAPI {
      * @param roomId Required. The room identifier (not alias) to which to invite the user.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/invite")
-    fun invite3pid(@Path("roomId") roomId: String, @Body body: ThreePidInviteBody): Call<Unit>
+    fun invite3pid(@Path("roomId") roomId: String,
+                   @Body body: ThreePidInviteBody): Call<Unit>
 
     /**
      * Send a generic state events
@@ -278,7 +283,8 @@ internal interface RoomAPI {
      * @param userIdAndReason the banned user object (userId and reason for ban)
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/ban")
-    fun ban(@Path("roomId") roomId: String, @Body userIdAndReason: UserIdAndReason): Call<Unit>
+    fun ban(@Path("roomId") roomId: String,
+            @Body userIdAndReason: UserIdAndReason): Call<Unit>
 
     /**
      * unban a user from the given room.
@@ -287,7 +293,8 @@ internal interface RoomAPI {
      * @param userIdAndReason the unbanned user object (userId and reason for unban)
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/unban")
-    fun unban(@Path("roomId") roomId: String, @Body userIdAndReason: UserIdAndReason): Call<Unit>
+    fun unban(@Path("roomId") roomId: String,
+              @Body userIdAndReason: UserIdAndReason): Call<Unit>
 
     /**
      * Kick a user from the given room.
@@ -296,7 +303,8 @@ internal interface RoomAPI {
      * @param userIdAndReason the kicked user object (userId and reason for kicking)
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/kick")
-    fun kick(@Path("roomId") roomId: String, @Body userIdAndReason: UserIdAndReason): Call<Unit>
+    fun kick(@Path("roomId") roomId: String,
+             @Body userIdAndReason: UserIdAndReason): Call<Unit>
 
     /**
      * Strips all information out of an event which isn't critical to the integrity of the server-side representation of the room.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
similarity index 72%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
index 1c395ec647..6851780a62 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room
+package org.matrix.android.sdk.internal.session.room
 
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.RoomAvatarContent
-import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntityFields
-import im.vector.matrix.android.internal.database.query.getOrNull
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomAvatarContent
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.getOrNull
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
similarity index 71%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
index d93ba76c3f..ac8bdb3992 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,27 +15,27 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room
+package org.matrix.android.sdk.internal.session.room
 
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.room.call.DefaultRoomCallService
-import im.vector.matrix.android.internal.session.room.draft.DefaultDraftService
-import im.vector.matrix.android.internal.session.room.membership.DefaultMembershipService
-import im.vector.matrix.android.internal.session.room.notification.DefaultRoomPushRuleService
-import im.vector.matrix.android.internal.session.room.read.DefaultReadService
-import im.vector.matrix.android.internal.session.room.relation.DefaultRelationService
-import im.vector.matrix.android.internal.session.room.reporting.DefaultReportingService
-import im.vector.matrix.android.internal.session.room.send.DefaultSendService
-import im.vector.matrix.android.internal.session.room.state.DefaultStateService
-import im.vector.matrix.android.internal.session.room.state.SendStateTask
-import im.vector.matrix.android.internal.session.room.summary.RoomSummaryDataSource
-import im.vector.matrix.android.internal.session.room.tags.DefaultTagsService
-import im.vector.matrix.android.internal.session.room.timeline.DefaultTimelineService
-import im.vector.matrix.android.internal.session.room.typing.DefaultTypingService
-import im.vector.matrix.android.internal.session.room.uploads.DefaultUploadsService
-import im.vector.matrix.android.internal.task.TaskExecutor
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.room.call.DefaultRoomCallService
+import org.matrix.android.sdk.internal.session.room.draft.DefaultDraftService
+import org.matrix.android.sdk.internal.session.room.membership.DefaultMembershipService
+import org.matrix.android.sdk.internal.session.room.notification.DefaultRoomPushRuleService
+import org.matrix.android.sdk.internal.session.room.read.DefaultReadService
+import org.matrix.android.sdk.internal.session.room.relation.DefaultRelationService
+import org.matrix.android.sdk.internal.session.room.reporting.DefaultReportingService
+import org.matrix.android.sdk.internal.session.room.send.DefaultSendService
+import org.matrix.android.sdk.internal.session.room.state.DefaultStateService
+import org.matrix.android.sdk.internal.session.room.state.SendStateTask
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
+import org.matrix.android.sdk.internal.session.room.tags.DefaultTagsService
+import org.matrix.android.sdk.internal.session.room.timeline.DefaultTimelineService
+import org.matrix.android.sdk.internal.session.room.typing.DefaultTypingService
+import org.matrix.android.sdk.internal.session.room.uploads.DefaultUploadsService
+import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
 
 internal interface RoomFactory {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomGetter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomGetter.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomGetter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomGetter.kt
index 9f7e2a0231..38dcad2311 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomGetter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomGetter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room
+package org.matrix.android.sdk.internal.session.room
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntityFields
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
similarity index 50%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index 3eb5427b70..7f21ee84f6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,66 +15,66 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room
+package org.matrix.android.sdk.internal.session.room
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.matrix.android.api.session.room.RoomDirectoryService
-import im.vector.matrix.android.api.session.room.RoomService
-import im.vector.matrix.android.internal.session.DefaultFileService
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.room.alias.AddRoomAliasTask
-import im.vector.matrix.android.internal.session.room.alias.DefaultAddRoomAliasTask
-import im.vector.matrix.android.internal.session.room.alias.DefaultGetRoomIdByAliasTask
-import im.vector.matrix.android.internal.session.room.alias.GetRoomIdByAliasTask
-import im.vector.matrix.android.internal.session.room.create.CreateRoomTask
-import im.vector.matrix.android.internal.session.room.create.DefaultCreateRoomTask
-import im.vector.matrix.android.internal.session.room.directory.DefaultGetPublicRoomTask
-import im.vector.matrix.android.internal.session.room.directory.DefaultGetThirdPartyProtocolsTask
-import im.vector.matrix.android.internal.session.room.directory.GetPublicRoomTask
-import im.vector.matrix.android.internal.session.room.directory.GetThirdPartyProtocolsTask
-import im.vector.matrix.android.internal.session.room.membership.DefaultLoadRoomMembersTask
-import im.vector.matrix.android.internal.session.room.membership.LoadRoomMembersTask
-import im.vector.matrix.android.internal.session.room.membership.admin.DefaultMembershipAdminTask
-import im.vector.matrix.android.internal.session.room.membership.admin.MembershipAdminTask
-import im.vector.matrix.android.internal.session.room.membership.joining.DefaultInviteTask
-import im.vector.matrix.android.internal.session.room.membership.joining.DefaultJoinRoomTask
-import im.vector.matrix.android.internal.session.room.membership.joining.InviteTask
-import im.vector.matrix.android.internal.session.room.membership.joining.JoinRoomTask
-import im.vector.matrix.android.internal.session.room.membership.leaving.DefaultLeaveRoomTask
-import im.vector.matrix.android.internal.session.room.membership.leaving.LeaveRoomTask
-import im.vector.matrix.android.internal.session.room.membership.threepid.DefaultInviteThreePidTask
-import im.vector.matrix.android.internal.session.room.membership.threepid.InviteThreePidTask
-import im.vector.matrix.android.internal.session.room.read.DefaultMarkAllRoomsReadTask
-import im.vector.matrix.android.internal.session.room.read.DefaultSetReadMarkersTask
-import im.vector.matrix.android.internal.session.room.read.MarkAllRoomsReadTask
-import im.vector.matrix.android.internal.session.room.read.SetReadMarkersTask
-import im.vector.matrix.android.internal.session.room.relation.DefaultFetchEditHistoryTask
-import im.vector.matrix.android.internal.session.room.relation.DefaultFindReactionEventForUndoTask
-import im.vector.matrix.android.internal.session.room.relation.DefaultUpdateQuickReactionTask
-import im.vector.matrix.android.internal.session.room.relation.FetchEditHistoryTask
-import im.vector.matrix.android.internal.session.room.relation.FindReactionEventForUndoTask
-import im.vector.matrix.android.internal.session.room.relation.UpdateQuickReactionTask
-import im.vector.matrix.android.internal.session.room.reporting.DefaultReportContentTask
-import im.vector.matrix.android.internal.session.room.reporting.ReportContentTask
-import im.vector.matrix.android.internal.session.room.state.DefaultSendStateTask
-import im.vector.matrix.android.internal.session.room.state.SendStateTask
-import im.vector.matrix.android.internal.session.room.tags.AddTagToRoomTask
-import im.vector.matrix.android.internal.session.room.tags.DefaultAddTagToRoomTask
-import im.vector.matrix.android.internal.session.room.tags.DefaultDeleteTagFromRoomTask
-import im.vector.matrix.android.internal.session.room.tags.DeleteTagFromRoomTask
-import im.vector.matrix.android.internal.session.room.timeline.DefaultFetchTokenAndPaginateTask
-import im.vector.matrix.android.internal.session.room.timeline.DefaultGetContextOfEventTask
-import im.vector.matrix.android.internal.session.room.timeline.DefaultPaginationTask
-import im.vector.matrix.android.internal.session.room.timeline.FetchTokenAndPaginateTask
-import im.vector.matrix.android.internal.session.room.timeline.GetContextOfEventTask
-import im.vector.matrix.android.internal.session.room.timeline.PaginationTask
-import im.vector.matrix.android.internal.session.room.typing.DefaultSendTypingTask
-import im.vector.matrix.android.internal.session.room.typing.SendTypingTask
-import im.vector.matrix.android.internal.session.room.uploads.DefaultGetUploadsTask
-import im.vector.matrix.android.internal.session.room.uploads.GetUploadsTask
+import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.api.session.room.RoomDirectoryService
+import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.internal.session.DefaultFileService
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.room.alias.AddRoomAliasTask
+import org.matrix.android.sdk.internal.session.room.alias.DefaultAddRoomAliasTask
+import org.matrix.android.sdk.internal.session.room.alias.DefaultGetRoomIdByAliasTask
+import org.matrix.android.sdk.internal.session.room.alias.GetRoomIdByAliasTask
+import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
+import org.matrix.android.sdk.internal.session.room.create.DefaultCreateRoomTask
+import org.matrix.android.sdk.internal.session.room.directory.DefaultGetPublicRoomTask
+import org.matrix.android.sdk.internal.session.room.directory.DefaultGetThirdPartyProtocolsTask
+import org.matrix.android.sdk.internal.session.room.directory.GetPublicRoomTask
+import org.matrix.android.sdk.internal.session.room.directory.GetThirdPartyProtocolsTask
+import org.matrix.android.sdk.internal.session.room.membership.DefaultLoadRoomMembersTask
+import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
+import org.matrix.android.sdk.internal.session.room.membership.admin.DefaultMembershipAdminTask
+import org.matrix.android.sdk.internal.session.room.membership.admin.MembershipAdminTask
+import org.matrix.android.sdk.internal.session.room.membership.joining.DefaultInviteTask
+import org.matrix.android.sdk.internal.session.room.membership.joining.DefaultJoinRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.joining.InviteTask
+import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.leaving.DefaultLeaveRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.leaving.LeaveRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.threepid.DefaultInviteThreePidTask
+import org.matrix.android.sdk.internal.session.room.membership.threepid.InviteThreePidTask
+import org.matrix.android.sdk.internal.session.room.read.DefaultMarkAllRoomsReadTask
+import org.matrix.android.sdk.internal.session.room.read.DefaultSetReadMarkersTask
+import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
+import org.matrix.android.sdk.internal.session.room.read.SetReadMarkersTask
+import org.matrix.android.sdk.internal.session.room.relation.DefaultFetchEditHistoryTask
+import org.matrix.android.sdk.internal.session.room.relation.DefaultFindReactionEventForUndoTask
+import org.matrix.android.sdk.internal.session.room.relation.DefaultUpdateQuickReactionTask
+import org.matrix.android.sdk.internal.session.room.relation.FetchEditHistoryTask
+import org.matrix.android.sdk.internal.session.room.relation.FindReactionEventForUndoTask
+import org.matrix.android.sdk.internal.session.room.relation.UpdateQuickReactionTask
+import org.matrix.android.sdk.internal.session.room.reporting.DefaultReportContentTask
+import org.matrix.android.sdk.internal.session.room.reporting.ReportContentTask
+import org.matrix.android.sdk.internal.session.room.state.DefaultSendStateTask
+import org.matrix.android.sdk.internal.session.room.state.SendStateTask
+import org.matrix.android.sdk.internal.session.room.tags.AddTagToRoomTask
+import org.matrix.android.sdk.internal.session.room.tags.DefaultAddTagToRoomTask
+import org.matrix.android.sdk.internal.session.room.tags.DefaultDeleteTagFromRoomTask
+import org.matrix.android.sdk.internal.session.room.tags.DeleteTagFromRoomTask
+import org.matrix.android.sdk.internal.session.room.timeline.DefaultFetchTokenAndPaginateTask
+import org.matrix.android.sdk.internal.session.room.timeline.DefaultGetContextOfEventTask
+import org.matrix.android.sdk.internal.session.room.timeline.DefaultPaginationTask
+import org.matrix.android.sdk.internal.session.room.timeline.FetchTokenAndPaginateTask
+import org.matrix.android.sdk.internal.session.room.timeline.GetContextOfEventTask
+import org.matrix.android.sdk.internal.session.room.timeline.PaginationTask
+import org.matrix.android.sdk.internal.session.room.typing.DefaultSendTypingTask
+import org.matrix.android.sdk.internal.session.room.typing.SendTypingTask
+import org.matrix.android.sdk.internal.session.room.uploads.DefaultGetUploadsTask
+import org.matrix.android.sdk.internal.session.room.uploads.GetUploadsTask
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
 import org.commonmark.renderer.text.TextContentRenderer
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/AddRoomAliasBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasBody.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/AddRoomAliasBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasBody.kt
index 0150c277ea..b5938d592a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/AddRoomAliasBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.alias
+package org.matrix.android.sdk.internal.session.room.alias
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/AddRoomAliasTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/AddRoomAliasTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt
index baad3a3cde..510bd25d9c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/AddRoomAliasTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.alias
+package org.matrix.android.sdk.internal.session.room.alias
 
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/GetRoomIdByAliasTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/GetRoomIdByAliasTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
index 4b0c28e1ca..e1d119c432 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/GetRoomIdByAliasTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.alias
+package org.matrix.android.sdk.internal.session.room.alias
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.query.findByAlias
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.query.findByAlias
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import io.realm.Realm
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/RoomAliasDescription.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/RoomAliasDescription.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt
index c7ddae0e10..ac0b59c916 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/alias/RoomAliasDescription.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.alias
+package org.matrix.android.sdk.internal.session.room.alias
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/call/DefaultRoomCallService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/call/DefaultRoomCallService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt
index c23d8de37f..3d764e001c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/call/DefaultRoomCallService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.call
+package org.matrix.android.sdk.internal.session.room.call
 
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.room.call.RoomCallService
-import im.vector.matrix.android.internal.session.room.RoomGetter
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.room.call.RoomCallService
+import org.matrix.android.sdk.internal.session.room.RoomGetter
 
 internal class DefaultRoomCallService @AssistedInject constructor(
         @Assisted private val roomId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
index 7a27da3607..e9ae5e7a6b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.create
+package org.matrix.android.sdk.internal.session.room.create
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomPreset
-import im.vector.matrix.android.internal.session.room.membership.threepid.ThreePidInviteBody
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
+import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
 
 /**
  * Parameter to create a room
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBodyBuilder.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
index 4bf54251e5..6e450e5428 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomBodyBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +15,23 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.create
+package org.matrix.android.sdk.internal.session.room.create
 
-import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.api.session.identity.toMedium
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
-import im.vector.matrix.android.internal.crypto.DeviceListManager
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.di.AuthenticatedIdentity
-import im.vector.matrix.android.internal.network.token.AccessTokenProvider
-import im.vector.matrix.android.internal.session.identity.EnsureIdentityTokenTask
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.identity.data.getIdentityServerUrlWithoutProtocol
-import im.vector.matrix.android.internal.session.room.membership.threepid.ThreePidInviteBody
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.api.session.identity.toMedium
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.di.AuthenticatedIdentity
+import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
+import org.matrix.android.sdk.internal.session.identity.EnsureIdentityTokenTask
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.identity.data.getIdentityServerUrlWithoutProtocol
+import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
 import java.security.InvalidParameterException
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomResponse.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomResponse.kt
index 62208941cc..cfc63bcb7e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.create
+package org.matrix.android.sdk.internal.session.room.create
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
similarity index 58%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
index 791091c549..6738c7d881 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,28 +15,30 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.create
+package org.matrix.android.sdk.internal.session.room.create
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.room.failure.CreateRoomFailure
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomPreset
-import im.vector.matrix.android.internal.database.awaitNotEmptyResult
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.RoomEntityFields
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.session.room.read.SetReadMarkersTask
-import im.vector.matrix.android.internal.session.user.accountdata.DirectChatsHelper
-import im.vector.matrix.android.internal.session.user.accountdata.UpdateUserAccountDataTask
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.TimeoutCancellationException
 import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
+import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.RoomEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.read.SetReadMarkersTask
+import org.matrix.android.sdk.internal.session.user.accountdata.DirectChatsHelper
+import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -54,10 +57,26 @@ internal class DefaultCreateRoomTask @Inject constructor(
 ) : CreateRoomTask {
 
     override suspend fun execute(params: CreateRoomParams): String {
+        val otherUserId = if (params.isDirect()) {
+            params.getFirstInvitedUserId()
+                    ?: throw IllegalStateException("You can't create a direct room without an invitedUser")
+        } else null
+
         val createRoomBody = createRoomBodyBuilder.build(params)
 
-        val createRoomResponse = executeRequest<CreateRoomResponse>(eventBus) {
-            apiCall = roomAPI.createRoom(createRoomBody)
+        val createRoomResponse = try {
+            executeRequest<CreateRoomResponse>(eventBus) {
+                apiCall = roomAPI.createRoom(createRoomBody)
+            }
+        } catch (throwable: Throwable) {
+            if (throwable is Failure.ServerError
+                    && throwable.httpCode == 403
+                    && throwable.error.code == MatrixError.M_FORBIDDEN
+                    && throwable.error.message.startsWith("Federation denied with")) {
+                throw CreateRoomFailure.CreatedWithFederationFailure(throwable.error)
+            } else {
+                throw throwable
+            }
         }
         val roomId = createRoomResponse.roomId
         // Wait for room to come back from the sync (but it can maybe be in the DB if the sync response is received before)
@@ -69,17 +88,14 @@ internal class DefaultCreateRoomTask @Inject constructor(
         } catch (exception: TimeoutCancellationException) {
             throw CreateRoomFailure.CreatedWithTimeout
         }
-        if (params.isDirect()) {
-            handleDirectChatCreation(params, roomId)
+        if (otherUserId != null) {
+            handleDirectChatCreation(roomId, otherUserId)
         }
         setReadMarkers(roomId)
         return roomId
     }
 
-    private suspend fun handleDirectChatCreation(params: CreateRoomParams, roomId: String) {
-        val otherUserId = params.getFirstInvitedUserId()
-                ?: throw IllegalStateException("You can't create a direct room without an invitedUser")
-
+    private suspend fun handleDirectChatCreation(roomId: String, otherUserId: String) {
         monarchy.awaitTransaction { realm ->
             RoomSummaryEntity.where(realm, roomId).findFirst()?.apply {
                 this.directUserId = otherUserId
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/RoomCreateEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt
similarity index 66%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/RoomCreateEventProcessor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt
index fe2bf846ff..e6de3fbd71 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/RoomCreateEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.create
+package org.matrix.android.sdk.internal.session.room.create
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.VersioningState
-import im.vector.matrix.android.api.session.room.model.create.RoomCreateContent
-import im.vector.matrix.android.internal.database.model.EventInsertType
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.session.EventInsertLiveProcessor
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.VersioningState
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/directory/GetPublicRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/directory/GetPublicRoomTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt
index 2b7d2e7dd9..4d760d1b09 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/directory/GetPublicRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.directory
+package org.matrix.android.sdk.internal.session.room.directory
 
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsParams
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsResponse
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/directory/GetThirdPartyProtocolsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetThirdPartyProtocolsTask.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/directory/GetThirdPartyProtocolsTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetThirdPartyProtocolsTask.kt
index c32e082bcd..39f1c60829 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/directory/GetThirdPartyProtocolsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetThirdPartyProtocolsTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.directory
+package org.matrix.android.sdk.internal.session.room.directory
 
-import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.room.model.thirdparty.ThirdPartyProtocol
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/draft/DefaultDraftService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/draft/DefaultDraftService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
index e756d9e974..dafa7df0eb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/draft/DefaultDraftService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.draft
+package org.matrix.android.sdk.internal.session.room.draft
 
 import androidx.lifecycle.LiveData
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.room.send.DraftService
-import im.vector.matrix.android.api.session.room.send.UserDraft
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.launchToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.send.DraftService
+import org.matrix.android.sdk.api.session.room.send.UserDraft
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.launchToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 
 internal class DefaultDraftService @AssistedInject constructor(@Assisted private val roomId: String,
                                                                private val draftRepository: DraftRepository,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/draft/DraftRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/draft/DraftRepository.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
index a61f407453..bc50b2d990 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/draft/DraftRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.draft
+package org.matrix.android.sdk.internal.session.room.draft
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.api.session.room.send.UserDraft
-import im.vector.matrix.android.internal.database.mapper.DraftMapper
-import im.vector.matrix.android.internal.database.model.DraftEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.model.UserDraftsEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.session.room.send.UserDraft
+import org.matrix.android.sdk.internal.database.mapper.DraftMapper
+import org.matrix.android.sdk.internal.database.model.DraftEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.UserDraftsEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/DefaultMembershipService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/DefaultMembershipService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
index f413f5c9c0..91039f4c0f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/DefaultMembershipService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,33 +15,33 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership
+package org.matrix.android.sdk.internal.session.room.membership
 
 import androidx.lifecycle.LiveData
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.room.members.MembershipService
-import im.vector.matrix.android.api.session.room.members.RoomMemberQueryParams
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntityFields
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.query.process
-import im.vector.matrix.android.internal.session.room.membership.admin.MembershipAdminTask
-import im.vector.matrix.android.internal.session.room.membership.joining.InviteTask
-import im.vector.matrix.android.internal.session.room.membership.joining.JoinRoomTask
-import im.vector.matrix.android.internal.session.room.membership.leaving.LeaveRoomTask
-import im.vector.matrix.android.internal.session.room.membership.threepid.InviteThreePidTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.util.fetchCopied
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.room.members.MembershipService
+import org.matrix.android.sdk.api.session.room.members.RoomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.query.process
+import org.matrix.android.sdk.internal.session.room.membership.admin.MembershipAdminTask
+import org.matrix.android.sdk.internal.session.room.membership.joining.InviteTask
+import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.leaving.LeaveRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.threepid.InviteThreePidTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.util.fetchCopied
 import io.realm.Realm
 import io.realm.RealmQuery
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/LoadRoomMembersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/LoadRoomMembersTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
index d860ccc7e4..e51a4605c8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/LoadRoomMembersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,25 +15,25 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership
+package org.matrix.android.sdk.internal.session.room.membership
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.database.mapper.toEntity
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity
-import im.vector.matrix.android.internal.database.model.EventInsertType
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.query.copyToRealmOrIgnore
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.session.room.summary.RoomSummaryUpdater
-import im.vector.matrix.android.internal.session.sync.SyncTokenStore
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.database.mapper.toEntity
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.query.copyToRealmOrIgnore
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryUpdater
+import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import org.greenrobot.eventbus.EventBus
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomChangeMembershipStateDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomChangeMembershipStateDataSource.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomChangeMembershipStateDataSource.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomChangeMembershipStateDataSource.kt
index 5cf75c3bbd..00d54a62e7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomChangeMembershipStateDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomChangeMembershipStateDataSource.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership
+package org.matrix.android.sdk.internal.session.room.membership
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomDisplayNameResolver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index 55474df2bb..d11226bdb1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,25 +15,25 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership
+package org.matrix.android.sdk.internal.session.room.membership
 
 import android.content.Context
-import im.vector.matrix.android.R
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomAliasesContent
-import im.vector.matrix.android.api.session.room.model.RoomCanonicalAliasContent
-import im.vector.matrix.android.api.session.room.model.RoomNameContent
-import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntityFields
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.query.getOrNull
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.UserId
+import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomAliasesContent
+import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
+import org.matrix.android.sdk.api.session.room.model.RoomNameContent
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.query.getOrNull
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.UserId
 import io.realm.Realm
 import javax.inject.Inject
 
@@ -122,7 +123,7 @@ internal class RoomDisplayNameResolver @Inject constructor(private val context:
         return name ?: roomId
     }
 
-    /** See [im.vector.matrix.android.api.session.room.sender.SenderInfo.disambiguatedDisplayName] */
+    /** See [org.matrix.android.sdk.api.session.room.sender.SenderInfo.disambiguatedDisplayName] */
     private fun resolveRoomMemberName(roomMemberSummary: RoomMemberSummaryEntity?,
                                       roomMemberHelper: RoomMemberHelper): String? {
         if (roomMemberSummary == null) return null
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMemberEntityFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEntityFactory.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMemberEntityFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEntityFactory.kt
index 291d2af3a6..f526550918 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMemberEntityFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEntityFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership
+package org.matrix.android.sdk.internal.session.room.membership
 
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntity
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
 
 internal object RoomMemberEntityFactory {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMemberEventHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMemberEventHandler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
index b340766c1b..2821eb2fb9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMemberEventHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership
+package org.matrix.android.sdk.internal.session.room.membership
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.internal.session.user.UserEntityFactory
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.internal.session.user.UserEntityFactory
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMemberHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMemberHelper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
index 05f6fdff23..4ef2d973c0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMemberHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership
+package org.matrix.android.sdk.internal.session.room.membership
 
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntityFields
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.query.getOrNull
-import im.vector.matrix.android.internal.database.query.where
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.query.getOrNull
+import org.matrix.android.sdk.internal.database.query.where
 import io.realm.Realm
 import io.realm.RealmQuery
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMembersResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMembersResponse.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMembersResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMembersResponse.kt
index 7f77fbf79c..d8ac0983eb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMembersResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMembersResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership
+package org.matrix.android.sdk.internal.session.room.membership
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 @JsonClass(generateAdapter = true)
 internal data class RoomMembersResponse(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/admin/MembershipAdminTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/admin/MembershipAdminTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt
index 676a7de787..948bab39fb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/admin/MembershipAdminTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership.admin
+package org.matrix.android.sdk.internal.session.room.membership.admin
 
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
 internal interface MembershipAdminTask : Task<MembershipAdminTask.Params, Unit> {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/admin/UserIdAndReason.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/UserIdAndReason.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/admin/UserIdAndReason.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/UserIdAndReason.kt
index 931602a79e..4589b5e4bc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/admin/UserIdAndReason.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/UserIdAndReason.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.membership.admin
+package org.matrix.android.sdk.internal.session.room.membership.admin
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/joining/InviteBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteBody.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/joining/InviteBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteBody.kt
index 2d72197198..6fad0b10b7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/joining/InviteBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership.joining
+package org.matrix.android.sdk.internal.session.room.membership.joining
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/joining/InviteTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/joining/InviteTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
index 5a8b302f1b..4b9935d2fa 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/joining/InviteTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership.joining
+package org.matrix.android.sdk.internal.session.room.membership.joining
 
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/joining/JoinRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/joining/JoinRoomTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
index 8fb9a1f065..f3e2efcde3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/joining/JoinRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership.joining
+package org.matrix.android.sdk.internal.session.room.membership.joining
 
-import im.vector.matrix.android.api.session.room.failure.JoinRoomFailure
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.internal.database.awaitNotEmptyResult
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.RoomEntityFields
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.session.room.create.JoinRoomResponse
-import im.vector.matrix.android.internal.session.room.membership.RoomChangeMembershipStateDataSource
-import im.vector.matrix.android.internal.session.room.read.SetReadMarkersTask
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.room.failure.JoinRoomFailure
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.RoomEntityFields
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.create.JoinRoomResponse
+import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
+import org.matrix.android.sdk.internal.session.room.read.SetReadMarkersTask
+import org.matrix.android.sdk.internal.task.Task
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.TimeoutCancellationException
 import org.greenrobot.eventbus.EventBus
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/leaving/LeaveRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/leaving/LeaveRoomTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt
index 94645f3d98..2a3e6c0aaa 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/leaving/LeaveRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +15,19 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership.leaving
+package org.matrix.android.sdk.internal.session.room.membership.leaving
 
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.create.RoomCreateContent
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.session.room.membership.RoomChangeMembershipStateDataSource
-import im.vector.matrix.android.internal.session.room.state.StateEventDataSource
-import im.vector.matrix.android.internal.session.room.summary.RoomSummaryDataSource
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
+import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/threepid/InviteThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
similarity index 69%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/threepid/InviteThreePidTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
index 25fe7b4888..b18e44360d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/threepid/InviteThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +15,19 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership.threepid
+package org.matrix.android.sdk.internal.session.room.membership.threepid
 
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.identity.toMedium
-import im.vector.matrix.android.internal.di.AuthenticatedIdentity
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.network.token.AccessTokenProvider
-import im.vector.matrix.android.internal.session.identity.EnsureIdentityTokenTask
-import im.vector.matrix.android.internal.session.identity.data.IdentityStore
-import im.vector.matrix.android.internal.session.identity.data.getIdentityServerUrlWithoutProtocol
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.toMedium
+import org.matrix.android.sdk.internal.di.AuthenticatedIdentity
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
+import org.matrix.android.sdk.internal.session.identity.EnsureIdentityTokenTask
+import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
+import org.matrix.android.sdk.internal.session.identity.data.getIdentityServerUrlWithoutProtocol
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/threepid/ThreePidInviteBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/threepid/ThreePidInviteBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
index 23dd6bad77..93b5c577fc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/threepid/ThreePidInviteBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.membership.threepid
+package org.matrix.android.sdk.internal.session.room.membership.threepid
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/DefaultRoomPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/DefaultRoomPushRuleService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
index bc677b3720..93e2881c13 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/DefaultRoomPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +15,23 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.notification
+package org.matrix.android.sdk.internal.session.room.notification
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.pushrules.RuleScope
-import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
-import im.vector.matrix.android.api.session.room.notification.RoomPushRuleService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.database.model.PushRuleEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.pushrules.RuleScope
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+import org.matrix.android.sdk.api.session.room.notification.RoomPushRuleService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.database.model.PushRuleEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 
 internal class DefaultRoomPushRuleService @AssistedInject constructor(@Assisted private val roomId: String,
                                                                       private val setRoomNotificationStateTask: SetRoomNotificationStateTask,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt
index b07f94f0f3..a7c7719342 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.notification
+package org.matrix.android.sdk.internal.session.room.notification
 
-import im.vector.matrix.android.api.pushrules.RuleKind
-import im.vector.matrix.android.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
 
 internal data class RoomPushRule(
         val kind: RuleKind,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRuleMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRuleMapper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
index f715cde4c1..1a19a40602 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRuleMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.notification
+package org.matrix.android.sdk.internal.session.room.notification
 
-import im.vector.matrix.android.api.pushrules.Action
-import im.vector.matrix.android.api.pushrules.Condition
-import im.vector.matrix.android.api.pushrules.RuleSetKey
-import im.vector.matrix.android.api.pushrules.getActions
-import im.vector.matrix.android.api.pushrules.rest.PushCondition
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.api.pushrules.toJson
-import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
-import im.vector.matrix.android.internal.database.mapper.PushRulesMapper
-import im.vector.matrix.android.internal.database.model.PushRuleEntity
+import org.matrix.android.sdk.api.pushrules.Action
+import org.matrix.android.sdk.api.pushrules.Condition
+import org.matrix.android.sdk.api.pushrules.RuleSetKey
+import org.matrix.android.sdk.api.pushrules.getActions
+import org.matrix.android.sdk.api.pushrules.rest.PushCondition
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.pushrules.toJson
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+import org.matrix.android.sdk.internal.database.mapper.PushRulesMapper
+import org.matrix.android.sdk.internal.database.model.PushRuleEntity
 
 internal fun PushRuleEntity.toRoomPushRule(): RoomPushRule? {
     val kind = parent?.firstOrNull()?.kind
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/SetRoomNotificationStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/SetRoomNotificationStateTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
index e59f3d3039..5a1b8d2a65 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/SetRoomNotificationStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.notification
+package org.matrix.android.sdk.internal.session.room.notification
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.pushrules.RuleScope
-import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
-import im.vector.matrix.android.internal.database.model.PushRuleEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.pushers.AddPushRuleTask
-import im.vector.matrix.android.internal.session.pushers.RemovePushRuleTask
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.pushrules.RuleScope
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+import org.matrix.android.sdk.internal.database.model.PushRuleEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.pushers.AddPushRuleTask
+import org.matrix.android.sdk.internal.session.pushers.RemovePushRuleTask
+import org.matrix.android.sdk.internal.task.Task
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/RedactionEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/RedactionEventProcessor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
index f0e080cb37..5ff7ae69bb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/RedactionEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,21 +15,21 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.prune
+package org.matrix.android.sdk.internal.session.room.prune
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.events.model.UnsignedData
-import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.database.mapper.EventMapper
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.EventInsertType
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.query.findWithSenderMembershipEvent
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.internal.session.EventInsertLiveProcessor
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.UnsignedData
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.database.mapper.EventMapper
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.query.findWithSenderMembershipEvent
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import io.realm.Realm
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/DefaultReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/DefaultReadService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
index 29331e5646..a5520972b0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/DefaultReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,28 +15,28 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.read
+package org.matrix.android.sdk.internal.session.room.read
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.room.model.ReadReceipt
-import im.vector.matrix.android.api.session.room.read.ReadService
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.database.mapper.ReadReceiptsSummaryMapper
-import im.vector.matrix.android.internal.database.model.ReadMarkerEntity
-import im.vector.matrix.android.internal.database.model.ReadReceiptEntity
-import im.vector.matrix.android.internal.database.model.ReadReceiptsSummaryEntity
-import im.vector.matrix.android.internal.database.query.isEventRead
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.model.ReadReceipt
+import org.matrix.android.sdk.api.session.room.read.ReadService
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.mapper.ReadReceiptsSummaryMapper
+import org.matrix.android.sdk.internal.database.model.ReadMarkerEntity
+import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
+import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
+import org.matrix.android.sdk.internal.database.query.isEventRead
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 
 internal class DefaultReadService @AssistedInject constructor(
         @Assisted private val roomId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/FullyReadContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/FullyReadContent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/FullyReadContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/FullyReadContent.kt
index c91b2af1ae..d2b216d625 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/FullyReadContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/FullyReadContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.read
+package org.matrix.android.sdk.internal.session.room.read
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/MarkAllRoomsReadTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/MarkAllRoomsReadTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt
index b7b63dcdf9..b06b83aac3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/MarkAllRoomsReadTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.read
+package org.matrix.android.sdk.internal.session.room.read
 
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
 internal interface MarkAllRoomsReadTask : Task<MarkAllRoomsReadTask.Params, Unit> {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/SetReadMarkersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/SetReadMarkersTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
index 9b27335287..f750735bbb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/read/SetReadMarkersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +15,24 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.read
+package org.matrix.android.sdk.internal.session.room.read
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.query.isEventRead
-import im.vector.matrix.android.internal.database.query.isReadMarkerMoreRecent
-import im.vector.matrix.android.internal.database.query.latestEvent
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.session.sync.ReadReceiptHandler
-import im.vector.matrix.android.internal.session.sync.RoomFullyReadHandler
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.query.isEventRead
+import org.matrix.android.sdk.internal.database.query.isReadMarkerMoreRecent
+import org.matrix.android.sdk.internal.database.query.latestEvent
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.sync.ReadReceiptHandler
+import org.matrix.android.sdk.internal.session.sync.RoomFullyReadHandler
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import io.realm.Realm
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/DefaultRelationService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index 2ef2badabd..2199193de0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.relation
+package org.matrix.android.sdk.internal.session.room.relation
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
@@ -21,33 +22,33 @@ import androidx.work.OneTimeWorkRequest
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.relation.RelationService
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.NoOpCancellable
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.database.mapper.TimelineEventMapper
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.session.room.send.EncryptEventWorker
-import im.vector.matrix.android.internal.session.room.send.LocalEchoEventFactory
-import im.vector.matrix.android.internal.session.room.send.RedactEventWorker
-import im.vector.matrix.android.internal.session.room.send.SendEventWorker
-import im.vector.matrix.android.internal.session.room.timeline.TimelineSendEventWorkCommon
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.util.fetchCopyMap
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.relation.RelationService
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.session.room.send.EncryptEventWorker
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
+import org.matrix.android.sdk.internal.session.room.send.RedactEventWorker
+import org.matrix.android.sdk.internal.session.room.send.SendEventWorker
+import org.matrix.android.sdk.internal.session.room.timeline.TimelineSendEventWorkCommon
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.util.fetchCopyMap
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import timber.log.Timber
 
 internal class DefaultRelationService @AssistedInject constructor(
@@ -155,11 +156,15 @@ internal class DefaultRelationService @AssistedInject constructor(
                            originalTimelineEvent: TimelineEvent,
                            newBodyText: String,
                            compatibilityBodyText: String): Cancelable {
-        val event = eventFactory
-                .createReplaceTextOfReply(roomId,
-                        replyToEdit,
-                        originalTimelineEvent,
-                        newBodyText, true, MessageType.MSGTYPE_TEXT, compatibilityBodyText)
+        val event = eventFactory.createReplaceTextOfReply(
+                roomId,
+                replyToEdit,
+                originalTimelineEvent,
+                newBodyText,
+                true,
+                MessageType.MSGTYPE_TEXT,
+                compatibilityBodyText
+        )
                 .also { saveLocalEcho(it) }
         return if (cryptoService.isRoomEncrypted(roomId)) {
             val encryptWork = createEncryptEventWork(event, listOf("m.relates_to"))
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/FetchEditHistoryTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/FetchEditHistoryTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
index a4ab06f767..28cdd9a72b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/FetchEditHistoryTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.relation
+package org.matrix.android.sdk.internal.session.room.relation
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/FindReactionEventForUndoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/FindReactionEventForUndoTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
index c755d9c6e8..86fe75d9ed 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/FindReactionEventForUndoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.relation
+package org.matrix.android.sdk.internal.session.room.relation
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.ReactionAggregatedSummaryEntityFields
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.ReactionAggregatedSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.task.Task
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/RelationsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/RelationsResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt
index 73e6592f7d..24fcf89bde 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/RelationsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.relation
+package org.matrix.android.sdk.internal.session.room.relation
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 @JsonClass(generateAdapter = true)
 internal data class RelationsResponse(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/SendRelationWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/SendRelationWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
index 9a8f1a7dc6..dc72c3b96b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/SendRelationWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.relation
+package org.matrix.android.sdk.internal.session.room.relation
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.relation.ReactionContent
-import im.vector.matrix.android.api.session.room.model.relation.ReactionInfo
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.session.room.send.SendResponse
-import im.vector.matrix.android.internal.worker.SessionWorkerParams
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
+import org.matrix.android.sdk.api.session.room.model.relation.ReactionInfo
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.send.SendResponse
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/UpdateQuickReactionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/UpdateQuickReactionTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
index d11ca97af0..d235cdba3b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/relation/UpdateQuickReactionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.relation
+package org.matrix.android.sdk.internal.session.room.relation
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.ReactionAggregatedSummaryEntityFields
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.ReactionAggregatedSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.task.Task
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/reporting/DefaultReportingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/reporting/DefaultReportingService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt
index 3b64cce439..1117ed1c29 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/reporting/DefaultReportingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.reporting
+package org.matrix.android.sdk.internal.session.room.reporting
 
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.room.reporting.ReportingService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.reporting.ReportingService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 
 internal class DefaultReportingService @AssistedInject constructor(@Assisted private val roomId: String,
                                                                    private val taskExecutor: TaskExecutor,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/reporting/ReportContentBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentBody.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/reporting/ReportContentBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentBody.kt
index 2cf33551ce..bd9f09f4fd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/reporting/ReportContentBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.reporting
+package org.matrix.android.sdk.internal.session.room.reporting
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/reporting/ReportContentTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/reporting/ReportContentTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt
index 74012348df..b13c21fa2a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/reporting/ReportContentTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.reporting
+package org.matrix.android.sdk.internal.session.room.reporting
 
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/DefaultSendService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index 73b35c268a..d6fa6775ee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import androidx.work.BackoffPolicy
 import androidx.work.ExistingWorkPolicy
@@ -22,27 +23,27 @@ import androidx.work.OneTimeWorkRequest
 import androidx.work.Operation
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.isImageMessage
-import im.vector.matrix.android.api.session.events.model.isTextMessage
-import im.vector.matrix.android.api.session.room.model.message.OptionItem
-import im.vector.matrix.android.api.session.room.send.SendService
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.CancelableBag
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.session.content.UploadContentWorker
-import im.vector.matrix.android.internal.session.room.timeline.TimelineSendEventWorkCommon
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.CancelableWork
-import im.vector.matrix.android.internal.worker.AlwaysSuccessfulWorker
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.startChain
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.isImageMessage
+import org.matrix.android.sdk.api.session.events.model.isTextMessage
+import org.matrix.android.sdk.api.session.room.model.message.OptionItem
+import org.matrix.android.sdk.api.session.room.send.SendService
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.CancelableBag
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.content.UploadContentWorker
+import org.matrix.android.sdk.internal.session.room.timeline.TimelineSendEventWorkCommon
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.CancelableWork
+import org.matrix.android.sdk.internal.worker.AlwaysSuccessfulWorker
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.startChain
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.concurrent.Executors
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/EncryptEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/EncryptEventWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt
index 3d8e63cb97..d23835e838 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/EncryptEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +15,24 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
-import im.vector.matrix.android.internal.crypto.model.MXEncryptEventContentResult
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.matrix.android.internal.worker.SessionWorkerParams
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
+import org.matrix.android.sdk.internal.crypto.model.MXEncryptEventContentResult
+import org.matrix.android.sdk.internal.util.awaitCallback
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index ee52cf966f..ac92e526a8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,53 +15,52 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import android.content.Context
 import android.graphics.Bitmap
 import android.media.MediaMetadataRetriever
 import androidx.exifinterface.media.ExifInterface
-import im.vector.matrix.android.R
-import im.vector.matrix.android.api.permalinks.PermalinkFactory
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.UnsignedData
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.model.message.AudioInfo
-import im.vector.matrix.android.api.session.room.model.message.FileInfo
-import im.vector.matrix.android.api.session.room.model.message.ImageInfo
-import im.vector.matrix.android.api.session.room.model.message.MessageAudioContent
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageContentWithFormattedBody
-import im.vector.matrix.android.api.session.room.model.message.MessageFileContent
-import im.vector.matrix.android.api.session.room.model.message.MessageFormat
-import im.vector.matrix.android.api.session.room.model.message.MessageImageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageOptionsContent
-import im.vector.matrix.android.api.session.room.model.message.MessagePollResponseContent
-import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationRequestContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent
-import im.vector.matrix.android.api.session.room.model.message.OPTION_TYPE_POLL
-import im.vector.matrix.android.api.session.room.model.message.OptionItem
-import im.vector.matrix.android.api.session.room.model.message.ThumbnailInfo
-import im.vector.matrix.android.api.session.room.model.message.VideoInfo
-import im.vector.matrix.android.api.session.room.model.relation.ReactionContent
-import im.vector.matrix.android.api.session.room.model.relation.ReactionInfo
-import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.api.session.room.model.relation.ReplyToContent
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent
-import im.vector.matrix.android.api.session.room.timeline.isReply
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.content.ThumbnailExtractor
-import im.vector.matrix.android.internal.session.room.send.pills.TextPillsUtils
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.StringProvider
+import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.UnsignedData
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.message.AudioInfo
+import org.matrix.android.sdk.api.session.room.model.message.FileInfo
+import org.matrix.android.sdk.api.session.room.model.message.ImageInfo
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContentWithFormattedBody
+import org.matrix.android.sdk.api.session.room.model.message.MessageFileContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageOptionsContent
+import org.matrix.android.sdk.api.session.room.model.message.MessagePollResponseContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_POLL
+import org.matrix.android.sdk.api.session.room.model.message.OptionItem
+import org.matrix.android.sdk.api.session.room.model.message.ThumbnailInfo
+import org.matrix.android.sdk.api.session.room.model.message.VideoInfo
+import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
+import org.matrix.android.sdk.api.session.room.model.relation.ReactionInfo
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.session.room.model.relation.ReplyToContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
+import org.matrix.android.sdk.api.session.room.timeline.isReply
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.content.ThumbnailExtractor
+import org.matrix.android.sdk.internal.session.permalinks.PermalinkFactory
+import org.matrix.android.sdk.internal.session.room.send.pills.TextPillsUtils
+import org.matrix.android.sdk.internal.util.StringProvider
 import javax.inject.Inject
 
 /**
@@ -78,8 +78,8 @@ internal class LocalEchoEventFactory @Inject constructor(
         private val stringProvider: StringProvider,
         private val markdownParser: MarkdownParser,
         private val textPillsUtils: TextPillsUtils,
-        private val taskExecutor: TaskExecutor,
-        private val localEchoRepository: LocalEchoRepository
+        private val localEchoRepository: LocalEchoRepository,
+        private val permalinkFactory: PermalinkFactory
 ) {
     fun createTextEvent(roomId: String, msgType: String, text: CharSequence, autoMarkdown: Boolean): Event {
         if (msgType == MessageType.MSGTYPE_TEXT || msgType == MessageType.MSGTYPE_EMOTE) {
@@ -168,9 +168,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                                  newBodyAutoMarkdown: Boolean,
                                  msgType: String,
                                  compatibilityText: String): Event {
-        val permalink = PermalinkFactory.createPermalink(roomId, originalEvent.root.eventId ?: "")
-        val userLink = originalEvent.root.senderId?.let { PermalinkFactory.createPermalink(it) }
-                ?: ""
+        val permalink = permalinkFactory.createPermalink(roomId, originalEvent.root.eventId ?: "")
+        val userLink = originalEvent.root.senderId?.let { permalinkFactory.createPermalink(it) } ?: ""
 
         val body = bodyForReply(originalEvent.getLastMessageContent(), originalEvent.isReply())
         val replyFormatted = REPLY_PATTERN.format(
@@ -206,7 +205,7 @@ internal class LocalEchoEventFactory @Inject constructor(
             ContentAttachmentData.Type.IMAGE -> createImageEvent(roomId, attachment)
             ContentAttachmentData.Type.VIDEO -> createVideoEvent(roomId, attachment)
             ContentAttachmentData.Type.AUDIO -> createAudioEvent(roomId, attachment)
-            ContentAttachmentData.Type.FILE  -> createFileEvent(roomId, attachment)
+            ContentAttachmentData.Type.FILE -> createFileEvent(roomId, attachment)
         }
     }
 
@@ -360,12 +359,15 @@ internal class LocalEchoEventFactory @Inject constructor(
         return System.currentTimeMillis()
     }
 
-    fun createReplyTextEvent(roomId: String, eventReplied: TimelineEvent, replyText: CharSequence, autoMarkdown: Boolean): Event? {
+    fun createReplyTextEvent(roomId: String,
+                             eventReplied: TimelineEvent,
+                             replyText: CharSequence,
+                             autoMarkdown: Boolean): Event? {
         // Fallbacks and event representation
         // TODO Add error/warning logs when any of this is null
-        val permalink = PermalinkFactory.createPermalink(eventReplied.root) ?: return null
+        val permalink = permalinkFactory.createPermalink(eventReplied.root) ?: return null
         val userId = eventReplied.root.senderId ?: return null
-        val userLink = PermalinkFactory.createPermalink(userId) ?: return null
+        val userLink = permalinkFactory.createPermalink(userId) ?: return null
 
         val body = bodyForReply(eventReplied.getLastMessageContent(), eventReplied.isReply())
         val replyFormatted = REPLY_PATTERN.format(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoRepository.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
index bbb20802f5..a9859136ad 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,35 +15,35 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
-import im.vector.matrix.android.internal.database.helper.nextId
-import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.database.mapper.TimelineEventMapper
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.mapper.toEntity
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.EventInsertEntity
-import im.vector.matrix.android.internal.database.model.EventInsertType
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.query.findAllInRoomWithSendStates
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberHelper
-import im.vector.matrix.android.internal.session.room.summary.RoomSummaryUpdater
-import im.vector.matrix.android.internal.session.room.timeline.DefaultTimeline
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
+import org.matrix.android.sdk.internal.database.helper.nextId
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.mapper.toEntity
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.query.findAllInRoomWithSendStates
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryUpdater
+import org.matrix.android.sdk.internal.session.room.timeline.DefaultTimeline
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import io.realm.Realm
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/MarkdownParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/MarkdownParser.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
index 3833b2f87d..3390d9dc79 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/MarkdownParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
index 5e272ceff3..73791e8412 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import android.content.Context
 import androidx.work.BackoffPolicy
@@ -22,15 +23,15 @@ import androidx.work.CoroutineWorker
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.session.content.UploadContentWorker
-import im.vector.matrix.android.internal.session.room.timeline.TimelineSendEventWorkCommon
-import im.vector.matrix.android.internal.worker.SessionWorkerParams
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
-import im.vector.matrix.android.internal.worker.startChain
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.content.UploadContentWorker
+import org.matrix.android.sdk.internal.session.room.timeline.TimelineSendEventWorkCommon
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
+import org.matrix.android.sdk.internal.worker.startChain
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/NoMerger.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/NoMerger.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/NoMerger.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/NoMerger.kt
index 05b31ca420..7b9e1ec9d8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/NoMerger.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/NoMerger.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import androidx.work.Data
 import androidx.work.InputMerger
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/RedactEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/RedactEventWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
index 7e0b665d63..e1e780c35a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/RedactEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.worker.SessionWorkerParams
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/RoomEventSender.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/RoomEventSender.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt
index 4d43067ceb..65c692f42e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/RoomEventSender.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import androidx.work.BackoffPolicy
 import androidx.work.OneTimeWorkRequest
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.session.room.timeline.TimelineSendEventWorkCommon
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.startChain
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.room.timeline.TimelineSendEventWorkCommon
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.startChain
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendEventWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
index 8563d5959b..2868ce29c1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,21 +15,21 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.failure.shouldBeRetried
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.worker.SessionWorkerParams
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.failure.shouldBeRetried
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendResponse.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendResponse.kt
index 6d4784d225..d9ba553ce5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/TextContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/TextContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt
index 5058c1991f..33490a4a03 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/TextContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send
+package org.matrix.android.sdk.internal.session.room.send
 
-import im.vector.matrix.android.api.session.room.model.message.MessageFormat
-import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.util.ContentUtils.extractUsefulTextFromHtmlReply
-import im.vector.matrix.android.api.util.ContentUtils.extractUsefulTextFromReply
+import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.util.ContentUtils.extractUsefulTextFromHtmlReply
+import org.matrix.android.sdk.api.util.ContentUtils.extractUsefulTextFromReply
 
 /**
  * Contains a text and eventually a formatted text
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/pills/MentionLinkSpec.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpec.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/pills/MentionLinkSpec.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpec.kt
index 055eade5e7..18063bbc1e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/pills/MentionLinkSpec.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpec.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send.pills
+package org.matrix.android.sdk.internal.session.room.send.pills
 
-import im.vector.matrix.android.api.session.room.send.MatrixItemSpan
+import org.matrix.android.sdk.api.session.room.send.MatrixItemSpan
 
 internal data class MentionLinkSpec(
         val span: MatrixItemSpan,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/pills/MentionLinkSpecComparator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpecComparator.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/pills/MentionLinkSpecComparator.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpecComparator.kt
index 76fd8336cc..e6bc19f3ae 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/pills/MentionLinkSpecComparator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpecComparator.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.send.pills
+package org.matrix.android.sdk.internal.session.room.send.pills
 
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/pills/TextPillsUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/pills/TextPillsUtils.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
index 6055592eab..e0fe580cba 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/pills/TextPillsUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.send.pills
+package org.matrix.android.sdk.internal.session.room.send.pills
 
 import android.text.SpannableString
-import im.vector.matrix.android.api.session.room.send.MatrixItemSpan
+import org.matrix.android.sdk.api.session.room.send.MatrixItemSpan
 import java.util.Collections
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/state/DefaultStateService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index 198b601ea5..0150acd1e2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,27 +15,27 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.state
+package org.matrix.android.sdk.internal.session.room.state
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
-import im.vector.matrix.android.api.session.room.state.StateService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.session.content.FileUploader
-import im.vector.matrix.android.internal.session.room.alias.AddRoomAliasTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.task.launchToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.state.StateService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.session.content.FileUploader
+import org.matrix.android.sdk.internal.session.room.alias.AddRoomAliasTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.task.launchToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 
 internal class DefaultStateService @AssistedInject constructor(@Assisted private val roomId: String,
                                                                private val stateEventDataSource: StateEventDataSource,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/state/SendStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/state/SendStateTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
index 5c1cddc2e7..52e865c4e2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/state/SendStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.state
+package org.matrix.android.sdk.internal.session.room.state
 
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/state/StateEventDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/state/StateEventDataSource.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
index 6bbf3290a7..e8dc2ddf40 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/state/StateEventDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.state
+package org.matrix.android.sdk.internal.session.room.state
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntityFields
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.query.process
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.query.process
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryDataSource.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index b1518b085d..a43241a657 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +15,24 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.summary
+package org.matrix.android.sdk.internal.session.room.summary
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.room.RoomSummaryQueryParams
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.VersioningState
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.database.mapper.RoomSummaryMapper
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntityFields
-import im.vector.matrix.android.internal.database.query.findByAlias
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.query.process
-import im.vector.matrix.android.internal.util.fetchCopyMap
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.VersioningState
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.mapper.RoomSummaryMapper
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.findByAlias
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.query.process
+import org.matrix.android.sdk.internal.util.fetchCopyMap
 import io.realm.Realm
 import io.realm.RealmQuery
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 342926f65f..99671c232a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,40 +15,40 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.summary
+package org.matrix.android.sdk.internal.session.room.summary
 
 import dagger.Lazy
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomAliasesContent
-import im.vector.matrix.android.api.session.room.model.RoomCanonicalAliasContent
-import im.vector.matrix.android.api.session.room.model.RoomNameContent
-import im.vector.matrix.android.api.session.room.model.RoomTopicContent
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.crosssigning.SessionToCryptoRoomMembersUpdate
-import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.EventEntityFields
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntityFields
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.query.findAllInRoomWithSendStates
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.getOrNull
-import im.vector.matrix.android.internal.database.query.isEventRead
-import im.vector.matrix.android.internal.database.query.latestEvent
-import im.vector.matrix.android.internal.database.query.whereType
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.room.RoomAvatarResolver
-import im.vector.matrix.android.internal.session.room.membership.RoomDisplayNameResolver
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberHelper
-import im.vector.matrix.android.internal.session.room.timeline.TimelineEventDecryptor
-import im.vector.matrix.android.internal.session.sync.model.RoomSyncSummary
-import im.vector.matrix.android.internal.session.sync.model.RoomSyncUnreadNotifications
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomAliasesContent
+import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
+import org.matrix.android.sdk.api.session.room.model.RoomNameContent
+import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.crosssigning.SessionToCryptoRoomMembersUpdate
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.query.findAllInRoomWithSendStates
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.getOrNull
+import org.matrix.android.sdk.internal.database.query.isEventRead
+import org.matrix.android.sdk.internal.database.query.latestEvent
+import org.matrix.android.sdk.internal.database.query.whereType
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.RoomAvatarResolver
+import org.matrix.android.sdk.internal.session.room.membership.RoomDisplayNameResolver
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.internal.session.room.timeline.TimelineEventDecryptor
+import org.matrix.android.sdk.internal.session.sync.model.RoomSyncSummary
+import org.matrix.android.sdk.internal.session.sync.model.RoomSyncUnreadNotifications
 import io.realm.Realm
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/AddTagToRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/AddTagToRoomTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt
index 0d1832050c..d78a7f338a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/AddTagToRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.tags
+package org.matrix.android.sdk.internal.session.room.tags
 
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/DefaultTagsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/DefaultTagsService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt
index 9df2f0593b..141adad643 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/DefaultTagsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.tags
+package org.matrix.android.sdk.internal.session.room.tags
 
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.room.tags.TagsService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.tags.TagsService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 
 internal class DefaultTagsService @AssistedInject constructor(
         @Assisted private val roomId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/DeleteTagFromRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/DeleteTagFromRoomTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt
index 2907df4953..9017338503 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/DeleteTagFromRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.tags
+package org.matrix.android.sdk.internal.session.room.tags
 
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/TagBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/TagBody.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/TagBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/TagBody.kt
index d82d37757f..33d39ba4d1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tags/TagBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/TagBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.tags
+package org.matrix.android.sdk.internal.session.room.tags
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultGetContextOfEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultGetContextOfEventTask.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultGetContextOfEventTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultGetContextOfEventTask.kt
index 85036f8e2e..9d880c0428 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultGetContextOfEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultGetContextOfEventTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.filter.FilterRepository
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.filter.FilterRepository
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultPaginationTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultPaginationTask.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultPaginationTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultPaginationTask.kt
index ed93c7927f..55b8fb6ff4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultPaginationTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultPaginationTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.filter.FilterRepository
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.filter.FilterRepository
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimeline.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index 063cd8ee4d..b4c32c045e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,35 +15,35 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.ReadReceipt
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.TimelineSettings
-import im.vector.matrix.android.api.util.CancelableBag
-import im.vector.matrix.android.internal.database.mapper.TimelineEventMapper
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.model.ChunkEntityFields
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntityFields
-import im.vector.matrix.android.internal.database.query.TimelineEventFilter
-import im.vector.matrix.android.internal.database.query.findAllInRoomWithSendStates
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.database.query.whereRoomId
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.util.Debouncer
-import im.vector.matrix.android.internal.util.createBackgroundHandler
-import im.vector.matrix.android.internal.util.createUIHandler
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.ReadReceipt
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.api.util.CancelableBag
+import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.database.query.TimelineEventFilter
+import org.matrix.android.sdk.internal.database.query.findAllInRoomWithSendStates
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.database.query.whereRoomId
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.util.Debouncer
+import org.matrix.android.sdk.internal.util.createBackgroundHandler
+import org.matrix.android.sdk.internal.util.createUIHandler
 import io.realm.OrderedCollectionChangeSet
 import io.realm.OrderedRealmCollectionChangeListener
 import io.realm.Realm
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimelineService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index 32160a96eb..db675f69f5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,30 +15,30 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.events.model.isImageMessage
-import im.vector.matrix.android.api.session.events.model.isVideoMessage
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.TimelineService
-import im.vector.matrix.android.api.session.room.timeline.TimelineSettings
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.crypto.store.db.doWithRealm
-import im.vector.matrix.android.internal.database.mapper.ReadReceiptsSummaryMapper
-import im.vector.matrix.android.internal.database.mapper.TimelineEventMapper
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntityFields
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.fetchCopyMap
+import org.matrix.android.sdk.api.session.events.model.isImageMessage
+import org.matrix.android.sdk.api.session.events.model.isVideoMessage
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineService
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.crypto.store.db.doWithRealm
+import org.matrix.android.sdk.internal.database.mapper.ReadReceiptsSummaryMapper
+import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.fetchCopyMap
 import io.realm.Sort
 import io.realm.kotlin.where
 import org.greenrobot.eventbus.EventBus
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/EventContextResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/EventContextResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt
index f06697351e..27006c8183 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/EventContextResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 @JsonClass(generateAdapter = true)
 data class EventContextResponse(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/FetchTokenAndPaginateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
index 3c1f6b18bd..23a32996fa 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.query.findIncludingEvent
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.filter.FilterRepository
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.query.findIncludingEvent
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.filter.FilterRepository
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/GetEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/GetEventTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
index 10c0f5003b..531fac4a57 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/GetEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationDirection.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationDirection.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationDirection.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationDirection.kt
index 26bbe8071d..581f23c403 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationDirection.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationDirection.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
 internal enum class PaginationDirection(val value: String) {
     /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt
index 0c57373d5b..b0f2e693dc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 @JsonClass(generateAdapter = true)
 internal data class PaginationResponse(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineEventDecryptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineEventDecryptor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
index 2f9af828ae..0ca0d19b5e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineEventDecryptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.internal.crypto.NewSessionListener
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.internal.crypto.NewSessionListener
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.SessionScope
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineHiddenReadReceipts.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
index ddfa7e91fe..426daa4b57 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
 import android.util.SparseArray
-import im.vector.matrix.android.api.session.room.model.ReadReceipt
-import im.vector.matrix.android.api.session.room.timeline.TimelineSettings
-import im.vector.matrix.android.internal.database.mapper.ReadReceiptsSummaryMapper
-import im.vector.matrix.android.internal.database.model.ReadReceiptsSummaryEntity
-import im.vector.matrix.android.internal.database.model.ReadReceiptsSummaryEntityFields
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntityFields
-import im.vector.matrix.android.internal.database.query.TimelineEventFilter
-import im.vector.matrix.android.internal.database.query.whereInRoom
+import org.matrix.android.sdk.api.session.room.model.ReadReceipt
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.internal.database.mapper.ReadReceiptsSummaryMapper
+import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.database.query.TimelineEventFilter
+import org.matrix.android.sdk.internal.database.query.whereInRoom
 import io.realm.OrderedRealmCollectionChangeListener
 import io.realm.Realm
 import io.realm.RealmQuery
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineSendEventWorkCommon.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
index 5621866917..d3124b68ca 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
 import androidx.work.BackoffPolicy
 import androidx.work.Data
 import androidx.work.ExistingWorkPolicy
 import androidx.work.ListenableWorker
 import androidx.work.OneTimeWorkRequest
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.NoOpCancellable
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.util.CancelableWork
-import im.vector.matrix.android.internal.worker.startChain
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.util.CancelableWork
+import org.matrix.android.sdk.internal.worker.startChain
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEvent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt
index 7344f5598b..655af7c4e1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 internal interface TokenChunkEvent {
     val start: String?
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEventPersistor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index b0c697ee6c..da4eebe142 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,35 +15,35 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.timeline
+package org.matrix.android.sdk.internal.session.room.timeline
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.database.helper.addOrUpdate
-import im.vector.matrix.android.internal.database.helper.addStateEvent
-import im.vector.matrix.android.internal.database.helper.addTimelineEvent
-import im.vector.matrix.android.internal.database.helper.deleteOnCascade
-import im.vector.matrix.android.internal.database.helper.merge
-import im.vector.matrix.android.internal.database.mapper.toEntity
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.model.EventInsertType
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.query.copyToRealmOrIgnore
-import im.vector.matrix.android.internal.database.query.create
-import im.vector.matrix.android.internal.database.query.find
-import im.vector.matrix.android.internal.database.query.findAllIncludingEvents
-import im.vector.matrix.android.internal.database.query.findLastForwardChunkOfRoom
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.latestEvent
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.room.summary.RoomSummaryUpdater
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.database.helper.addOrUpdate
+import org.matrix.android.sdk.internal.database.helper.addStateEvent
+import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
+import org.matrix.android.sdk.internal.database.helper.deleteOnCascade
+import org.matrix.android.sdk.internal.database.helper.merge
+import org.matrix.android.sdk.internal.database.mapper.toEntity
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.query.copyToRealmOrIgnore
+import org.matrix.android.sdk.internal.database.query.create
+import org.matrix.android.sdk.internal.database.query.find
+import org.matrix.android.sdk.internal.database.query.findAllIncludingEvents
+import org.matrix.android.sdk.internal.database.query.findLastForwardChunkOfRoom
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.latestEvent
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryUpdater
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import io.realm.Realm
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
similarity index 68%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
index cfdf43c737..8707eb2429 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.tombstone
+package org.matrix.android.sdk.internal.session.room.tombstone
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.VersioningState
-import im.vector.matrix.android.api.session.room.model.tombstone.RoomTombstoneContent
-import im.vector.matrix.android.internal.database.model.EventInsertType
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.session.EventInsertLiveProcessor
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.VersioningState
+import org.matrix.android.sdk.api.session.room.model.tombstone.RoomTombstoneContent
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/DefaultTypingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/DefaultTypingService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
index 4989d8a235..b8db9ce69c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/DefaultTypingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.typing
+package org.matrix.android.sdk.internal.session.room.typing
 
 import android.os.SystemClock
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.room.typing.TypingService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.typing.TypingService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import timber.log.Timber
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/SendTypingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/SendTypingTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
index 6460933621..719fffbb4e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/SendTypingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.typing
+package org.matrix.android.sdk.internal.session.room.typing
 
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import kotlinx.coroutines.delay
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/TypingBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingBody.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/TypingBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingBody.kt
index 26099599d7..8ed77a4829 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/TypingBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.typing
+package org.matrix.android.sdk.internal.session.room.typing
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/TypingEventContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingEventContent.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/TypingEventContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingEventContent.kt
index 969db3f235..f616bfefd0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/typing/TypingEventContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingEventContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.typing
+package org.matrix.android.sdk.internal.session.room.typing
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/uploads/DefaultUploadsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/uploads/DefaultUploadsService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt
index 6ec9abf8e2..76fb18b130 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/uploads/DefaultUploadsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.uploads
+package org.matrix.android.sdk.internal.session.room.uploads
 
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.crypto.CryptoService
-import im.vector.matrix.android.api.session.room.uploads.GetUploadsResult
-import im.vector.matrix.android.api.session.room.uploads.UploadsService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.room.uploads.GetUploadsResult
+import org.matrix.android.sdk.api.session.room.uploads.UploadsService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 
 internal class DefaultUploadsService @AssistedInject constructor(
         @Assisted private val roomId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/uploads/GetUploadsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/uploads/GetUploadsTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
index 6978d63e41..be53b8afe1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/uploads/GetUploadsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,31 +15,31 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.room.uploads
+package org.matrix.android.sdk.internal.session.room.uploads
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageWithAttachmentContent
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
-import im.vector.matrix.android.api.session.room.uploads.GetUploadsResult
-import im.vector.matrix.android.api.session.room.uploads.UploadEvent
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.EventEntity
-import im.vector.matrix.android.internal.database.model.EventEntityFields
-import im.vector.matrix.android.internal.database.query.TimelineEventFilter
-import im.vector.matrix.android.internal.database.query.whereType
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.filter.FilterFactory
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberHelper
-import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection
-import im.vector.matrix.android.internal.session.room.timeline.PaginationResponse
-import im.vector.matrix.android.internal.session.sync.SyncTokenStore
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.room.uploads.GetUploadsResult
+import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.query.TimelineEventFilter
+import org.matrix.android.sdk.internal.database.query.whereType
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.filter.FilterFactory
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
+import org.matrix.android.sdk.internal.session.room.timeline.PaginationResponse
+import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/securestorage/DefaultSecureStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/DefaultSecureStorageService.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/securestorage/DefaultSecureStorageService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/DefaultSecureStorageService.kt
index 2a3c88e84e..4ac796791a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/securestorage/DefaultSecureStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/DefaultSecureStorageService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.securestorage
+package org.matrix.android.sdk.internal.session.securestorage
 
-import im.vector.matrix.android.api.session.securestorage.SecureStorageService
+import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
 import java.io.InputStream
 import java.io.OutputStream
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/securestorage/SecretStoringUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/securestorage/SecretStoringUtils.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
index 7043c3abbe..2ae115f325 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/securestorage/SecretStoringUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
 
 @file:Suppress("DEPRECATION")
 
-package im.vector.matrix.android.internal.session.securestorage
+package org.matrix.android.sdk.internal.session.securestorage
 
 import android.content.Context
 import android.os.Build
@@ -43,10 +44,7 @@ import javax.crypto.CipherInputStream
 import javax.crypto.CipherOutputStream
 import javax.crypto.KeyGenerator
 import javax.crypto.SecretKey
-import javax.crypto.SecretKeyFactory
 import javax.crypto.spec.GCMParameterSpec
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.PBEKeySpec
 import javax.crypto.spec.SecretKeySpec
 import javax.inject.Inject
 import javax.security.auth.x500.X500Principal
@@ -126,9 +124,8 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
     @Throws(Exception::class)
     fun securelyStoreString(secret: String, keyAlias: String): ByteArray? {
         return when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M      -> encryptStringM(secret, keyAlias)
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT -> encryptStringK(secret, keyAlias)
-            else                                                -> encryptForOldDevicesNotGood(secret, keyAlias)
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M -> encryptStringM(secret, keyAlias)
+            else                                           -> encryptString(secret, keyAlias)
         }
     }
 
@@ -138,25 +135,22 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
     @Throws(Exception::class)
     fun loadSecureSecret(encrypted: ByteArray, keyAlias: String): String? {
         return when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M      -> decryptStringM(encrypted, keyAlias)
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT -> decryptStringK(encrypted, keyAlias)
-            else                                                -> decryptForOldDevicesNotGood(encrypted, keyAlias)
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M -> decryptStringM(encrypted, keyAlias)
+            else                                           -> decryptString(encrypted, keyAlias)
         }
     }
 
     fun securelyStoreObject(any: Any, keyAlias: String, output: OutputStream) {
         when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M      -> saveSecureObjectM(keyAlias, output, any)
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT -> saveSecureObjectK(keyAlias, output, any)
-            else                                                -> saveSecureObjectOldNotGood(keyAlias, output, any)
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M -> saveSecureObjectM(keyAlias, output, any)
+            else                                           -> saveSecureObject(keyAlias, output, any)
         }
     }
 
     fun <T> loadSecureSecret(inputStream: InputStream, keyAlias: String): T? {
         return when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M      -> loadSecureObjectM(keyAlias, inputStream)
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT -> loadSecureObjectK(keyAlias, inputStream)
-            else                                                -> loadSecureObjectOldNotGood(keyAlias, inputStream)
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M -> loadSecureObjectM(keyAlias, inputStream)
+            else                                           -> loadSecureObject(keyAlias, inputStream)
         }
     }
 
@@ -187,7 +181,6 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
         - Store the encrypted AES
      Generate a key pair for encryption
      */
-    @RequiresApi(Build.VERSION_CODES.KITKAT)
     fun getOrGenerateKeyPairForAlias(alias: String): KeyStore.PrivateKeyEntry {
         val privateKeyEntry = (keyStore.getEntry(alias, null) as? KeyStore.PrivateKeyEntry)
 
@@ -237,8 +230,7 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
         return String(cipher.doFinal(encryptedText), Charsets.UTF_8)
     }
 
-    @RequiresApi(Build.VERSION_CODES.KITKAT)
-    private fun encryptStringK(text: String, keyAlias: String): ByteArray? {
+    private fun encryptString(text: String, keyAlias: String): ByteArray? {
         // we generate a random symmetric key
         val key = ByteArray(16)
         secureRandom.nextBytes(key)
@@ -255,47 +247,13 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
         return format1Make(encryptedKey, iv, encryptedBytes)
     }
 
-    private fun encryptForOldDevicesNotGood(text: String, keyAlias: String): ByteArray {
-        val salt = ByteArray(8)
-        secureRandom.nextBytes(salt)
-        val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256")
-        val spec = PBEKeySpec(keyAlias.toCharArray(), salt, 10000, 128)
-        val tmp = factory.generateSecret(spec)
-        val sKey = SecretKeySpec(tmp.encoded, "AES")
-
-        val cipher = Cipher.getInstance(AES_MODE)
-        cipher.init(Cipher.ENCRYPT_MODE, sKey)
-        val iv = cipher.iv
-        val encryptedBytes: ByteArray = cipher.doFinal(text.toByteArray(Charsets.UTF_8))
-
-        return format2Make(salt, iv, encryptedBytes)
-    }
-
-    private fun decryptForOldDevicesNotGood(data: ByteArray, keyAlias: String): String? {
-        val (salt, iv, encrypted) = format2Extract(ByteArrayInputStream(data))
-        val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256")
-        val spec = PBEKeySpec(keyAlias.toCharArray(), salt, 10_000, 128)
-        val tmp = factory.generateSecret(spec)
-        val sKey = SecretKeySpec(tmp.encoded, "AES")
-
-        val cipher = Cipher.getInstance(AES_MODE)
-//        cipher.init(Cipher.ENCRYPT_MODE, sKey)
-//        val encryptedBytes: ByteArray = cipher.doFinal(text.toByteArray(Charsets.UTF_8))
-
-        val specIV = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) IvParameterSpec(iv) else GCMParameterSpec(128, iv)
-        cipher.init(Cipher.DECRYPT_MODE, sKey, specIV)
-
-        return String(cipher.doFinal(encrypted), Charsets.UTF_8)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.KITKAT)
-    private fun decryptStringK(data: ByteArray, keyAlias: String): String? {
+    private fun decryptString(data: ByteArray, keyAlias: String): String? {
         val (encryptedKey, iv, encrypted) = format1Extract(ByteArrayInputStream(data))
 
         // we need to decrypt the key
         val sKeyBytes = rsaDecrypt(keyAlias, ByteArrayInputStream(encryptedKey))
         val cipher = Cipher.getInstance(AES_MODE)
-        val spec = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) IvParameterSpec(iv) else GCMParameterSpec(128, iv)
+        val spec = GCMParameterSpec(128, iv)
         cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(sKeyBytes, "AES"), spec)
 
         return String(cipher.doFinal(encrypted), Charsets.UTF_8)
@@ -322,8 +280,7 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
         output.write(doFinal)
     }
 
-    @RequiresApi(Build.VERSION_CODES.KITKAT)
-    private fun saveSecureObjectK(keyAlias: String, output: OutputStream, writeObject: Any) {
+    private fun saveSecureObject(keyAlias: String, output: OutputStream, writeObject: Any) {
         // we generate a random symmetric key
         val key = ByteArray(16)
         secureRandom.nextBytes(key)
@@ -351,32 +308,6 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
         output.write(bos1.toByteArray())
     }
 
-    private fun saveSecureObjectOldNotGood(keyAlias: String, output: OutputStream, writeObject: Any) {
-        val salt = ByteArray(8)
-        secureRandom.nextBytes(salt)
-        val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256")
-        val tmp = factory.generateSecret(PBEKeySpec(keyAlias.toCharArray(), salt, 10000, 128))
-        val secretKey = SecretKeySpec(tmp.encoded, "AES")
-
-        val cipher = Cipher.getInstance(AES_MODE)
-        cipher.init(Cipher.ENCRYPT_MODE, secretKey)
-        val iv = cipher.iv
-
-        val bos1 = ByteArrayOutputStream()
-        ObjectOutputStream(bos1).use {
-            it.writeObject(writeObject)
-        }
-        // Have to do it like that if i encapsulate the output stream, the cipher could fail saying reuse IV
-        val doFinal = cipher.doFinal(bos1.toByteArray())
-
-        output.write(FORMAT_2.toInt())
-        output.write(salt.size)
-        output.write(salt)
-        output.write(iv.size)
-        output.write(iv)
-        output.write(doFinal)
-    }
-
 //    @RequiresApi(Build.VERSION_CODES.M)
 //    @Throws(IOException::class)
 //    fun saveSecureObjectM(keyAlias: String, file: File, writeObject: Any) {
@@ -417,15 +348,14 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.KITKAT)
     @Throws(IOException::class)
-    private fun <T> loadSecureObjectK(keyAlias: String, inputStream: InputStream): T? {
+    private fun <T> loadSecureObject(keyAlias: String, inputStream: InputStream): T? {
         val (encryptedKey, iv, encrypted) = format1Extract(inputStream)
 
         // we need to decrypt the key
         val sKeyBytes = rsaDecrypt(keyAlias, ByteArrayInputStream(encryptedKey))
         val cipher = Cipher.getInstance(AES_MODE)
-        val spec = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) IvParameterSpec(iv) else GCMParameterSpec(128, iv)
+        val spec = GCMParameterSpec(128, iv)
         cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(sKeyBytes, "AES"), spec)
 
         val encIS = ByteArrayInputStream(encrypted)
@@ -439,31 +369,6 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
         }
     }
 
-    @Throws(Exception::class)
-    private fun <T> loadSecureObjectOldNotGood(keyAlias: String, inputStream: InputStream): T? {
-        val (salt, iv, encrypted) = format2Extract(inputStream)
-
-        val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256")
-        val tmp = factory.generateSecret(PBEKeySpec(keyAlias.toCharArray(), salt, 10000, 128))
-        val sKey = SecretKeySpec(tmp.encoded, "AES")
-        // we need to decrypt the key
-
-        val cipher = Cipher.getInstance(AES_MODE)
-        val spec = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) IvParameterSpec(iv) else GCMParameterSpec(128, iv)
-        cipher.init(Cipher.DECRYPT_MODE, sKey, spec)
-
-        val encIS = ByteArrayInputStream(encrypted)
-
-        CipherInputStream(encIS, cipher).use {
-            ObjectInputStream(it).use { ois ->
-                val readObject = ois.readObject()
-                @Suppress("UNCHECKED_CAST")
-                return readObject as? T
-            }
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.KITKAT)
     @Throws(Exception::class)
     private fun rsaEncrypt(alias: String, secret: ByteArray): ByteArray {
         val privateKeyEntry = getOrGenerateKeyPairForAlias(alias)
@@ -479,7 +384,6 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
         return outputStream.toByteArray()
     }
 
-    @RequiresApi(Build.VERSION_CODES.KITKAT)
     @Throws(Exception::class)
     private fun rsaDecrypt(alias: String, encrypted: InputStream): ByteArray {
         val privateKeyEntry = getOrGenerateKeyPairForAlias(alias)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/DefaultSignOutService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/DefaultSignOutService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt
index 021b3ed066..0fdecc8d21 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/DefaultSignOutService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.signout
+package org.matrix.android.sdk.internal.session.signout
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.session.signout.SignOutService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.auth.SessionParamsStore
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.task.launchToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.session.signout.SignOutService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.auth.SessionParamsStore
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.task.launchToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import javax.inject.Inject
 
 internal class DefaultSignOutService @Inject constructor(private val signOutTask: SignOutTask,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignInAgainTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignInAgainTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt
index 5763d397c8..6f26fb25cd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignInAgainTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.signout
+package org.matrix.android.sdk.internal.session.signout
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.internal.auth.SessionParamsStore
-import im.vector.matrix.android.internal.auth.data.PasswordLoginParams
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.internal.auth.SessionParamsStore
+import org.matrix.android.sdk.internal.auth.data.PasswordLoginParams
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignOutAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignOutAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt
index 9db7c7d915..e4b05bfc67 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignOutAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.signout
+package org.matrix.android.sdk.internal.session.signout
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.internal.auth.data.PasswordLoginParams
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.internal.auth.data.PasswordLoginParams
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.Headers
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignOutModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutModule.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignOutModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutModule.kt
index 590729837b..c482200030 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignOutModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.signout
+package org.matrix.android.sdk.internal.session.signout
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.signout.SignOutService
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.signout.SignOutService
+import org.matrix.android.sdk.internal.session.SessionScope
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignOutTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignOutTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt
index 6db35f084c..ef507477cd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/signout/SignOutTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.signout
+package org.matrix.android.sdk.internal.session.signout
 
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.cleanup.CleanupSession
-import im.vector.matrix.android.internal.session.identity.IdentityDisconnectTask
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.cleanup.CleanupSession
+import org.matrix.android.sdk.internal.session.identity.IdentityDisconnectTask
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import java.net.HttpURLConnection
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/CryptoSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/CryptoSyncHandler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
index 86ca561dfe..5c855e190c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/CryptoSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.internal.crypto.DefaultCryptoService
-import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.matrix.android.internal.crypto.verification.DefaultVerificationService
-import im.vector.matrix.android.internal.session.DefaultInitialSyncProgressService
-import im.vector.matrix.android.internal.session.sync.model.SyncResponse
-import im.vector.matrix.android.internal.session.sync.model.ToDeviceSyncResponse
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
+import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.crypto.verification.DefaultVerificationService
+import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
+import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
+import org.matrix.android.sdk.internal.session.sync.model.ToDeviceSyncResponse
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/GroupSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/GroupSyncHandler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
index e3d4eae575..c3dd9fd577 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/GroupSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
-import im.vector.matrix.android.R
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.internal.database.model.GroupEntity
-import im.vector.matrix.android.internal.database.model.GroupSummaryEntity
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.session.DefaultInitialSyncProgressService
-import im.vector.matrix.android.internal.session.mapWithProgress
-import im.vector.matrix.android.internal.session.sync.model.GroupsSyncResponse
-import im.vector.matrix.android.internal.session.sync.model.InvitedGroupSync
+import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.database.model.GroupEntity
+import org.matrix.android.sdk.internal.database.model.GroupSummaryEntity
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
+import org.matrix.android.sdk.internal.session.mapWithProgress
+import org.matrix.android.sdk.internal.session.sync.model.GroupsSyncResponse
+import org.matrix.android.sdk.internal.session.sync.model.InvitedGroupSync
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/ReadReceiptHandler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
index 62fbd42ed5..5fe23e1b69 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
-import im.vector.matrix.android.internal.database.model.ReadReceiptEntity
-import im.vector.matrix.android.internal.database.model.ReadReceiptsSummaryEntity
-import im.vector.matrix.android.internal.database.query.createUnmanaged
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.where
+import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
+import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
+import org.matrix.android.sdk.internal.database.query.createUnmanaged
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.where
 import io.realm.Realm
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomFullyReadHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomFullyReadHandler.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomFullyReadHandler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomFullyReadHandler.kt
index 61ae8b9925..b0c44ef4f0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomFullyReadHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomFullyReadHandler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
-import im.vector.matrix.android.internal.database.model.ReadMarkerEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.session.room.read.FullyReadContent
+import org.matrix.android.sdk.internal.database.model.ReadMarkerEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.session.room.read.FullyReadContent
 import io.realm.Realm
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index df4f52bcc9..64c30825fc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,53 +15,53 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
-import im.vector.matrix.android.R
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.api.session.room.model.tag.RoomTagContent
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.internal.crypto.DefaultCryptoService
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.matrix.android.internal.database.helper.addOrUpdate
-import im.vector.matrix.android.internal.database.helper.addTimelineEvent
-import im.vector.matrix.android.internal.database.helper.deleteOnCascade
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.mapper.toEntity
-import im.vector.matrix.android.internal.database.model.ChunkEntity
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity
-import im.vector.matrix.android.internal.database.model.EventInsertType
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.RoomMemberSummaryEntity
-import im.vector.matrix.android.internal.database.query.copyToRealmOrIgnore
-import im.vector.matrix.android.internal.database.query.find
-import im.vector.matrix.android.internal.database.query.findLastForwardChunkOfRoom
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.getOrNull
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.DefaultInitialSyncProgressService
-import im.vector.matrix.android.internal.session.mapWithProgress
-import im.vector.matrix.android.internal.session.room.membership.RoomChangeMembershipStateDataSource
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberEventHandler
-import im.vector.matrix.android.internal.session.room.read.FullyReadContent
-import im.vector.matrix.android.internal.session.room.summary.RoomSummaryUpdater
-import im.vector.matrix.android.internal.session.room.timeline.DefaultTimeline
-import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection
-import im.vector.matrix.android.internal.session.room.timeline.TimelineEventDecryptor
-import im.vector.matrix.android.internal.session.room.typing.TypingEventContent
-import im.vector.matrix.android.internal.session.sync.model.InvitedRoomSync
-import im.vector.matrix.android.internal.session.sync.model.RoomSync
-import im.vector.matrix.android.internal.session.sync.model.RoomSyncAccountData
-import im.vector.matrix.android.internal.session.sync.model.RoomSyncEphemeral
-import im.vector.matrix.android.internal.session.sync.model.RoomsSyncResponse
+import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.model.tag.RoomTagContent
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.database.helper.addOrUpdate
+import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
+import org.matrix.android.sdk.internal.database.helper.deleteOnCascade
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.mapper.toEntity
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.EventInsertType
+import org.matrix.android.sdk.internal.database.model.RoomEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
+import org.matrix.android.sdk.internal.database.query.copyToRealmOrIgnore
+import org.matrix.android.sdk.internal.database.query.find
+import org.matrix.android.sdk.internal.database.query.findLastForwardChunkOfRoom
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.getOrNull
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
+import org.matrix.android.sdk.internal.session.mapWithProgress
+import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberEventHandler
+import org.matrix.android.sdk.internal.session.room.read.FullyReadContent
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryUpdater
+import org.matrix.android.sdk.internal.session.room.timeline.DefaultTimeline
+import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
+import org.matrix.android.sdk.internal.session.room.timeline.TimelineEventDecryptor
+import org.matrix.android.sdk.internal.session.room.typing.TypingEventContent
+import org.matrix.android.sdk.internal.session.sync.model.InvitedRoomSync
+import org.matrix.android.sdk.internal.session.sync.model.RoomSync
+import org.matrix.android.sdk.internal.session.sync.model.RoomSyncAccountData
+import org.matrix.android.sdk.internal.session.sync.model.RoomSyncEphemeral
+import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
 import io.realm.Realm
 import io.realm.kotlin.createObject
 import org.greenrobot.eventbus.EventBus
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomTagHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomTagHandler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
index 51e0e72ab9..8dbd77f3fd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomTagHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
-import im.vector.matrix.android.api.session.room.model.tag.RoomTagContent
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomTagEntity
-import im.vector.matrix.android.internal.database.query.where
+import org.matrix.android.sdk.api.session.room.model.tag.RoomTagContent
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomTagEntity
+import org.matrix.android.sdk.internal.database.query.where
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomTypingUsersHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomTypingUsersHandler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt
index 0b674c2352..71a4d33d3f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomTypingUsersHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberHelper
-import im.vector.matrix.android.internal.session.typing.DefaultTypingUsersTracker
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
index 237a6fa6fd..db14c53456 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
-import im.vector.matrix.android.internal.network.NetworkConstants
-import im.vector.matrix.android.internal.session.sync.model.SyncResponse
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Headers
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
index 2add3f4eb5..87afe78e70 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.SessionScope
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncResponseHandler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index d8b07586a9..b58727cbaa 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,26 +15,26 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
 import androidx.work.ExistingPeriodicWorkPolicy
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.R
-import im.vector.matrix.android.api.pushrules.PushRuleService
-import im.vector.matrix.android.api.pushrules.RuleScope
-import im.vector.matrix.android.internal.crypto.DefaultCryptoService
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.SessionId
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.session.DefaultInitialSyncProgressService
-import im.vector.matrix.android.internal.session.group.GetGroupDataWorker
-import im.vector.matrix.android.internal.session.notification.ProcessEventForPushTask
-import im.vector.matrix.android.internal.session.reportSubtask
-import im.vector.matrix.android.internal.session.sync.model.GroupsSyncResponse
-import im.vector.matrix.android.internal.session.sync.model.RoomsSyncResponse
-import im.vector.matrix.android.internal.session.sync.model.SyncResponse
-import im.vector.matrix.android.internal.util.awaitTransaction
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.pushrules.PushRuleService
+import org.matrix.android.sdk.api.pushrules.RuleScope
+import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
+import org.matrix.android.sdk.internal.session.group.GetGroupDataWorker
+import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
+import org.matrix.android.sdk.internal.session.reportSubtask
+import org.matrix.android.sdk.internal.session.sync.model.GroupsSyncResponse
+import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
+import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index b3db4d0961..02afd53908 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
-import im.vector.matrix.android.R
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.DefaultInitialSyncProgressService
-import im.vector.matrix.android.internal.session.filter.FilterRepository
-import im.vector.matrix.android.internal.session.homeserver.GetHomeServerCapabilitiesTask
-import im.vector.matrix.android.internal.session.sync.model.SyncResponse
-import im.vector.matrix.android.internal.session.user.UserStore
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.R
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
+import org.matrix.android.sdk.internal.session.filter.FilterRepository
+import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilitiesTask
+import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
+import org.matrix.android.sdk.internal.session.user.UserStore
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTaskSequencer.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTaskSequencer.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTaskSequencer.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTaskSequencer.kt
index d2d393de00..4b29a82ad4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTaskSequencer.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTaskSequencer.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.task.SemaphoreCoroutineSequencer
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.task.SemaphoreCoroutineSequencer
 import javax.inject.Inject
 
 @SessionScope
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTokenStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTokenStore.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTokenStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTokenStore.kt
index d5e2a36026..e001e61149 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTokenStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTokenStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.SyncEntity
-import im.vector.matrix.android.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.database.model.SyncEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
 import io.realm.Realm
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/UserAccountDataSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/UserAccountDataSyncHandler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
index afa4fb680e..4ef6a5a3e1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/UserAccountDataSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,42 +15,42 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync
+package org.matrix.android.sdk.internal.session.sync
 
 import com.squareup.moshi.Moshi
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.pushrules.RuleScope
-import im.vector.matrix.android.api.pushrules.RuleSetKey
-import im.vector.matrix.android.api.pushrules.rest.GetPushRulesResponse
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataTypes
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.database.mapper.PushRulesMapper
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.BreadcrumbsEntity
-import im.vector.matrix.android.internal.database.model.IgnoredUserEntity
-import im.vector.matrix.android.internal.database.model.PushRulesEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntityFields
-import im.vector.matrix.android.internal.database.model.UserAccountDataEntity
-import im.vector.matrix.android.internal.database.model.UserAccountDataEntityFields
-import im.vector.matrix.android.internal.database.query.getDirectRooms
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberHelper
-import im.vector.matrix.android.internal.session.sync.model.InvitedRoomSync
-import im.vector.matrix.android.internal.session.sync.model.accountdata.BreadcrumbsContent
-import im.vector.matrix.android.internal.session.sync.model.accountdata.DirectMessagesContent
-import im.vector.matrix.android.internal.session.sync.model.accountdata.IgnoredUsersContent
-import im.vector.matrix.android.internal.session.sync.model.accountdata.UserAccountDataSync
-import im.vector.matrix.android.internal.session.user.accountdata.DirectChatsHelper
-import im.vector.matrix.android.internal.session.user.accountdata.UpdateUserAccountDataTask
+import org.matrix.android.sdk.api.pushrules.RuleScope
+import org.matrix.android.sdk.api.pushrules.RuleSetKey
+import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.database.mapper.PushRulesMapper
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.BreadcrumbsEntity
+import org.matrix.android.sdk.internal.database.model.IgnoredUserEntity
+import org.matrix.android.sdk.internal.database.model.PushRulesEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.UserAccountDataEntity
+import org.matrix.android.sdk.internal.database.model.UserAccountDataEntityFields
+import org.matrix.android.sdk.internal.database.query.getDirectRooms
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.internal.session.sync.model.InvitedRoomSync
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.BreadcrumbsContent
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.DirectMessagesContent
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.IgnoredUsersContent
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.UserAccountDataSync
+import org.matrix.android.sdk.internal.session.user.accountdata.DirectChatsHelper
+import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
 import io.realm.Realm
 import io.realm.RealmList
 import io.realm.kotlin.where
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
index 49adb1b507..20aa409336 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.sync.job
+package org.matrix.android.sdk.internal.session.sync.job
 
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
-import im.vector.matrix.android.api.Matrix
-import im.vector.matrix.android.api.failure.isTokenError
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.sync.SyncState
-import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
-import im.vector.matrix.android.internal.session.sync.SyncTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.util.BackgroundDetectionObserver
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.failure.isTokenError
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.sync.SyncState
+import org.matrix.android.sdk.internal.network.NetworkConnectivityChecker
+import org.matrix.android.sdk.internal.session.sync.SyncTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
index 45a478c749..1a2d6b1fd3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.job
+package org.matrix.android.sdk.internal.session.sync.job
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.squareup.moshi.JsonEncodingException
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.isTokenError
-import im.vector.matrix.android.api.session.sync.SyncState
-import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
-import im.vector.matrix.android.internal.session.sync.SyncTask
-import im.vector.matrix.android.internal.session.typing.DefaultTypingUsersTracker
-import im.vector.matrix.android.internal.util.BackgroundDetectionObserver
-import im.vector.matrix.android.internal.util.Debouncer
-import im.vector.matrix.android.internal.util.createUIHandler
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.isTokenError
+import org.matrix.android.sdk.api.session.sync.SyncState
+import org.matrix.android.sdk.internal.network.NetworkConnectivityChecker
+import org.matrix.android.sdk.internal.session.sync.SyncTask
+import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
+import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
+import org.matrix.android.sdk.internal.util.Debouncer
+import org.matrix.android.sdk.internal.util.createUIHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
index ab4e1938ce..e702de3573 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.sync.job
+package org.matrix.android.sdk.internal.session.sync.job
 
 import android.content.Context
 import androidx.work.BackoffPolicy
@@ -21,14 +22,14 @@ import androidx.work.CoroutineWorker
 import androidx.work.ExistingWorkPolicy
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.failure.isTokenError
-import im.vector.matrix.android.internal.di.WorkManagerProvider
-import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
-import im.vector.matrix.android.internal.session.sync.SyncTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.worker.SessionWorkerParams
-import im.vector.matrix.android.internal.worker.WorkerParamsFactory
-import im.vector.matrix.android.internal.worker.getSessionComponent
+import org.matrix.android.sdk.api.failure.isTokenError
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.network.NetworkConnectivityChecker
+import org.matrix.android.sdk.internal.session.sync.SyncTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
+import org.matrix.android.sdk.internal.worker.getSessionComponent
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt
index e91e2d0707..226486596e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceListResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceListResponse.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceListResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceListResponse.kt
index 9a7dd80572..df79060192 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceListResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceListResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt
index 15df103e37..36fe4acfa1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DevicesListResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DevicesListResponse.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DevicesListResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DevicesListResponse.kt
index 5bf4e48b3f..ec59e8f2c8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DevicesListResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DevicesListResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupSyncProfile.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupSyncProfile.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupSyncProfile.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupSyncProfile.kt
index 00e3377aa9..5a7ed53cae 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupSyncProfile.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupSyncProfile.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupsSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupsSyncResponse.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupsSyncResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupsSyncResponse.kt
index c0a10c9667..68557d1d9a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupsSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupsSyncResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedGroupSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedGroupSync.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedGroupSync.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedGroupSync.kt
index 128fcfad84..cae6bc36a4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedGroupSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedGroupSync.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedRoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedRoomSync.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedRoomSync.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedRoomSync.kt
index 9e39a323cd..efd1b50b3b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedRoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedRoomSync.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/PresenceSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/PresenceSyncResponse.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/PresenceSyncResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/PresenceSyncResponse.kt
index bbcb7badf0..2c6057d152 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/PresenceSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/PresenceSyncResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 //  PresenceSyncResponse represents the updates to the presence status of other users during server sync v2.
 @JsonClass(generateAdapter = true)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomInviteState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomInviteState.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomInviteState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomInviteState.kt
index a9447caf06..e37d4f58c7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomInviteState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomInviteState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 // RoomInviteState represents the state of a room that the user has been invited to.
 @JsonClass(generateAdapter = true)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomResponse.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomResponse.kt
index 453bd29c0b..df53eabd80 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 /**
  * Class representing a room from a JSON response from room or global initial sync.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSync.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt
index 2dd974f019..08556e800d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncAccountData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncAccountData.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
index 50bebc1713..13ea47a505 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncAccountData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 @JsonClass(generateAdapter = true)
 internal data class RoomSyncAccountData(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncEphemeral.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncEphemeral.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
index 2342ce2e7f..6d0e9e825f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncEphemeral.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 // RoomSyncEphemeral represents the ephemeral events in the room that aren't recorded in the timeline or state of the room (e.g. typing).
 @JsonClass(generateAdapter = true)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncState.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
index 589cffa0e0..f30e5a082d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 // RoomSyncState represents the state updates for a room during server sync v2.
 @JsonClass(generateAdapter = true)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncSummary.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncSummary.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncSummary.kt
index c0f4eade70..a2dddb9e8c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncSummary.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncTimeline.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
index cd22ea75cd..29e5d2089b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 // RoomSyncTimeline represents the timeline of messages and state changes for a room during server sync v2.
 @JsonClass(generateAdapter = true)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncUnreadNotifications.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncUnreadNotifications.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncUnreadNotifications.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncUnreadNotifications.kt
index a29b893e82..bbcec474e2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncUnreadNotifications.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncUnreadNotifications.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 /**
  * `MXRoomSyncUnreadNotifications` represents the unread counts for a room.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomsSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomsSyncResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
index 9bd83ae25a..79000edf40 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomsSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/SyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/SyncResponse.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/SyncResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/SyncResponse.kt
index 9e5cc2cfa4..e57c6cd1f8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/SyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/SyncResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.session.sync.model.accountdata.UserAccountDataSync
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.UserAccountDataSync
 
 // SyncResponse represents the request response for server sync v2.
 @JsonClass(generateAdapter = true)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/ToDeviceSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/ToDeviceSyncResponse.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/ToDeviceSyncResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/ToDeviceSyncResponse.kt
index 382d2a804b..1bc9f0a3fa 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/ToDeviceSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/ToDeviceSyncResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.Event
 
 // ToDeviceSyncResponse represents the data directly sent to one of user's devices.
 @JsonClass(generateAdapter = true)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/TokensChunkResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/TokensChunkResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt
index ae581bae27..813c300ec9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/TokensChunkResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model
+package org.matrix.android.sdk.internal.session.sync.model
 
 import com.squareup.moshi.JsonClass
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/AcceptedTermsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/AcceptedTermsContent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/AcceptedTermsContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/AcceptedTermsContent.kt
index c62a9a9502..57cd387243 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/AcceptedTermsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/AcceptedTermsContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model.accountdata
+package org.matrix.android.sdk.internal.session.sync.model.accountdata
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/BreadcrumbsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/BreadcrumbsContent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/BreadcrumbsContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/BreadcrumbsContent.kt
index 143093b1fd..54aa5cb0b9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/BreadcrumbsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/BreadcrumbsContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model.accountdata
+package org.matrix.android.sdk.internal.session.sync.model.accountdata
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/DirectMessagesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/DirectMessagesContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
index 875badc736..fbaccf08c6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/DirectMessagesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +15,6 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model.accountdata
+package org.matrix.android.sdk.internal.session.sync.model.accountdata
 
 typealias DirectMessagesContent = Map<String, List<String>>
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/IdentityServerContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IdentityServerContent.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/IdentityServerContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IdentityServerContent.kt
index bf373aaef5..5328525c53 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/IdentityServerContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IdentityServerContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model.accountdata
+package org.matrix.android.sdk.internal.session.sync.model.accountdata
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/IgnoredUsersContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IgnoredUsersContent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/IgnoredUsersContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IgnoredUsersContent.kt
index 66db603d4e..1095d2e76d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/IgnoredUsersContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IgnoredUsersContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model.accountdata
+package org.matrix.android.sdk.internal.session.sync.model.accountdata
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.util.emptyJsonDict
+import org.matrix.android.sdk.api.util.emptyJsonDict
 
 @JsonClass(generateAdapter = true)
 internal data class IgnoredUsersContent(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/UserAccountDataSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/UserAccountDataSync.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt
index ff018a5181..358f090bbd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/accountdata/UserAccountDataSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.sync.model.accountdata
+package org.matrix.android.sdk.internal.session.sync.model.accountdata
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 
 @JsonClass(generateAdapter = true)
 internal data class UserAccountDataSync(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/AcceptTermsBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/AcceptTermsBody.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/AcceptTermsBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/AcceptTermsBody.kt
index c5827b822f..497d30fdca 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/AcceptTermsBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/AcceptTermsBody.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.terms
+package org.matrix.android.sdk.internal.session.terms
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/DefaultTermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/DefaultTermsService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
index c70fb11d0c..f887754b6b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/DefaultTermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,29 +15,29 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.terms
+package org.matrix.android.sdk.internal.session.terms
 
 import dagger.Lazy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.terms.GetTermsResponse
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.di.UnauthenticatedWithCertificate
-import im.vector.matrix.android.internal.network.NetworkConstants
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.identity.IdentityAuthAPI
-import im.vector.matrix.android.internal.session.identity.IdentityRegisterTask
-import im.vector.matrix.android.internal.session.openid.GetOpenIdTokenTask
-import im.vector.matrix.android.internal.session.sync.model.accountdata.AcceptedTermsContent
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataTypes
-import im.vector.matrix.android.internal.session.user.accountdata.AccountDataDataSource
-import im.vector.matrix.android.internal.session.user.accountdata.UpdateUserAccountDataTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.launchToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.util.ensureTrailingSlash
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.terms.GetTermsResponse
+import org.matrix.android.sdk.api.session.terms.TermsService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.identity.IdentityAuthAPI
+import org.matrix.android.sdk.internal.session.identity.IdentityRegisterTask
+import org.matrix.android.sdk.internal.session.openid.GetOpenIdTokenTask
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.AcceptedTermsContent
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataDataSource
+import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.launchToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.ensureTrailingSlash
 import okhttp3.OkHttpClient
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
index 03b745f8d7..950c0a151b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.terms
+package org.matrix.android.sdk.internal.session.terms
 
-import im.vector.matrix.android.internal.network.HttpHeaders
+import org.matrix.android.sdk.internal.network.HttpHeaders
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -35,5 +36,7 @@ internal interface TermsAPI {
      * This request requires authentication
      */
     @POST
-    fun agreeToTerms(@Url url: String, @Body params: AcceptTermsBody, @Header(HttpHeaders.Authorization) token: String): Call<Unit>
+    fun agreeToTerms(@Url url: String,
+                     @Body params: AcceptTermsBody,
+                     @Header(HttpHeaders.Authorization) token: String): Call<Unit>
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt
index a948101638..7aa97cd1cc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.terms
+package org.matrix.android.sdk.internal.session.terms
 
 import dagger.Binds
 import dagger.Lazy
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.matrix.android.internal.di.UnauthenticatedWithCertificate
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.terms.TermsService
+import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.session.SessionScope
 import okhttp3.OkHttpClient
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsResponse.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsResponse.kt
index 394ee958ac..240291c09f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/terms/TermsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.terms
+package org.matrix.android.sdk.internal.session.terms
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.auth.registration.LocalizedFlowDataLoginTerms
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.auth.registration.LocalizedFlowDataLoginTerms
 
 /**
  * This class represent a localized privacy policy for registration Flow.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/typing/DefaultTypingUsersTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/typing/DefaultTypingUsersTracker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt
index a2df64e910..0fa557467c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/typing/DefaultTypingUsersTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.typing
+package org.matrix.android.sdk.internal.session.typing
 
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
-import im.vector.matrix.android.api.session.typing.TypingUsersTracker
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
+import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
 
 @SessionScope
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/DefaultUserService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/DefaultUserService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
index 5cad504555..e79893e752 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/DefaultUserService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +15,19 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user
+package org.matrix.android.sdk.internal.session.user
 
 import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.user.UserService
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.session.user.accountdata.UpdateIgnoredUserIdsTask
-import im.vector.matrix.android.internal.session.user.model.SearchUserTask
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.user.UserService
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.session.user.accountdata.UpdateIgnoredUserIdsTask
+import org.matrix.android.sdk.internal.session.user.model.SearchUserTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
 internal class DefaultUserService @Inject constructor(private val userDataSource: UserDataSource,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/SearchUserAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/SearchUserAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt
index 4adcee88aa..2b9a5f4aa4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/SearchUserAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user
+package org.matrix.android.sdk.internal.session.user
 
-import im.vector.matrix.android.internal.network.NetworkConstants
-import im.vector.matrix.android.internal.session.user.model.SearchUsersParams
-import im.vector.matrix.android.internal.session.user.model.SearchUsersResponse
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.session.user.model.SearchUsersParams
+import org.matrix.android.sdk.internal.session.user.model.SearchUsersResponse
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserDataSource.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
index 60f163064f..dd3c6856c0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user
+package org.matrix.android.sdk.internal.session.user
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
@@ -22,17 +23,17 @@ import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.IgnoredUserEntity
-import im.vector.matrix.android.internal.database.model.IgnoredUserEntityFields
-import im.vector.matrix.android.internal.database.model.UserEntity
-import im.vector.matrix.android.internal.database.model.UserEntityFields
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.util.fetchCopied
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.IgnoredUserEntity
+import org.matrix.android.sdk.internal.database.model.IgnoredUserEntityFields
+import org.matrix.android.sdk.internal.database.model.UserEntity
+import org.matrix.android.sdk.internal.database.model.UserEntityFields
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.util.fetchCopied
 import io.realm.Case
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserEntityFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserEntityFactory.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserEntityFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserEntityFactory.kt
index f931db1cff..6333a87a0b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserEntityFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserEntityFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user
+package org.matrix.android.sdk.internal.session.user
 
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.internal.database.model.UserEntity
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.internal.database.model.UserEntity
 
 internal object UserEntityFactory {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt
similarity index 66%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt
index fa5a51b4eb..51e4339061 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +15,19 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user
+package org.matrix.android.sdk.internal.session.user
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.user.UserService
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.user.accountdata.DefaultSaveIgnoredUsersTask
-import im.vector.matrix.android.internal.session.user.accountdata.DefaultUpdateIgnoredUserIdsTask
-import im.vector.matrix.android.internal.session.user.accountdata.SaveIgnoredUsersTask
-import im.vector.matrix.android.internal.session.user.accountdata.UpdateIgnoredUserIdsTask
-import im.vector.matrix.android.internal.session.user.model.DefaultSearchUserTask
-import im.vector.matrix.android.internal.session.user.model.SearchUserTask
+import org.matrix.android.sdk.api.session.user.UserService
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.user.accountdata.DefaultSaveIgnoredUsersTask
+import org.matrix.android.sdk.internal.session.user.accountdata.DefaultUpdateIgnoredUserIdsTask
+import org.matrix.android.sdk.internal.session.user.accountdata.SaveIgnoredUsersTask
+import org.matrix.android.sdk.internal.session.user.accountdata.UpdateIgnoredUserIdsTask
+import org.matrix.android.sdk.internal.session.user.model.DefaultSearchUserTask
+import org.matrix.android.sdk.internal.session.user.model.SearchUserTask
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt
index f1bf560f57..ea64cb9a2c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/UserStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user
+package org.matrix.android.sdk.internal.session.user
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.UserEntity
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.database.model.UserEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import javax.inject.Inject
 
 internal interface UserStore {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
index 65ec05e76e..25336cacf7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
-import im.vector.matrix.android.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.PUT
@@ -32,5 +33,7 @@ interface AccountDataAPI {
      * @param params the put params
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/account_data/{type}")
-    fun setAccountData(@Path("userId") userId: String, @Path("type") type: String, @Body params: Any): Call<Unit>
+    fun setAccountData(@Path("userId") userId: String,
+                       @Path("type") type: String,
+                       @Body params: Any): Call<Unit>
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataContent.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataContent.kt
index 5335f8a7f1..5384a1ba9c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
 /**
  * Tag class to identify every account data content
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataDataSource.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataDataSource.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataDataSource.kt
index ed5f26ab18..d54bfdd63d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataDataSource.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.database.mapper.AccountDataMapper
-import im.vector.matrix.android.internal.database.model.UserAccountDataEntity
-import im.vector.matrix.android.internal.database.model.UserAccountDataEntityFields
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.mapper.AccountDataMapper
+import org.matrix.android.sdk.internal.database.model.UserAccountDataEntity
+import org.matrix.android.sdk.internal.database.model.UserAccountDataEntityFields
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import io.realm.Realm
 import io.realm.RealmQuery
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt
index 2378ab3f0e..291d0bfaf7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/AccountDataModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
 import dagger.Binds
 import dagger.Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/DefaultAccountDataService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/DefaultAccountDataService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt
index c8dafcc33e..2bf1705855 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/DefaultAccountDataService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
 import androidx.lifecycle.LiveData
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.accountdata.AccountDataService
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.sync.UserAccountDataSyncHandler
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.configureWith
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.accountdata.AccountDataService
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.sync.UserAccountDataSyncHandler
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
 internal class DefaultAccountDataService @Inject constructor(
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/DirectChatsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/DirectChatsHelper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt
index b5f404019a..8bec45a203 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/DirectChatsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.query.getDirectRooms
-import im.vector.matrix.android.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.query.getDirectRooms
+import org.matrix.android.sdk.internal.di.SessionDatabase
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/SaveBreadcrumbsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveBreadcrumbsTask.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/SaveBreadcrumbsTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveBreadcrumbsTask.kt
index f005e3c7fc..6ef28954e0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/SaveBreadcrumbsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveBreadcrumbsTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.internal.database.model.BreadcrumbsEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.model.RoomSummaryEntityFields
-import im.vector.matrix.android.internal.database.query.getOrCreate
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.internal.database.model.BreadcrumbsEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import io.realm.RealmList
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/SaveIgnoredUsersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveIgnoredUsersTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/SaveIgnoredUsersTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveIgnoredUsersTask.kt
index 16f74e8c55..9141aabc80 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/SaveIgnoredUsersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveIgnoredUsersTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.IgnoredUserEntity
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.database.model.IgnoredUserEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import javax.inject.Inject
 
 /**
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
index fe64de2d0d..ab602dd603 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.BreadcrumbsEntity
-import im.vector.matrix.android.internal.database.query.get
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.sync.model.accountdata.BreadcrumbsContent
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.fetchCopied
+import org.matrix.android.sdk.internal.database.model.BreadcrumbsEntity
+import org.matrix.android.sdk.internal.database.query.get
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.BreadcrumbsContent
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.fetchCopied
 import javax.inject.Inject
 
 // Use the same arbitrary value than Riot-Web
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
index 3a224b273a..b47a25187b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.IgnoredUserEntity
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.sync.model.accountdata.IgnoredUsersContent
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataTypes
-import im.vector.matrix.android.internal.task.Task
 import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.internal.database.model.IgnoredUserEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.IgnoredUsersContent
+import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
 internal interface UpdateIgnoredUserIdsTask : Task<UpdateIgnoredUserIdsTask.Params, Unit> {
@@ -50,7 +51,7 @@ internal class DefaultUpdateIgnoredUserIdsTask @Inject constructor(
                 { it.userId }
         ).toMutableSet()
 
-        val original = ignoredUserIds.toList()
+        val original = ignoredUserIds.toSet()
 
         ignoredUserIds.removeAll { it in params.userIdsToUnIgnore }
         ignoredUserIds.addAll(params.userIdsToIgnore)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/UpdateUserAccountDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
index f456bbebd3..a68d76f25b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.accountdata
+package org.matrix.android.sdk.internal.session.user.accountdata
 
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.integrationmanager.AllowedWidgetsContent
-import im.vector.matrix.android.internal.session.integrationmanager.IntegrationProvisioningContent
-import im.vector.matrix.android.internal.session.sync.model.accountdata.AcceptedTermsContent
-import im.vector.matrix.android.internal.session.sync.model.accountdata.BreadcrumbsContent
-import im.vector.matrix.android.internal.session.sync.model.accountdata.IdentityServerContent
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataTypes
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.integrationmanager.AllowedWidgetsContent
+import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationProvisioningContent
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.AcceptedTermsContent
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.BreadcrumbsContent
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.IdentityServerContent
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUser.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUser.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUser.kt
index cc7032d6f3..4299794c16 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUser.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.model
+package org.matrix.android.sdk.internal.session.user.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUserTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUserTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt
index f8ccc13439..5f587d7f8d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUserTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.model
+package org.matrix.android.sdk.internal.session.user.model
 
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.user.SearchUserAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.user.SearchUserAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUsersParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersParams.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUsersParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersParams.kt
index 6ea689e5f9..b8e855a004 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUsersParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.model
+package org.matrix.android.sdk.internal.session.user.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUsersResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersResponse.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUsersResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersResponse.kt
index c324fdd8cf..646d8e63bf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUsersResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.user.model
+package org.matrix.android.sdk.internal.session.user.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/CreateWidgetTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
similarity index 71%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/CreateWidgetTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
index 482dd9a66d..9f7981a95b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/CreateWidgetTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets
+package org.matrix.android.sdk.internal.session.widgets
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.internal.database.awaitNotEmptyResult
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity
-import im.vector.matrix.android.internal.database.model.CurrentStateEventEntityFields
-import im.vector.matrix.android.internal.database.query.whereStateKey
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.room.RoomAPI
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
+import org.matrix.android.sdk.internal.database.query.whereStateKey
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.task.Task
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetPostAPIMediator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
index 5bf2d02e3c..395484433b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,15 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets
+package org.matrix.android.sdk.internal.session.widgets
 
-import android.os.Build
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import com.squareup.moshi.Moshi
-import im.vector.matrix.android.api.session.widgets.WidgetPostAPIMediator
-import im.vector.matrix.android.api.util.JSON_DICT_PARAMETERIZED_TYPE
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.internal.util.createUIHandler
+import org.matrix.android.sdk.api.session.widgets.WidgetPostAPIMediator
+import org.matrix.android.sdk.api.util.JSON_DICT_PARAMETERIZED_TYPE
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.util.createUIHandler
 import timber.log.Timber
 import java.lang.reflect.Type
 import java.util.HashMap
@@ -171,11 +171,7 @@ internal class DefaultWidgetPostAPIMediator @Inject constructor(private val mosh
             val functionLine = "sendResponseFromRiotAndroid('" + eventData["_id"] + "' , " + jsString + ");"
             Timber.v("BRIDGE sendResponse: $functionLine")
             // call the javascript method
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-                webView?.loadUrl("javascript:$functionLine")
-            } else {
-                webView?.evaluateJavascript(functionLine, null)
-            }
+            webView?.evaluateJavascript(functionLine, null)
         } catch (e: Exception) {
             Timber.e(e, "## sendResponse() failed ")
         }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
index ab5f1e8858..049b368fe5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets
+package org.matrix.android.sdk.internal.session.widgets
 
 import androidx.lifecycle.LiveData
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.widgets.WidgetPostAPIMediator
-import im.vector.matrix.android.api.session.widgets.WidgetService
-import im.vector.matrix.android.api.session.widgets.WidgetURLFormatter
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.widgets.WidgetPostAPIMediator
+import org.matrix.android.sdk.api.session.widgets.WidgetService
+import org.matrix.android.sdk.api.session.widgets.WidgetURLFormatter
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.util.Cancelable
 import javax.inject.Inject
 import javax.inject.Provider
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetURLFormatter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetURLFormatter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
index ffdc05203a..28bcf0021c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetURLFormatter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets
+package org.matrix.android.sdk.internal.session.widgets
 
-import im.vector.matrix.android.api.MatrixConfiguration
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerConfig
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService
-import im.vector.matrix.android.api.session.widgets.WidgetURLFormatter
-import im.vector.matrix.android.internal.session.SessionLifecycleObserver
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.integrationmanager.IntegrationManager
-import im.vector.matrix.android.internal.session.widgets.token.GetScalarTokenTask
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.api.session.widgets.WidgetURLFormatter
+import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManager
+import org.matrix.android.sdk.internal.session.widgets.token.GetScalarTokenTask
 import java.net.URLEncoder
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/RegisterWidgetResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/RegisterWidgetResponse.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/RegisterWidgetResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/RegisterWidgetResponse.kt
index af62525822..b1d08ab295 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/RegisterWidgetResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/RegisterWidgetResponse.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets
+package org.matrix.android.sdk.internal.session.widgets
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetManager.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
index 05c0b01f0e..cb9059b089 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,37 +15,37 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets
+package org.matrix.android.sdk.internal.session.widgets
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataTypes
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.android.api.session.widgets.WidgetManagementFailure
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.SessionLifecycleObserver
-import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.session.integrationmanager.IntegrationManager
-import im.vector.matrix.android.internal.session.room.state.StateEventDataSource
-import im.vector.matrix.android.internal.session.user.accountdata.AccountDataDataSource
-import im.vector.matrix.android.internal.session.widgets.helper.WidgetFactory
-import im.vector.matrix.android.internal.session.widgets.helper.extractWidgetSequence
-import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.launchToCallback
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.widgets.WidgetManagementFailure
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManager
+import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
+import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataDataSource
+import org.matrix.android.sdk.internal.session.widgets.helper.WidgetFactory
+import org.matrix.android.sdk.internal.session.widgets.helper.extractWidgetSequence
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.launchToCallback
 import java.util.HashMap
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetModule.kt
similarity index 75%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetModule.kt
index 79c2ac0dbb..56b2d94701 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +15,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets
+package org.matrix.android.sdk.internal.session.widgets
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.session.widgets.WidgetPostAPIMediator
-import im.vector.matrix.android.api.session.widgets.WidgetService
-import im.vector.matrix.android.api.session.widgets.WidgetURLFormatter
-import im.vector.matrix.android.internal.session.widgets.token.DefaultGetScalarTokenTask
-import im.vector.matrix.android.internal.session.widgets.token.GetScalarTokenTask
+import org.matrix.android.sdk.api.session.widgets.WidgetPostAPIMediator
+import org.matrix.android.sdk.api.session.widgets.WidgetService
+import org.matrix.android.sdk.api.session.widgets.WidgetURLFormatter
+import org.matrix.android.sdk.internal.session.widgets.token.DefaultGetScalarTokenTask
+import org.matrix.android.sdk.internal.session.widgets.token.GetScalarTokenTask
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetPostMessageAPIProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetPostMessageAPIProvider.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetPostMessageAPIProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetPostMessageAPIProvider.kt
index 4f34960f4b..5b26415ce5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetPostMessageAPIProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetPostMessageAPIProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets
+package org.matrix.android.sdk.internal.session.widgets
 
 import android.content.Context
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
similarity index 72%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
index f798e7e25b..bfcd27b28a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.session.widgets
+package org.matrix.android.sdk.internal.session.widgets
 
-import im.vector.matrix.android.internal.session.openid.RequestOpenIdTokenResponse
+import org.matrix.android.sdk.internal.session.openid.RequestOpenIdTokenResponse
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -30,8 +31,10 @@ internal interface WidgetsAPI {
      * @param body the body content (Ref: https://github.com/matrix-org/matrix-doc/pull/1961)
      */
     @POST("register")
-    fun register(@Body body: RequestOpenIdTokenResponse, @Query("v") version: String?): Call<RegisterWidgetResponse>
+    fun register(@Body body: RequestOpenIdTokenResponse,
+                 @Query("v") version: String?): Call<RegisterWidgetResponse>
 
     @GET("account")
-    fun validateToken(@Query("scalar_token") scalarToken: String?, @Query("v") version: String?): Call<Unit>
+    fun validateToken(@Query("scalar_token") scalarToken: String?,
+                      @Query("v") version: String?): Call<Unit>
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPIProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPIProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt
index 05d10dee56..cbbc11bb93 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPIProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets
+package org.matrix.android.sdk.internal.session.widgets
 
 import dagger.Lazy
-import im.vector.matrix.android.internal.di.Unauthenticated
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.session.SessionScope
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.session.SessionScope
 import okhttp3.OkHttpClient
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/helper/UserAccountWidgets.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt
similarity index 69%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/helper/UserAccountWidgets.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt
index 7f64c8a81e..f6dafd0553 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/helper/UserAccountWidgets.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets.helper
+package org.matrix.android.sdk.internal.session.widgets.helper
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
-import im.vector.matrix.android.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 
 internal fun UserAccountDataEvent.extractWidgetSequence(widgetFactory: WidgetFactory): Sequence<Widget> {
     return content.asSequence()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/helper/WidgetFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/helper/WidgetFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
index 4091b6defd..2cbc9b23dc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/helper/WidgetFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets.helper
+package org.matrix.android.sdk.internal.session.widgets.helper
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.matrix.android.api.session.widgets.model.WidgetContent
-import im.vector.matrix.android.api.session.widgets.model.WidgetType
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.di.UserId
-import im.vector.matrix.android.internal.session.room.membership.RoomMemberHelper
-import im.vector.matrix.android.internal.session.user.UserDataSource
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.session.widgets.model.WidgetContent
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.internal.session.user.UserDataSource
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import java.net.URLEncoder
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/token/GetScalarTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/token/GetScalarTokenTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
index 7afff00d64..58b0c61060 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/token/GetScalarTokenTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets.token
+package org.matrix.android.sdk.internal.session.widgets.token
 
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.openid.GetOpenIdTokenTask
-import im.vector.matrix.android.internal.session.widgets.RegisterWidgetResponse
-import im.vector.matrix.android.api.session.widgets.WidgetManagementFailure
-import im.vector.matrix.android.internal.session.widgets.WidgetsAPI
-import im.vector.matrix.android.internal.session.widgets.WidgetsAPIProvider
-import im.vector.matrix.android.internal.task.Task
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.openid.GetOpenIdTokenTask
+import org.matrix.android.sdk.internal.session.widgets.RegisterWidgetResponse
+import org.matrix.android.sdk.api.session.widgets.WidgetManagementFailure
+import org.matrix.android.sdk.internal.session.widgets.WidgetsAPI
+import org.matrix.android.sdk.internal.session.widgets.WidgetsAPIProvider
+import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 import javax.net.ssl.HttpsURLConnection
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/token/ScalarTokenStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/ScalarTokenStore.kt
similarity index 77%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/token/ScalarTokenStore.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/ScalarTokenStore.kt
index 9c5f39d683..a6f8b3c890 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/token/ScalarTokenStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/ScalarTokenStore.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.session.widgets.token
+package org.matrix.android.sdk.internal.session.widgets.token
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.model.ScalarTokenEntity
-import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.util.awaitTransaction
-import im.vector.matrix.android.internal.util.fetchCopyMap
+import org.matrix.android.sdk.internal.database.model.ScalarTokenEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.fetchCopyMap
 import javax.inject.Inject
 
 internal class ScalarTokenStore @Inject constructor(@SessionDatabase private val monarchy: Monarchy) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/ConfigurableTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/ConfigurableTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
index dce6f5f951..050f0ba295 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/ConfigurableTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.task
+package org.matrix.android.sdk.internal.task
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 import java.util.UUID
 
 internal fun <PARAMS, RESULT> Task<PARAMS, RESULT>.configureWith(params: PARAMS,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/CoroutineSequencer.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineSequencer.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/CoroutineSequencer.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineSequencer.kt
index 46cc446b87..2fde8478ec 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/CoroutineSequencer.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineSequencer.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.task
+package org.matrix.android.sdk.internal.task
 
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/CoroutineToCallback.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineToCallback.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/CoroutineToCallback.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineToCallback.kt
index 07ab21a743..233d50c695 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/CoroutineToCallback.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineToCallback.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.task
+package org.matrix.android.sdk.internal.task
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.extensions.foldToCallback
-import im.vector.matrix.android.internal.util.toCancelable
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.extensions.foldToCallback
+import org.matrix.android.sdk.internal.util.toCancelable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/Task.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/Task.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
index de0f3dfbdd..a9e7ab2d73 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/Task.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.task
+package org.matrix.android.sdk.internal.task
 
 internal interface Task<PARAMS, RESULT> {
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
index fc599d2939..a3c815bbe8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskExecutor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +15,13 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.task
+package org.matrix.android.sdk.internal.task
 
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.di.MatrixScope
-import im.vector.matrix.android.internal.extensions.foldToCallback
-import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
-import im.vector.matrix.android.internal.util.toCancelable
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.di.MatrixScope
+import org.matrix.android.sdk.internal.extensions.foldToCallback
+import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.toCancelable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskThread.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskThread.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskThread.kt
index 8da15fc3d3..3b9c69bccb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/task/TaskThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskThread.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.task
+package org.matrix.android.sdk.internal.task
 
 internal enum class TaskThread {
     MAIN,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/BackgroundDetectionObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/BackgroundDetectionObserver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt
index b8de50b9fc..0a15f09719 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/BackgroundDetectionObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
-import im.vector.matrix.android.internal.di.MatrixScope
+import org.matrix.android.sdk.internal.di.MatrixScope
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CancelableCoroutine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableCoroutine.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CancelableCoroutine.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableCoroutine.kt
index 53bec0d621..beede69759 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CancelableCoroutine.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableCoroutine.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Cancelable
 import kotlinx.coroutines.Job
 
 internal fun Job.toCancelable(): Cancelable {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CancelableWork.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CancelableWork.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt
index e1a21ff8c5..fccfda15e5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CancelableWork.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import androidx.work.WorkManager
-import im.vector.matrix.android.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Cancelable
 import java.util.UUID
 
 internal class CancelableWork(private val workManager: WorkManager,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CompatUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CompatUtil.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt
index e8283c359f..6583dc89ea 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CompatUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
 
 @file:Suppress("DEPRECATION")
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -26,7 +27,6 @@ import android.security.KeyPairGeneratorSpec
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import android.util.Base64
-import androidx.annotation.RequiresApi
 import androidx.core.content.edit
 import timber.log.Timber
 import java.io.IOException
@@ -47,7 +47,6 @@ import java.security.cert.CertificateException
 import java.security.spec.AlgorithmParameterSpec
 import java.security.spec.RSAKeyGenParameterSpec
 import java.util.Calendar
-import java.util.zip.GZIPOutputStream
 import javax.crypto.Cipher
 import javax.crypto.CipherInputStream
 import javax.crypto.CipherOutputStream
@@ -81,22 +80,6 @@ object CompatUtil {
      */
     private val prng: SecureRandom by lazy(LazyThreadSafetyMode.NONE) { SecureRandom() }
 
-    /**
-     * Create a GZIPOutputStream instance
-     * Special treatment on KitKat device, force the syncFlush param to false
-     * Before Kitkat, this param does not exist and after Kitkat it is set to false by default
-     *
-     * @param outputStream the output stream
-     */
-    @Throws(IOException::class)
-    fun createGzipOutputStream(outputStream: OutputStream): GZIPOutputStream {
-        return if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
-            GZIPOutputStream(outputStream, false)
-        } else {
-            GZIPOutputStream(outputStream)
-        }
-    }
-
     /**
      * Returns the AES key used for local storage encryption/decryption with AES/GCM.
      * The key is created if it does not exist already in the keystore.
@@ -106,7 +89,6 @@ object CompatUtil {
      *
      * @param context the context holding the application shared preferences
      */
-    @RequiresApi(Build.VERSION_CODES.KITKAT)
     @Synchronized
     @Throws(KeyStoreException::class,
             CertificateException::class,
@@ -248,10 +230,6 @@ object CompatUtil {
             KeyStoreException::class,
             IllegalBlockSizeException::class)
     fun createCipherOutputStream(out: OutputStream, context: Context): OutputStream? {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-            return out
-        }
-
         val keyAndVersion = getAesGcmLocalProtectionKey(context)
 
         val cipher = Cipher.getInstance(AES_GCM_CIPHER_TYPE)
@@ -297,10 +275,6 @@ object CompatUtil {
             InvalidAlgorithmParameterException::class,
             IOException::class)
     fun createCipherInputStream(`in`: InputStream, context: Context): InputStream? {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-            return `in`
-        }
-
         val iv_len = `in`.read()
         if (iv_len != AES_GCM_IV_LENGTH) {
             Timber.e(TAG, "Invalid IV length $iv_len")
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Debouncer.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Debouncer.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Debouncer.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Debouncer.kt
index 575551da1b..46ba75968c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Debouncer.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Debouncer.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import android.os.Handler
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Exhaustive.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Exhaustive.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Exhaustive.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Exhaustive.kt
index 8f6beea92d..eaf17b9ae0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Exhaustive.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Exhaustive.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 // Trick to ensure that when block is exhaustive
 internal val <T> T.exhaustive: T get() = this
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/FileSaver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/FileSaver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt
index f1d6b3eb0d..27625d90bc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/FileSaver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import androidx.annotation.WorkerThread
 import java.io.File
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Handler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Handler.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Handler.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Handler.kt
index 5db1c46dd3..7d103e1031 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Handler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Handler.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import android.os.Handler
 import android.os.HandlerThread
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Hash.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Hash.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt
index e748ad2778..f8c22afb30 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Hash.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import java.security.MessageDigest
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/JsonCanonicalizer.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/JsonCanonicalizer.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/JsonCanonicalizer.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/JsonCanonicalizer.kt
index e35dff5367..4a15f2ff98 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/JsonCanonicalizer.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/JsonCanonicalizer.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import androidx.annotation.VisibleForTesting
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/LiveDataUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LiveDataUtils.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/LiveDataUtils.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LiveDataUtils.kt
index 75fae162a5..9c38729fe4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/LiveDataUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LiveDataUtils.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MatrixCoroutineDispatchers.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MatrixCoroutineDispatchers.kt
index 503a4aa910..d66a38d346 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MatrixCoroutineDispatchers.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import kotlinx.coroutines.CoroutineDispatcher
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Monarchy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Monarchy.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt
index 848cc43565..81f5af9ac6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Monarchy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import com.zhuinden.monarchy.Monarchy
-import im.vector.matrix.android.internal.database.awaitTransaction
+import org.matrix.android.sdk.internal.database.awaitTransaction
 import io.realm.Realm
 import io.realm.RealmModel
 import java.util.concurrent.atomic.AtomicReference
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/SecretKeyAndVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SecretKeyAndVersion.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/SecretKeyAndVersion.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SecretKeyAndVersion.kt
index 6accb520a0..d96be91618 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/SecretKeyAndVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SecretKeyAndVersion.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import javax.crypto.SecretKey
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/StringProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/StringProvider.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
index 61bb575c7d..902d7d3316 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/StringProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import android.content.res.Resources
 import androidx.annotation.ArrayRes
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/StringUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/StringUtils.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
index b3f240f23d..a236771cd6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/StringUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import timber.log.Timber
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/SuspendMatrixCallback.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SuspendMatrixCallback.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/SuspendMatrixCallback.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SuspendMatrixCallback.kt
index e76137d0c2..0595d68c3b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/SuspendMatrixCallback.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SuspendMatrixCallback.kt
@@ -1,6 +1,7 @@
 /*
 
   * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -15,9 +16,9 @@
   * limitations under the License.
 
  */
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
-import im.vector.matrix.android.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixCallback
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/UrlUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/UrlUtils.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/UrlUtils.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/UrlUtils.kt
index bb5799baf1..da155c8bdd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/UrlUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/UrlUtils.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.util
+package org.matrix.android.sdk.internal.util
 
 import java.net.URL
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/wellknown/GetWellknownTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/wellknown/GetWellknownTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
index b42aef5f88..e20fe9a304 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/wellknown/GetWellknownTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +15,24 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.wellknown
+package org.matrix.android.sdk.internal.wellknown
 
 import android.util.MalformedJsonException
 import dagger.Lazy
-import im.vector.matrix.android.api.MatrixPatterns
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.auth.data.WellKnown
-import im.vector.matrix.android.api.auth.wellknown.WellknownResult
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.internal.di.Unauthenticated
-import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.network.httpclient.addSocketFactory
-import im.vector.matrix.android.internal.network.ssl.UnrecognizedCertificateException
-import im.vector.matrix.android.internal.session.homeserver.CapabilitiesAPI
-import im.vector.matrix.android.internal.session.identity.IdentityAuthAPI
-import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.isValidUrl
+import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.WellKnown
+import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.httpclient.addSocketFactory
+import org.matrix.android.sdk.internal.network.ssl.UnrecognizedCertificateException
+import org.matrix.android.sdk.internal.session.homeserver.CapabilitiesAPI
+import org.matrix.android.sdk.internal.session.identity.IdentityAuthAPI
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.isValidUrl
 import okhttp3.OkHttpClient
 import java.io.EOFException
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/wellknown/WellKnownAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/wellknown/WellKnownAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt
index ec62707db7..7d88614809 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/wellknown/WellKnownAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.wellknown
+package org.matrix.android.sdk.internal.wellknown
 
-import im.vector.matrix.android.api.auth.data.WellKnown
+import org.matrix.android.sdk.api.auth.data.WellKnown
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/wellknown/WellknownModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellknownModule.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/wellknown/WellknownModule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellknownModule.kt
index 2705803fec..ab42223755 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/wellknown/WellknownModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellknownModule.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.wellknown
+package org.matrix.android.sdk.internal.wellknown
 
 import dagger.Binds
 import dagger.Module
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/AlwaysSuccessfulWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/AlwaysSuccessfulWorker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt
index 136e84d945..d0fc7df098 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/AlwaysSuccessfulWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.worker
+package org.matrix.android.sdk.internal.worker
 
 import android.content.Context
 import androidx.work.Worker
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/DelegateWorkerFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/DelegateWorkerFactory.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/DelegateWorkerFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/DelegateWorkerFactory.kt
index 2029596b0b..e711b0d686 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/DelegateWorkerFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/DelegateWorkerFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.worker
+package org.matrix.android.sdk.internal.worker
 
 import android.content.Context
 import androidx.work.ListenableWorker
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Extensions.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/Extensions.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Extensions.kt
index dab7162581..8f824a76b8 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Extensions.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.worker
+package org.matrix.android.sdk.internal.worker
 
 import androidx.work.OneTimeWorkRequest
-import im.vector.matrix.android.internal.session.room.send.NoMerger
+import org.matrix.android.sdk.internal.session.room.send.NoMerger
 
 /**
  * If startChain parameter is true, the builder will have a inputMerger set to [NoMerger]
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/MatrixWorkerFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/MatrixWorkerFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
index 3a676d30ae..509cecf022 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/MatrixWorkerFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.worker
+package org.matrix.android.sdk.internal.worker
 
 import android.content.Context
 import androidx.work.ListenableWorker
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/SessionWorkerParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionWorkerParams.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/SessionWorkerParams.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionWorkerParams.kt
index 3cbe6c7866..840cda3dec 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/SessionWorkerParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionWorkerParams.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.worker
+package org.matrix.android.sdk.internal.worker
 
 /**
  * Note about the Worker usage:
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/Worker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Worker.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/Worker.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Worker.kt
index 88680786ad..9f40d6aa05 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/Worker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Worker.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.worker
+package org.matrix.android.sdk.internal.worker
 
 import androidx.work.ListenableWorker
-import im.vector.matrix.android.api.Matrix
-import im.vector.matrix.android.internal.session.SessionComponent
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.internal.session.SessionComponent
 
 internal fun ListenableWorker.getSessionComponent(sessionId: String): SessionComponent? {
     return Matrix.getInstance(applicationContext).sessionManager.getSessionComponent(sessionId)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/WorkerParamsFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/WorkerParamsFactory.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
index 03a6d78c98..2b7cba0b0c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/worker/WorkerParamsFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.worker
+package org.matrix.android.sdk.internal.worker
 
 import androidx.work.Data
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.MoshiProvider
 
 object WorkerParamsFactory {
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXDeviceInfo.java b/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXDeviceInfo.java
index 7065d05c67..3811cf65cd 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXDeviceInfo.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXDeviceInfo.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXOlmInboundGroupSession2.java b/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXOlmInboundGroupSession2.java
index a8f70d1ec2..51c1fe2f1e 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXOlmInboundGroupSession2.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXOlmInboundGroupSession2.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
index 4400dcd9b6..c8e70a9b20 100644
--- a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
@@ -21,4 +21,275 @@
     <string name="notice_room_name_changed">%1$s রুম এর নাম এতে পরিবর্তন করেছে: %2$s</string>
     <string name="notice_placed_video_call">%s একটি ভিডিও কল স্থাপন করেছিল।</string>
     <string name="notice_placed_voice_call">%s একটি ভয়েস কল দিয়েছে।</string>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_you_sent_image">আপনি একটি ছবি প্রেরণ করেছেন।</string>
+    <string name="summary_you_sent_sticker">আপনি একটি স্তিকার পাঠিয়েছেন।</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">আপনার আমন্ত্রণ</string>
+    <string name="notice_room_created">%1$s কক্ষটি তৈরি করেছেন</string>
+    <string name="notice_room_created_by_you">আপনি কক্ষটি তৈরি করেছেন</string>
+    <string name="notice_room_invite_by_you">আপনি %1$s কে আমন্ত্রিত করেছেন</string>
+    <string name="notice_room_join_by_you">আপনি কক্ষে যোগ দিয়েছেন</string>
+    <string name="notice_room_leave_by_you">আপনি কক্ষ ছেড়ে দিয়েছেন</string>
+    <string name="notice_room_reject_by_you">আপনি আমন্ত্রণটি বাতিল করেছেন</string>
+    <string name="notice_room_kick_by_you">আপনি %1$s কে কীক করেছেন</string>
+    <string name="notice_room_unban_by_you">আপনি %1$s কে নিষিদ্ধ মুক্ত করেছেন</string>
+    <string name="notice_room_ban_by_you">আপনি %1$s কে নিষিদ্ধ করেছেন</string>
+    <string name="notice_room_withdraw_by_you">আপনি %1$s এর আমন্ত্রণ প্রত্যাহার করেছেন</string>
+    <string name="notice_avatar_url_changed_by_you">আপনি আপনার অবতারটি পরিবর্তন করেছেন</string>
+    <string name="notice_display_name_set_by_you">আপনি আপনার প্রদর্শনের নামটি %1$s তে সেট করেছেন</string>
+    <string name="notice_display_name_changed_from_by_you">আপনি আপনার প্রদর্শনের নামটি %1$s থেকে %2$s এ পরিবর্তন করেছেন</string>
+    <string name="notice_display_name_removed_by_you">আপনি আপনার প্রদর্শনের নামটি সরিয়ে দিয়েছেন (যেটা ছিল %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">আপনি বিষয়টিকে এতে পরিবর্তন করেছেন: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s কক্ষের অবতারটি পরিবর্তন করেছে</string>
+    <string name="notice_room_avatar_changed_by_you">আপনি কক্ষের অবতারটি পরিবর্তন করেছেন</string>
+    <string name="notice_room_name_changed_by_you">আপনি কক্ষের নাম এতে পরিবর্তন করেছেন:%1$s</string>
+    <string name="notice_placed_video_call_by_you">আপনি একটি ভিডিও কল করেছেন।</string>
+    <string name="notice_placed_voice_call_by_you">আপনি একটি ভয়েস কল দিয়েছেন।</string>
+    <string name="notice_call_candidates">কল সেটআপ করার জন্য %s ডেটা প্রেরণ করেছে।</string>
+    <string name="notice_call_candidates_by_you">আপনি কল সেটআপ করার জন্য ডেটা প্রেরণ করেছেন।</string>
+    <string name="notice_answered_call">%s কলটির উত্তর দিয়েছে।</string>
+    <string name="notice_answered_call_by_you">আপনি কলটি উত্তর দিয়েছেন।</string>
+    <string name="notice_ended_call">%s কলটি শেষ করেছেন।</string>
+    <string name="notice_ended_call_by_you">আপনি কলটি শেষ করেছেন।</string>
+    <string name="notice_made_future_room_visibility">%1$s ভবিষ্যতের ঘরের ইতিহাস %2$s এর কাছে দৃশ্যমান করে তুলেছে</string>
+    <string name="notice_made_future_room_visibility_by_you">আপনি ভবিষ্যতের কক্ষ ইতিহাস %1$s এর কাছে দৃশ্যমান করেছেন</string>
+    <string name="notice_room_visibility_invited">কক্ষের সমস্ত সদস্য, যখন থেকে তারা আমন্ত্রিত।</string>
+    <string name="notice_room_visibility_joined">কক্ষের সমস্ত সদস্য, যখন থেকে তারা যোগদান করেছিল।</string>
+    <string name="notice_room_visibility_shared">সমস্ত কক্ষের সদস্য।</string>
+    <string name="notice_room_visibility_world_readable">যে কেউ।</string>
+    <string name="notice_room_visibility_unknown">অজানা (%s)।</string>
+    <string name="notice_end_to_end">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে (%2$s)</string>
+    <string name="notice_end_to_end_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (%1$s)</string>
+    <string name="notice_room_update">%s এই কক্ষটিকে আপগ্রেড করেছে।</string>
+    <string name="notice_room_update_by_you">আপনি এই কক্ষটি আপগ্রেড করেছেন।</string>
+
+    <string name="notice_requested_voip_conference">%1$s একটি ভিওআইপি সম্মেলনের জন্য অনুরোধ করেছে</string>
+    <string name="notice_requested_voip_conference_by_you">আপনি একটি ভিওআইপি সম্মেলনের অনুরোধ করেছেন</string>
+    <string name="notice_voip_started">ভিওআইপি সম্মেলন শুরু হয়েছে</string>
+    <string name="notice_voip_finished">ভিওআইপি সম্মেলন শেষ হয়েছে</string>
+
+    <string name="notice_avatar_changed_too">(আবতারটিও পরিবর্তন করা হয়েছিল)</string>
+    <string name="notice_room_name_removed">%1$s কক্ষের নাম সরিয়েছে</string>
+    <string name="notice_room_name_removed_by_you">আপনি কক্ষের নাম সরিয়েছেন</string>
+    <string name="notice_room_topic_removed">%1$s কক্ষের বিষয় মুছে ফেলেছে</string>
+    <string name="notice_room_topic_removed_by_you">আপনি কক্ষের বিষয়টিকে সরিয়ে দিয়েছেন</string>
+    <string name="notice_room_avatar_removed">%1$s কক্ষের অবতার সরিয়ে নিয়েছে</string>
+    <string name="notice_room_avatar_removed_by_you">আপনি কক্ষের অবতার সরিয়েছেন</string>
+    <string name="notice_event_redacted">বার্তা সরানো হয়েছে</string>
+    <string name="notice_event_redacted_by">%1$s দ্বারা বার্তা সরানো হয়েছে</string>
+    <string name="notice_event_redacted_with_reason">বার্তা সরানো হয়েছে [কারণ:%1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">%1$s দ্বারা বার্তা সরানো হয়েছে [কারণ: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s তাদের প্রোফাইল %2$s আপডেট করেছে</string>
+    <string name="notice_profile_change_redacted_by_you">আপনি আপনার প্রোফাইল %1$s আপডেট করেছেন</string>
+    <string name="notice_room_third_party_invite">%1$s %2$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ পাঠিয়েছে</string>
+    <string name="notice_room_third_party_invite_by_you">আপনি %1$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ প্রেরণ করেছেন</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s %2$s এর কক্ষে যোগদানের আমন্ত্রণ বাতিল করে দিয়েছিল</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">আপনি %1$s এর কক্ষে যোগদানের জন্য আমন্ত্রণটি বাতিল করেছেন</string>
+    <string name="notice_room_third_party_registered_invite">%1$s %2$s এর জন্য আমন্ত্রণটি গ্রহণ করেছে</string>
+    <string name="notice_room_third_party_registered_invite_by_you">আপনি %1$s এর জন্য আমন্ত্রণটি গ্রহণ করেছেন</string>
+
+    <string name="notice_widget_added">%1$s %2$s উইজেট যুক্ত করেছে</string>
+    <string name="notice_widget_added_by_you">আপনি %1$s উইজেট যুক্ত করেছেন</string>
+    <string name="notice_widget_removed">%1$s %2$s উইজেট সরিয়ে দিয়েছেন</string>
+    <string name="notice_widget_removed_by_you">আপনি %1$s উইজেট সরিয়েছেন</string>
+    <string name="notice_widget_modified">%1$s %2$s উইজেট পরিবর্তন করেছেন</string>
+    <string name="notice_widget_modified_by_you">আপনি %1$s উইজেট পরিবর্তন করেছেন</string>
+
+    <string name="power_level_admin">অ্যাডমিন</string>
+    <string name="power_level_moderator">নিয়ামক</string>
+    <string name="power_level_default">ডিফল্ট</string>
+    <string name="power_level_custom">কাস্টম (%1$d)</string>
+    <string name="power_level_custom_no_value">কাস্টম</string>
+
+    <string name="notice_power_level_changed_by_you">আপনি %1$s এর পাওয়ার স্তর পরিবর্তন করেছেন।</string>
+    <string name="notice_power_level_changed">%1$s %2$s এর পাওয়ার স্তর পরিবর্তন করেছে।</string>
+    <string name="notice_power_level_diff">%1$s %2$s থেকে %3$s পর্যন্ত</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** ডিক্রিপ্ট করতে অক্ষম: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">প্রেরকের ডিভাইস আমাদের এই বার্তার জন্য কীগুলি প্রেরণ করেনি।</string>
+
+    <string name="could_not_redact">পুনরায় প্রতিক্রিয়া করতে পারেনি</string>
+    <string name="unable_to_send_message">বার্তা পাঠাতে অক্ষম</string>
+
+    <string name="message_failed_to_upload">চিত্র আপলোড করতে ব্যর্থ</string>
+
+    <string name="network_error">নেটওয়ার্ক ত্রুটি</string>
+    <string name="matrix_error">ম্যাট্রিক্স ত্রুটি</string>
+
+    <string name="room_error_join_failed_empty_room">খালি কক্ষে পুনরায় যোগদান করা বর্তমানে সম্ভব নয়।</string>
+
+    <string name="encrypted_message">এনক্রিপ্ট করা বার্তা</string>
+
+    <string name="medium_email">ইমেল ঠিকানা</string>
+    <string name="medium_phone_number">ফোন নম্বর</string>
+
+    <string name="room_displayname_invite_from">%s থেকে আমন্ত্রণ করুন</string>
+    <string name="room_displayname_room_invite">কক্ষ আমন্ত্রণ</string>
+
+    <string name="room_displayname_two_members">%1$s এবং %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s এবং অন্য ১ জন</item>
+        <item quantity="other">%1$s এবং অন্যান্য %2$d জন</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">খালি কক্ষ</string>
+
+
+    <string name="verification_emoji_dog">কুকুর</string>
+    <string name="verification_emoji_cat">বেড়াল</string>
+    <string name="verification_emoji_lion">সিংহ</string>
+    <string name="verification_emoji_horse">ঘোড়া</string>
+    <string name="verification_emoji_unicorn">ইউনিকর্ন</string>
+    <string name="verification_emoji_pig">শূকর</string>
+    <string name="verification_emoji_elephant">হাতি</string>
+    <string name="verification_emoji_rabbit">খরগোশ</string>
+    <string name="verification_emoji_panda">পান্ডা</string>
+    <string name="verification_emoji_rooster">গৃহপালিত মোরগ</string>
+    <string name="verification_emoji_penguin">পেংগুইন</string>
+    <string name="verification_emoji_turtle">কচ্ছপ</string>
+    <string name="verification_emoji_fish">মাছ</string>
+    <string name="verification_emoji_octopus">অক্টোপাস</string>
+    <string name="verification_emoji_butterfly">প্রজাপতি</string>
+    <string name="verification_emoji_flower">ফুল</string>
+    <string name="verification_emoji_tree">গাছ</string>
+    <string name="verification_emoji_cactus">ফণীমনসা</string>
+    <string name="verification_emoji_mushroom">মাশরুম</string>
+    <string name="verification_emoji_globe">পৃথিবী</string>
+    <string name="verification_emoji_moon">চন্দ্র</string>
+    <string name="verification_emoji_cloud">মেঘ</string>
+    <string name="verification_emoji_fire">আগুন</string>
+    <string name="verification_emoji_banana">কলা</string>
+    <string name="verification_emoji_apple">আপেল</string>
+    <string name="verification_emoji_strawberry">স্ট্রবেরি</string>
+    <string name="verification_emoji_corn">ভূট্টা</string>
+    <string name="verification_emoji_pizza">পিজা</string>
+    <string name="verification_emoji_cake">কেক</string>
+    <string name="verification_emoji_heart">হৃদয়</string>
+    <string name="verification_emoji_smiley">স্মাইলি</string>
+    <string name="verification_emoji_robot">রোবট</string>
+    <string name="verification_emoji_hat">টুপি</string>
+    <string name="verification_emoji_glasses">চশমা</string>
+    <string name="verification_emoji_wrench">রেঞ্চ</string>
+    <string name="verification_emoji_santa">সান্তা</string>
+    <string name="verification_emoji_thumbsup">থাম্বস আপ</string>
+    <string name="verification_emoji_umbrella">ছাতা</string>
+    <string name="verification_emoji_hourglass">বালিঘড়ি</string>
+    <string name="verification_emoji_clock">ঘড়ি</string>
+    <string name="verification_emoji_gift">উপহার</string>
+    <string name="verification_emoji_lightbulb">আলো বালব</string>
+    <string name="verification_emoji_book">বই</string>
+    <string name="verification_emoji_pencil">পেন্সিল</string>
+    <string name="verification_emoji_paperclip">পেপার ক্লিপ</string>
+    <string name="verification_emoji_scissors">কাঁচি</string>
+    <string name="verification_emoji_lock">লক</string>
+    <string name="verification_emoji_key">চাবি</string>
+    <string name="verification_emoji_hammer">হাতুড়ি</string>
+    <string name="verification_emoji_telephone">টেলিফোন</string>
+    <string name="verification_emoji_flag">পতাকা</string>
+    <string name="verification_emoji_train">রেলগাড়ি</string>
+    <string name="verification_emoji_bicycle">সাইকেল</string>
+    <string name="verification_emoji_airplane">বিমান</string>
+    <string name="verification_emoji_rocket">রকেট</string>
+    <string name="verification_emoji_trophy">ট্রফি</string>
+    <string name="verification_emoji_ball">বল</string>
+    <string name="verification_emoji_guitar">গিটার</string>
+    <string name="verification_emoji_trumpet">ট্রাম্পেট</string>
+    <string name="verification_emoji_bell">ঘণ্টা</string>
+    <string name="verification_emoji_anchor">নোঙ্গর</string>
+    <string name="verification_emoji_headphone">হেডফোন</string>
+    <string name="verification_emoji_folder">ফোল্ডার</string>
+    <string name="verification_emoji_pin">পিন</string>
+
+    <string name="initial_sync_start_importing_account">প্রাথমিক সিঙ্ক:
+\nঅ্যাকাউন্ট আমদানি করা হচ্ছে…</string>
+    <string name="initial_sync_start_importing_account_crypto">প্রাথমিক সিঙ্ক:
+\nক্রিপ্টো আমদানি হচ্ছে</string>
+    <string name="initial_sync_start_importing_account_rooms">প্রাথমিক সিঙ্ক:
+\nকক্ষগুলি আমদানি করা হচ্ছে</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">প্রাথমিক সিঙ্ক:
+\nযোগ করা কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">প্রাথমিক সিঙ্ক:
+\nআমন্ত্রিত করা কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
+    <string name="initial_sync_start_importing_account_left_rooms">প্রাথমিক সিঙ্ক:
+\nছেড়ে দেওয়া কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
+    <string name="initial_sync_start_importing_account_groups">প্রাথমিক সিঙ্ক:
+\nসম্প্রদায়গুলি আমদানি করা হচ্ছে</string>
+    <string name="initial_sync_start_importing_account_data">প্রাথমিক সিঙ্ক:
+\nঅ্যাকাউন্ট ডেটা আমদানি করা হচ্ছে</string>
+
+    <string name="event_status_sending_message">বার্তা প্রেরণ করা হচ্ছে …</string>
+    <string name="clear_timeline_send_queue">প্রেরণ সারি পরিষ্কার করুন</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s এর আমন্ত্রণ। কারণ: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">আপনার আমন্ত্রণ। কারণ: %1$s</string>
+    <string name="notice_room_invite_with_reason">%1$s আমন্ত্রিত করেছেন %2$s কে। কারণ: %3$s</string>
+    <string name="notice_room_invite_with_reason_by_you">আপনি %1$s কে আমন্ত্রিত করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s আপনাকে আমন্ত্রণ করেছে। কারণ: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s রুম এ যোগ দিয়েছে। কারণ: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">আপনি কক্ষে যোগ দিয়েছেন। কারণ: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s রুম ছেড়ে দিয়েছে। কারণ: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">আপনি কক্ষ ছেড়ে দিয়েছেন। কারণ: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s আমন্ত্রণ বাতিল করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">আপনি আমন্ত্রণটি বাতিল করেছেন। কারণ: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s %2$s কে কিক করেছে। কারণ: %2$s</string>
+    <string name="notice_room_kick_with_reason_by_you">আপনি %1$s কে কীক করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s %2$s কে নিষিদ্ধ তালিকা থেকে মুক্ত করেছে। কারণ: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">আপনি %1$s কে নিষিদ্ধ মুক্ত করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s %2$s কে নিষিদ্ধ করেছে। কারণ: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">আপনি %1$s কে নিষিদ্ধ করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s রুমের সাথে যোগ দিতে %2$s কে একটি আমন্ত্রণ পাঠিয়েছেন। কারণ: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">আপনি %1$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ প্রেরণ করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s %2$s এর কক্ষে যোগদানের আমন্ত্রণ বাতিল করে দিয়েছিল। কারণ: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">আপনি %1$s এর কক্ষে যোগদানের জন্য আমন্ত্রণটি বাতিল করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$s এর জন্য আমন্ত্রণ গ্রহণ করেছেন। কারণ: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">আপনি %1$s এর জন্য আমন্ত্রণটি গ্রহণ করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s %2$s এর আমন্ত্রণ ফেরত নিয়েছে। কারণ: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">আপনি %1$s এর আমন্ত্রণ প্রত্যাহার করেছেন। কারণ: %2$s</string>
+
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s যুক্ত করেছে।</item>
+        <item quantity="other">%1$s এই ঘরের ঠিকানাগুলি হিসাবে %2$s যুক্ত করেছে।</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">আপনি এই কক্ষের জন্য ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
+        <item quantity="other">আপনি এই কক্ষের ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s সরানো হয়েছে।</item>
+        <item quantity="other">%1$s %3$s কে এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">আপনি এই ঘরের ঠিকানা হিসাবে %1$s সরিয়েছেন।</item>
+        <item quantity="other">আপনি এই ঘরের ঠিকানা হিসাবে %2$s গুলি সরিয়েছেন।</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed">%1$s %2$s যোগ করেছে এবং %3$s গুলি এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">আপনি %1$s যোগ করেছেন এবং %2$s কে এই ঘরের ঠিকানা হিসাবে সরিয়ে দিয়েছেন।</string>
+
+    <string name="notice_room_canonical_alias_set">%1$s এই ঘরের মূল ঠিকানাটি %2$s তে সেট করে।</string>
+    <string name="notice_room_canonical_alias_set_by_you">আপনি এই ঘরের মূল ঠিকানাটি %1$s তে সেট করেছেন।</string>
+    <string name="notice_room_canonical_alias_unset">%1$s এই ঘরের মূল ঠিকানা সরিয়ে নিয়েছে।</string>
+    <string name="notice_room_canonical_alias_unset_by_you">আপনি এই ঘরের মূল ঠিকানা সরিয়েছেন।</string>
+
+    <string name="notice_room_guest_access_can_join">%1$s অতিথিদের ঘরে যোগদানের অনুমতি দিয়েছে।</string>
+    <string name="notice_room_guest_access_can_join_by_you">আপনি অতিথিদের ঘরে যোগদানের অনুমতি দিয়েছেন।</string>
+    <string name="notice_room_guest_access_forbidden">%1$s অতিথিদের ঘরে যোগদান করতে বাধা দিয়েছে।</string>
+    <string name="notice_room_guest_access_forbidden_by_you">আপনি অতিথিদের ঘরে যোগদান করতে বাধা দিয়েছেন।</string>
+
+    <string name="notice_end_to_end_ok">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে।</string>
+    <string name="notice_end_to_end_ok_by_you">আপনি শেষ থেকে শেষ এনক্রিপশন চালু করেছেন।</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে (অজানা অ্যালগরিদম %2$s)।</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (অজানা অ্যালগরিদম %1$s )।</string>
+
+    <string name="key_verification_request_fallback_message">%s আপনার কীটি যাচাই করার জন্য অনুরোধ করছে, তবে আপনার ক্লায়েন্ট ইন-চ্যাট কী যাচাইকরণ সমর্থন করে না। কীগুলি যাচাই করতে আপনাকে লিগ্যাসি কী যাচাইকরণ ব্যবহার করতে হবে।</string>
+
+    <string name="call_notification_answer">গ্রহণ</string>
+    <string name="call_notification_reject">পতন</string>
+    <string name="call_notification_hangup">বন্ধ করুন</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-de/strings.xml b/matrix-sdk-android/src/main/res/values-de/strings.xml
index 94da3369d8..0c857e78ee 100644
--- a/matrix-sdk-android/src/main/res/values-de/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-de/strings.xml
@@ -204,6 +204,103 @@
     <string name="notice_end_to_end_ok">%1$s aktivierte Ende-zu-Ende-Verschlüsselung.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s aktivierte Ende-zu-Ende-Verschlüsselung (unbekannter Algorithmus %2$s).</string>
 
-    <string name="key_verification_request_fallback_message">%s fordert zur Überprüfung Ihres Schlüssels auf, jedoch unterstützt Ihr Client nicht die Schlüsselüberprüfung im Chat. Sie müssen die herkömmliche Schlüsselüberprüfung verwenden, um die Schlüssel zu überprüfen.</string>
+    <string name="key_verification_request_fallback_message">%s fordert zur Überprüfung deines Schlüssels auf, jedoch unterstützt dein Client nicht die Schlüsselüberprüfung im Chat. Du musst die herkömmliche Schlüsselüberprüfung verwenden, um die Schlüssel zu überprüfen.</string>
 
+    <string name="summary_you_sent_image">Du hast ein Bild gesendet.</string>
+    <string name="summary_you_sent_sticker">Du hast einen Sticker gesendet.</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">Deine Einladung</string>
+    <string name="notice_room_created">%1$s hat den Raum erstellt</string>
+    <string name="notice_room_created_by_you">Du hast den Raum erstellt</string>
+    <string name="notice_room_invite_by_you">Du hast %1$s eingeladen</string>
+    <string name="notice_room_join_by_you">Du bist dem Raum beigetreten</string>
+    <string name="notice_room_leave_by_you">Du hast den Raum verlassen</string>
+    <string name="notice_room_reject_by_you">Du hast die Einladung abgelehnt</string>
+    <string name="notice_room_kick_by_you">Du hast %1$s aus dem Raum entfernt</string>
+    <string name="notice_room_unban_by_you">Du hast den Bann von %1$s aufgehoben</string>
+    <string name="notice_room_ban_by_you">Du hast %1$s gebannt</string>
+    <string name="notice_room_withdraw_by_you">Du hast die Einladung von %1$s zurückgenommen</string>
+    <string name="notice_avatar_url_changed_by_you">Du hast dein Profilbild geändert</string>
+    <string name="notice_display_name_set_by_you">Du hast deinen Anzeigenamen zu %1$s geändert</string>
+    <string name="notice_display_name_changed_from_by_you">Du hast deinen Anzeigenamen von %1$s zu %2$s geändert</string>
+    <string name="notice_display_name_removed_by_you">Du hast deinen Anzeigenamen entfernt (er war %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Du hast das Thema geändert auf: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s hat das Bild des Raumes geändert</string>
+    <string name="notice_room_avatar_changed_by_you">Du hast das Bild des Raumes geändert</string>
+    <string name="notice_room_name_changed_by_you">Du hast den Raumnamen zu %1$s geändert</string>
+    <string name="notice_placed_video_call_by_you">Du hast einen Videoanruf gestartet.</string>
+    <string name="notice_placed_voice_call_by_you">Du hast einen Audioanruf gestartet.</string>
+    <string name="notice_answered_call_by_you">Du hast den Anruf angenommen.</string>
+    <string name="notice_ended_call_by_you">Du hast den Anruf beendet.</string>
+    <string name="notice_made_future_room_visibility_by_you">Du hast den zukünftigen Nachrichtenverlauf für %1$s sichtbar gemacht</string>
+    <string name="notice_end_to_end_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert (%1$s)</string>
+    <string name="notice_room_update_by_you">Du hast den Raum aufgwertet.</string>
+
+    <string name="notice_requested_voip_conference_by_you">Du hast eine VoIP-Konferenz angefordert</string>
+    <string name="notice_room_name_removed_by_you">Du hast den Raumnamen entfernt</string>
+    <string name="notice_room_topic_removed_by_you">Du hast das Raumthema entfernt</string>
+    <string name="notice_room_avatar_removed">%1$s hat das Bild des Raumes entfernt</string>
+    <string name="notice_room_avatar_removed_by_you">Du hast das Bild des Raumes entfernt</string>
+    <string name="notice_profile_change_redacted_by_you">Du hast dein Profil %1$s aktualisiert</string>
+    <string name="notice_room_third_party_invite_by_you">Du hast %1$s in den Raum eingeladen</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Du hast die Einladung für %1$s zurückgenommen</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Du hast die Einladung für %1$s akzeptiert</string>
+
+    <string name="notice_widget_added">%1$s hat das %2$s Widget hinzugefügt</string>
+    <string name="notice_widget_added_by_you">Du hast das %1$s Widget hinzugefügt</string>
+    <string name="notice_widget_removed">%1$s hat das %2$s Widget entfernt</string>
+    <string name="notice_widget_removed_by_you">Du hast das %1$s Widget entfernt</string>
+    <string name="notice_widget_modified">%1$s hat das %2$s Widget modifiziert</string>
+    <string name="notice_widget_modified_by_you">Du hast das %1$s Widget modifiziert</string>
+
+    <string name="power_level_admin">Administrator</string>
+    <string name="power_level_moderator">Moderator</string>
+    <string name="power_level_default">Standard</string>
+    <string name="power_level_custom">Benutzerdefiniert (%1$d)</string>
+    <string name="power_level_custom_no_value">Benutzerdefiniert</string>
+
+    <string name="notice_power_level_changed_by_you">Du hast die Berechtigungsstufe von %1$s geändert.</string>
+    <string name="notice_power_level_changed">%1$s hat die Berechtigungsstufe von %2$s geändert.</string>
+    <string name="notice_power_level_diff">%1$s von %2$s zu %3$s</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Deine Einladung. Grund: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Du hast %1$s eingeladen. Grund: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Du bist dem Raum beigetreten. Grund: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Du hast den Raum verlassen. Grund: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Du hast die Einladung abgelehnt. Grund: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Du hast %1$s aus dem Raum entfernt. Grund %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Du hast den Bann von %1$s aufgehoben. Grund: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Du hast %1$s gebannt. Grund: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Du hast %1$s in den Raum eingeladen. Grund: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Du hast die Einladung für %1$s zurückgenommen. Grund: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Du hast die Einladung von %1$s angenommen. Grund: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Du hast die Einladung von %1$s abgelehnt. Grund: %2$s</string>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Du hast die Raumaddresse %1$s hinzugefügt.</item>
+        <item quantity="other">Du hast die Raumaddressen %1$s hinzugefügt.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Du hast die Raumaddresse %1$s vom Raum entfernt.</item>
+        <item quantity="other">Du hast die Raumaddressen %1$s vom Raum entfernt.</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed_by_you">Du hast den Raumaddressen %1$s hinzugefügt und %2$s entfernt.</string>
+
+    <string name="notice_room_canonical_alias_set_by_you">Du hast die Hauptaddresse für diesen Raum auf %1$s gesetzt.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Du hast die Hauptaddresse des Raums entfernt.</string>
+
+    <string name="notice_room_guest_access_can_join_by_you">Du hast Gästen erlaubt dem Raum beizutreten.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Du hast Gästen untersagt dem Raum beizutreten.</string>
+
+    <string name="notice_end_to_end_ok_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert (unbekannter Algorithmus %1$s).</string>
+
+    <string name="call_notification_answer">Akzeptiere</string>
+    <string name="call_notification_reject">Ablehnen</string>
+    <string name="call_notification_hangup">Anruf beenden</string>
+
+    <string name="notice_call_candidates">%s hat Daten gesendet, um einen Anruf zu starten.</string>
+    <string name="notice_call_candidates_by_you">Du hast Daten geschickt, um eine Anruf zu starten.</string>
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-et/strings.xml b/matrix-sdk-android/src/main/res/values-et/strings.xml
index 2536500247..b7cd202063 100644
--- a/matrix-sdk-android/src/main/res/values-et/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-et/strings.xml
@@ -110,7 +110,7 @@
     <string name="verification_emoji_heart">Süda</string>
     <string name="verification_emoji_smiley">Smaili</string>
     <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Müts</string>
+    <string name="verification_emoji_hat">Kübar</string>
     <string name="verification_emoji_glasses">Prillid</string>
     <string name="verification_emoji_wrench">Mutrivõti</string>
     <string name="verification_emoji_santa">Jõuluvana</string>
@@ -141,7 +141,7 @@
     <string name="verification_emoji_anchor">Ankur</string>
     <string name="verification_emoji_headphone">Kõrvaklapid</string>
     <string name="verification_emoji_folder">Kaust</string>
-    <string name="verification_emoji_pin">Knopka</string>
+    <string name="verification_emoji_pin">Nööpnõel</string>
 
     <string name="initial_sync_start_importing_account">Alglaadimine:
 \nImpordin kontot…</string>
@@ -199,4 +199,104 @@
     <string name="key_verification_request_fallback_message">%s soovib verifitseerida sinu võtmeid, kuid sinu kasutatav klient ei oska vestluse-sisest verifitseerimist teha. Sa pead kasutama traditsioonilist verifitseerimislahendust.</string>
 
     <string name="notice_room_created">Kasutaja %1$s lõi jututoa</string>
+    <string name="summary_you_sent_image">Sina saatsid pildi.</string>
+    <string name="summary_you_sent_sticker">Sina saatsid kleepsu.</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">Sinu kutse</string>
+    <string name="notice_room_created_by_you">Sa lõid jututoa</string>
+    <string name="notice_room_invite_by_you">Sina kutsusid kasutajat %1$s</string>
+    <string name="notice_room_join_by_you">Sina liitusid jututoaga</string>
+    <string name="notice_room_leave_by_you">Sina lahkusid jututoast</string>
+    <string name="notice_room_reject_by_you">Sina lükkasid kutse tagasi</string>
+    <string name="notice_room_kick_by_you">Sina müksasid %1$s välja</string>
+    <string name="notice_room_unban">%1$s taastas %2$s ligipääsu</string>
+    <string name="notice_room_unban_by_you">Sina taastasid %1$s ligipääsu</string>
+    <string name="notice_room_ban">%1$s keelas %1$s ligipääsu</string>
+    <string name="notice_room_ban_by_you">Sina keelasid %1$s ligipääsu</string>
+    <string name="notice_room_withdraw_by_you">Sina võtsid tagasi %1$s kutse</string>
+    <string name="notice_avatar_url_changed_by_you">Sina muutsid oma tunnuspilti</string>
+    <string name="notice_display_name_set_by_you">Sina määrasid oma kuvatavaks nimeks %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Sina muutsid senise kuvatava nime %1$s uueks nimeks %2$s</string>
+    <string name="notice_display_name_removed_by_you">Sina eemaldasid oma kuvatava nime (oli %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Sina muutsid uueks teemaks %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s muutis jututoa tunnuspilti</string>
+    <string name="notice_room_avatar_changed_by_you">Sina muutsid jututoa tunnuspilti</string>
+    <string name="notice_room_name_changed_by_you">Sina muutsid jututoa uueks nimeks %1$s</string>
+    <string name="notice_placed_video_call_by_you">Sa alustasid videokõnet.</string>
+    <string name="notice_placed_voice_call_by_you">Sa alustasid häälkõnet.</string>
+    <string name="notice_call_candidates">%s saatis info kõne algatamiseks.</string>
+    <string name="notice_call_candidates_by_you">Sa saatsid info kõne algatamiseks.</string>
+    <string name="notice_answered_call_by_you">Sa vastasid kõnele.</string>
+    <string name="notice_ended_call_by_you">Sa lõpetasid kõne.</string>
+    <string name="notice_made_future_room_visibility_by_you">Sa seadistasid, et tulevane jututoa ajalugu on nähtav kasutajale %1$s</string>
+    <string name="notice_end_to_end_by_you">Sa lülitasid sisse läbiva krüptimise (%1$s)</string>
+    <string name="notice_room_update_by_you">Sa uuendasid seda jututuba.</string>
+
+    <string name="notice_requested_voip_conference_by_you">Sa algatasid VoIP rühmakõne</string>
+    <string name="notice_room_name_removed_by_you">Sa eemaldasid jututoa nime</string>
+    <string name="notice_room_topic_removed_by_you">Sa eemaldasid jututoa teema</string>
+    <string name="notice_room_avatar_removed">%1$s eemaldas jututoa tunnuspildi</string>
+    <string name="notice_room_avatar_removed_by_you">Sa eemaldasid jututoa tunnuspildi</string>
+    <string name="notice_profile_change_redacted_by_you">Sa uuendasid oma profiili %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Sina saatsid kasutajale %1$s kutse jututoaga liitumiseks</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Sina võtsid vastu kutse %1$s nimel</string>
+
+    <string name="notice_widget_added">%1$s lisas %2$s vidina</string>
+    <string name="notice_widget_added_by_you">Sina lisasid %1$s vidina</string>
+    <string name="notice_widget_removed">%1$s eemaldas %2$s vidina</string>
+    <string name="notice_widget_removed_by_you">Sina eemdaldasid %1$s vidina</string>
+    <string name="notice_widget_modified">%1$s muutis %2$s vidinat</string>
+    <string name="notice_widget_modified_by_you">Sa muutsid %1$s vidinat</string>
+
+    <string name="power_level_admin">Peakasutaja</string>
+    <string name="power_level_moderator">Moderaator</string>
+    <string name="power_level_default">Tavakasutaja</string>
+    <string name="power_level_custom">Kohandatud kasutajaõigused (%1$s)</string>
+    <string name="power_level_custom_no_value">Kohandatud õigused</string>
+
+    <string name="notice_power_level_changed_by_you">Sina muutsid kasutaja %1$s õigusi.</string>
+    <string name="notice_power_level_changed">%1$s muutis kasutaja %2$s õigusi.</string>
+    <string name="notice_power_level_diff">%1$s õiguste muutus %2$s -&gt; %3$s</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Sinu kutse. Põhjus %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Sina kutsusid kasutajat %1$s. Põhjus: %1$s</string>
+    <string name="notice_room_join_with_reason_by_you">Sina liitusid jututoaga. Põhjus: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Sina lahkusid jututoast. Põhjus: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Sina lükkasid kutse tagasi. Põhjus: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Sina müksasid kasutaja %1$s välja. Põhjus: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s taastas ligipääsu kasutajale %2$s. Põhjus: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Sina taastasid kasutaja %1$s ligipääsu. Põhjus: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s keelas kasutaja %2$s ligipääsu. Põhjus: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Sina keelasid kasutaja %1$s ligipääsu. Põhjus: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Sina saatsid kasutajale %1$s kutse jututoaga liitumiseks. Põhjus: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s. Põhjus: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Sina võtsid vastu kutse %1$s nimel. Põhjus: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Sina võtsid tagasi kasutaja %1$s kutse. Põhjus: %2$s</string>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Sina lisasid %1$s selle jututoa aadressiks.</item>
+        <item quantity="other">Sina lisasid %1$s selle jututoa aadressideks.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Sina eemaldasid %1$s, kui selle jututoa aadressi.</item>
+        <item quantity="other">Sina eemaldasid %1$s selle jututoa aadresside hulgast.</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed_by_you">Sina lisasid %1$s selle jututoa aadressiks ning eemaldasid %2$s aadresside hulgast.</string>
+
+    <string name="notice_room_canonical_alias_set_by_you">Sina seadistasid selle jututoa põhiaadressiks %1$s.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Sina eemaldasid selle jututoa põhiaadressi.</string>
+
+    <string name="notice_room_guest_access_can_join_by_you">Sina lubasid külalistel selle jututoaga liituda.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Sina seadistasid, et külalised ei või selle jututoaga liituda.</string>
+
+    <string name="notice_end_to_end_ok_by_you">Sa lülitasid sisse läbiva krüptimise.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Sa lülitasid sisse läbiva krüptimise (kasutusel on tundmatu algoritm %1$s).</string>
+
+    <string name="call_notification_answer">Võta vastu</string>
+    <string name="call_notification_reject">Keeldu</string>
+    <string name="call_notification_hangup">Lõpeta kõne</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-it/strings.xml b/matrix-sdk-android/src/main/res/values-it/strings.xml
index 42328b836f..2b2a097f13 100644
--- a/matrix-sdk-android/src/main/res/values-it/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-it/strings.xml
@@ -204,4 +204,100 @@
     <string name="key_verification_request_fallback_message">%s sta chiedendo di verificare la tua chiave, ma il tuo client non supporta la verifica in-chat. Dovrai usare il metodo di verifica obsoleto per verificare le chiavi.</string>
 
     <string name="notice_room_created">%1$s ha creato la stanza</string>
+    <string name="summary_you_sent_image">Hai inviato un\'immagine.</string>
+    <string name="summary_you_sent_sticker">Hai inviato un adesivo.</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">Il tuo invito</string>
+    <string name="notice_room_created_by_you">Hai creato la stanza</string>
+    <string name="notice_room_invite_by_you">Hai invitato %1$s</string>
+    <string name="notice_room_join_by_you">Sei entrato nella stanza</string>
+    <string name="notice_room_leave_by_you">Sei uscito dalla stanza</string>
+    <string name="notice_room_reject_by_you">Hai rifiutato l\'invito</string>
+    <string name="notice_room_kick_by_you">Hai buttato fuori %1$s</string>
+    <string name="notice_room_unban_by_you">Hai riammesso %1$s</string>
+    <string name="notice_room_ban_by_you">Hai bandito %1$s</string>
+    <string name="notice_room_withdraw_by_you">Hai ritirato l\'invito di %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Hai cambiato il tuo avatar</string>
+    <string name="notice_display_name_set_by_you">Hai impostato il tuo nome visualizzato a %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Hai cambiato il tuo nome visualizzato da %1$s a %2$s</string>
+    <string name="notice_display_name_removed_by_you">Hai rimosso il tuo nome visibile (era %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Hai cambiato l\'argomento a: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s ha modificato l\'avatar della stanza</string>
+    <string name="notice_room_avatar_changed_by_you">Hai modificato l\'avatar della stanza</string>
+    <string name="notice_room_name_changed_by_you">Hai cambiato il nome della stanza a: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Hai iniziato una videochiamata.</string>
+    <string name="notice_placed_voice_call_by_you">Hai iniziato una telefonata.</string>
+    <string name="notice_call_candidates">%s ha inviato dati per impostare la chiamata.</string>
+    <string name="notice_call_candidates_by_you">Hai inviato dati per impostare la chiamata.</string>
+    <string name="notice_answered_call_by_you">Hai risposto alla chiamata.</string>
+    <string name="notice_ended_call_by_you">Hai terminato la chiamata.</string>
+    <string name="notice_made_future_room_visibility_by_you">Hai reso visibile la futura cronologia della stanza a %1$s</string>
+    <string name="notice_end_to_end_by_you">Hai attivato la crittografia end-to-end (%1$s)</string>
+    <string name="notice_room_update_by_you">Hai aggiornato questa stanza.</string>
+
+    <string name="notice_requested_voip_conference_by_you">Hai richiesto una conferenza VoIP</string>
+    <string name="notice_room_name_removed_by_you">Hai rimosso il nome della stanza</string>
+    <string name="notice_room_topic_removed_by_you">Hai rimosso l\'argomento della stanza</string>
+    <string name="notice_room_avatar_removed">%1$s ha rimosso l\'avatar della stanza</string>
+    <string name="notice_room_avatar_removed_by_you">Hai rimosso l\'avatar della stanza</string>
+    <string name="notice_profile_change_redacted_by_you">Hai aggiornato il tuo profilo %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Hai mandato un invito a %1$s a unirsi alla stanza</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Hai revocato l\'invito per %1$s a unirsi alla stanza</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Hai accettato l\'invito per %1$s</string>
+
+    <string name="notice_widget_added">%1$s ha aggiunto il widget %2$s</string>
+    <string name="notice_widget_added_by_you">Hai aggiunto il widget %1$s</string>
+    <string name="notice_widget_removed">%1$s ha rimosso il widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Hai rimosso il widget %1$s</string>
+    <string name="notice_widget_modified">%1$s ha modificato il widget %2$s</string>
+    <string name="notice_widget_modified_by_you">Hai modificato il widget %1$s</string>
+
+    <string name="power_level_admin">Amministratore</string>
+    <string name="power_level_moderator">Moderatore</string>
+    <string name="power_level_default">Predefinito</string>
+    <string name="power_level_custom">Personalizzato (%1$d)</string>
+    <string name="power_level_custom_no_value">Personalizzato</string>
+
+    <string name="notice_power_level_changed_by_you">Hai cambiato il livello di potere di %1$s.</string>
+    <string name="notice_power_level_changed">%1$s ha cambiato il livello di potere di %2$s.</string>
+    <string name="notice_power_level_diff">%1$s da %2$s a %3$s</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Il tuo invito. Motivo: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Hai invitato %1$s. Motivo: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Sei entrato nella stanza. Motivo: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Sei uscito dalla stanza. Motivo: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Hai rifiutato l\'invito. Motivo: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Hai buttato fuori %1$s. Motivo: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Hai riammesso %1$s. Motivo: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Hai bandito %1$s. Motivo: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Hai mandato un invito a %1$s a unirsi alla stanza. Motivo: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Hai revocato l\'invito a %1$s a unirsi alla stanza. Motivo: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Hai accettato l\'invito per %1$s. Motivo: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Hai ritirato l\'invito di %2$s. Motivo: %2$s</string>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Hai aggiunto %1$s come indirizzo per questa stanza.</item>
+        <item quantity="other">Hai aggiunto %1$s come indirizzi per questa stanza.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Hai rimosso %1$s come indirizzo per questa stanza.</item>
+        <item quantity="other">Hai rimosso %2$s come indirizzi per questa stanza.</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed_by_you">Hai aggiunto %1$s e rimosso %2$s come indirizzi per questa stanza.</string>
+
+    <string name="notice_room_canonical_alias_set_by_you">Hai impostato l\'indirizzo principale per questa stanza a %1$s.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Hai rimosso l\'indirizzo principale per questa stanza.</string>
+
+    <string name="notice_room_guest_access_can_join_by_you">Hai permesso l\'accesso alla stanza per gli ospiti.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza per gli ospiti.</string>
+
+    <string name="notice_end_to_end_ok_by_you">Hai attivato la crittografia end-to-end.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Hai attivato la crittografia end-to-end (algoritmo %1$s sconosciuto).</string>
+
+    <string name="call_notification_answer">Accetta</string>
+    <string name="call_notification_reject">Rifiuta</string>
+    <string name="call_notification_hangup">Riaggancia</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
index a573c659a6..e1b99506c8 100644
--- a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
@@ -2,52 +2,52 @@
 <resources>
 
     <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s enviou uma imagem.</string>
+    <string name="summary_user_sent_image">%1$s enviou uma foto.</string>
 
     <string name="notice_room_invite_no_invitee">convite de %s</string>
     <string name="notice_room_invite">%1$s convidou %2$s</string>
     <string name="notice_room_invite_you">%1$s convidou você</string>
-    <string name="notice_room_join">%1$s entrou</string>
-    <string name="notice_room_leave">%1$s saiu</string>
+    <string name="notice_room_join">%1$s entrou na sala</string>
+    <string name="notice_room_leave">%1$s saiu da sala</string>
     <string name="notice_room_reject">%1$s recusou o convite</string>
-    <string name="notice_room_kick">%1$s expulsou %2$s</string>
-    <string name="notice_room_unban">%1$s des-baniu %2$s</string>
+    <string name="notice_room_kick">%1$s removeu %2$s</string>
+    <string name="notice_room_unban">%1$s removeu o banimento de %2$s</string>
     <string name="notice_room_ban">%1$s baniu %2$s</string>
-    <string name="notice_room_withdraw">%1$s cancelou o convite de %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s mudou seu avatar</string>
-    <string name="notice_display_name_set">%1$s definiu seu nome público como %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s alterou seu nome públido de %2$s para %3$s</string>
-    <string name="notice_display_name_removed">%1$s apagou seu nome público (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s alterou o tópico desta sala para: %2$s</string>
-    <string name="notice_room_name_changed">%1$s alterou o nome desta sala para: %2$s</string>
+    <string name="notice_room_withdraw">%1$s desfez o convite a %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s alterou a foto de perfil</string>
+    <string name="notice_display_name_set">%1$s definiu o nome e sobrenome como %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s alterou o nome e sobrenome de %2$s para %3$s</string>
+    <string name="notice_display_name_removed">%1$s removeu o nome e sobrenome (era %2$s)</string>
+    <string name="notice_room_topic_changed">%1$s alterou a descrição para: %2$s</string>
+    <string name="notice_room_name_changed">%1$s alterou o nome da sala para: %2$s</string>
     <string name="notice_placed_video_call">%s iniciou uma chamada de vídeo.</string>
     <string name="notice_placed_voice_call">%s iniciou uma chamada de voz.</string>
-    <string name="notice_answered_call">%s respondeu à chamada.</string>
+    <string name="notice_answered_call">%s aceitou a chamada.</string>
     <string name="notice_ended_call">%s encerrou a chamada.</string>
-    <string name="notice_made_future_room_visibility">%1$s deixou o histórico futuro desta sala visível para %2$s</string>
-    <string name="notice_room_visibility_invited">todas as pessoas que integram esta sala, a partir do momento em que foram convidadas.</string>
-    <string name="notice_room_visibility_joined">todas as pessoas que integram esta sala, a partir do momento em que entraram.</string>
-    <string name="notice_room_visibility_shared">todas as pessoas que integram esta sala.</string>
+    <string name="notice_made_future_room_visibility">%1$s deixou o histórico futuro da sala visível para %2$s</string>
+    <string name="notice_room_visibility_invited">todos os membros da sala, a partir do momento em que foram convidados.</string>
+    <string name="notice_room_visibility_joined">todos os membros da sala, a partir do momento em que entraram nela.</string>
+    <string name="notice_room_visibility_shared">todos os membros da sala.</string>
     <string name="notice_room_visibility_world_readable">qualquer pessoa.</string>
-    <string name="notice_room_visibility_unknown">desconhedido (%s).</string>
-    <string name="notice_end_to_end">%1$s ativou a criptografia ponta-a-ponta (%2$s)</string>
+    <string name="notice_room_visibility_unknown">desconhecido (%s).</string>
+    <string name="notice_end_to_end">%1$s ativou a criptografia de ponta a ponta (%2$s)</string>
 
-    <string name="notice_requested_voip_conference">%1$s solicitou uma conferência VoIP</string>
-    <string name="notice_voip_started">A conferência VoIP começou</string>
-    <string name="notice_voip_finished">A conferência VoIP terminou</string>
+    <string name="notice_requested_voip_conference">%1$s deseja iniciar uma chamada em grupo</string>
+    <string name="notice_voip_started">Chamada em grupo iniciada</string>
+    <string name="notice_voip_finished">Chamada em grupo encerrada</string>
 
-    <string name="notice_avatar_changed_too">(o avatar também foi alterado)</string>
-    <string name="notice_room_name_removed">%1$s apagou o nome da sala</string>
-    <string name="notice_room_topic_removed">%1$s apagou o tópico da sala</string>
-    <string name="notice_profile_change_redacted">%1$s atualizou o seu perfil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s enviou um convite para que %2$s se junte à sala</string>
+    <string name="notice_avatar_changed_too">(a foto de perfil também foi alterada)</string>
+    <string name="notice_room_name_removed">%1$s removeu o nome da sala</string>
+    <string name="notice_room_topic_removed">%1$s removeu a descrição da sala</string>
+    <string name="notice_profile_change_redacted">%1$s atualizou o perfil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s enviou um convite para %2$s entrar na sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s aceitou o convite para %2$s</string>
 
-    <string name="notice_crypto_unable_to_decrypt">** Impossível descriptografar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">O dispositivo de quem enviou a mensagem não nos enviou as chaves para esta mensagem.</string>
+    <string name="notice_crypto_unable_to_decrypt">** Não foi possível descriptografar: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">O aparelho do remetente não nos enviou as chaves para esta mensagem.</string>
 
     <!-- Room Screen -->
-    <string name="could_not_redact">Não foi possível apagar</string>
+    <string name="could_not_redact">Não foi possível redigir</string>
     <string name="unable_to_send_message">Não foi possível enviar a mensagem</string>
 
     <string name="message_failed_to_upload">O envio da imagem falhou</string>
@@ -63,16 +63,16 @@
     <!-- call events -->
 
     <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">Ainda não é possível voltar a entrar em uma sala vazia.</string>
+    <string name="room_error_join_failed_empty_room">Atualmente, não é possível entrar novamente em uma sala vazia.</string>
 
     <string name="encrypted_message">Mensagem criptografada</string>
 
     <!-- medium friendly name -->
-    <string name="medium_email">Endereço de email</string>
+    <string name="medium_email">Endereço de e-mail</string>
     <string name="medium_phone_number">Número de telefone</string>
 
 
-    <string name="summary_user_sent_sticker">%1$s enviou um sticker.</string>
+    <string name="summary_user_sent_sticker">%1$s enviou uma figurinha.</string>
 
     <!-- Room display name -->
     <string name="room_displayname_invite_from">Convite de %s</string>
@@ -81,9 +81,229 @@
     <string name="room_displayname_empty_room">Sala vazia</string>
 
     <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s e 1 outra/o</item>
-        <item quantity="other">%1$s e %2$d outras/os</item>
+        <item quantity="one">%1$s e 1 outro</item>
+        <item quantity="other">%1$s e %2$d outros</item>
     </plurals>
 
 
+    <string name="summary_you_sent_image">Você enviou uma foto.</string>
+    <string name="summary_you_sent_sticker">Você enviou uma figurinha.</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">Seu convite</string>
+    <string name="notice_room_created">%1$s criou a sala</string>
+    <string name="notice_room_created_by_you">Você criou a sala</string>
+    <string name="notice_room_invite_by_you">Você convidou %1$s</string>
+    <string name="notice_room_join_by_you">Você entrou na sala</string>
+    <string name="notice_room_leave_by_you">Você saiu da sala</string>
+    <string name="notice_room_reject_by_you">Você recusou o convite</string>
+    <string name="notice_room_kick_by_you">Você removeu %1$s</string>
+    <string name="notice_room_unban_by_you">Você removeu o banimento de %1$s</string>
+    <string name="notice_room_ban_by_you">Você baniu %1$s</string>
+    <string name="notice_room_withdraw_by_you">Você desfez o convite a %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Você alterou a sua foto de perfil</string>
+    <string name="notice_display_name_set_by_you">Você definiu o seu nome e sobrenome como %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Você alterou o seu nome e sobrenome de %1$s para %2$s</string>
+    <string name="notice_display_name_removed_by_you">Você removeu o seu nome e sobrenome (era %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Você alterou a descrição para: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s alterou a foto da sala</string>
+    <string name="notice_room_avatar_changed_by_you">Você alterou a foto da sala</string>
+    <string name="notice_room_name_changed_by_you">Você alterou o nome da sala para: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Você iniciou uma chamada de vídeo.</string>
+    <string name="notice_placed_voice_call_by_you">Você iniciou uma chamada de voz.</string>
+    <string name="notice_call_candidates">%s enviou dados para configurar a chamada.</string>
+    <string name="notice_call_candidates_by_you">Você enviou dados para configurar a chamada.</string>
+    <string name="notice_answered_call_by_you">Você aceitou a chamada.</string>
+    <string name="notice_ended_call_by_you">Você encerrou a chamada.</string>
+    <string name="notice_made_future_room_visibility_by_you">Você deixou o histórico futuro da sala visível para %1$s</string>
+    <string name="notice_end_to_end_by_you">Você ativou a criptografia de ponta a ponta (%1$s)</string>
+    <string name="notice_room_update">%s atualizou esta sala.</string>
+    <string name="notice_room_update_by_you">Você atualizou esta sala.</string>
+
+    <string name="notice_requested_voip_conference_by_you">Você solicitou uma chamada em grupo</string>
+    <string name="notice_room_name_removed_by_you">Você removeu o nome da sala</string>
+    <string name="notice_room_topic_removed_by_you">Você removeu a descrição da sala</string>
+    <string name="notice_room_avatar_removed">%1$s removeu a foto da sala</string>
+    <string name="notice_room_avatar_removed_by_you">Você removeu a foto da sala</string>
+    <string name="notice_event_redacted">Mensagem removida</string>
+    <string name="notice_event_redacted_by">Mensagem removida por %1$s</string>
+    <string name="notice_event_redacted_with_reason">Mensagem removida [motivo: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Mensagem removida por %1$s [motivo: %2$s]</string>
+    <string name="notice_profile_change_redacted_by_you">Você atualizou o seu perfil %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Você enviou um convite para %1$s entrar na sala</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s cancelou o convite a %2$s para entrar na sala</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Você cancelou o convite a %1$s para entrar na sala</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Você aceitou o convite para %1$s</string>
+
+    <string name="notice_widget_added">%1$s adicionou o widget %2$s</string>
+    <string name="notice_widget_added_by_you">Você adicionou o widget %1$s</string>
+    <string name="notice_widget_removed">%1$s removeu o widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Você removeu o widget %1$s</string>
+    <string name="notice_widget_modified">%1$s editou o widget %2$s</string>
+    <string name="notice_widget_modified_by_you">Você editou o widget %1$s</string>
+
+    <string name="power_level_admin">Administrador</string>
+    <string name="power_level_moderator">Moderador</string>
+    <string name="power_level_default">Padrão</string>
+    <string name="power_level_custom">Personalizado (%1$d)</string>
+    <string name="power_level_custom_no_value">Personalizado</string>
+
+    <string name="notice_power_level_changed_by_you">Você alterou o nível de permissão de %1$s.</string>
+    <string name="notice_power_level_changed">%1$s alterou o nível de permissão de %2$s.</string>
+    <string name="notice_power_level_diff">%1$s de %2$s para %3$s</string>
+
+    <string name="verification_emoji_dog">Cachorro</string>
+    <string name="verification_emoji_cat">Gato</string>
+    <string name="verification_emoji_lion">Leão</string>
+    <string name="verification_emoji_horse">Cavalo</string>
+    <string name="verification_emoji_unicorn">Unicórnio</string>
+    <string name="verification_emoji_pig">Porco</string>
+    <string name="verification_emoji_elephant">Elefante</string>
+    <string name="verification_emoji_rabbit">Coelho</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Galo</string>
+    <string name="verification_emoji_penguin">Pinguim</string>
+    <string name="verification_emoji_turtle">Tartaruga</string>
+    <string name="verification_emoji_fish">Peixe</string>
+    <string name="verification_emoji_octopus">Polvo</string>
+    <string name="verification_emoji_butterfly">Borboleta</string>
+    <string name="verification_emoji_flower">Flor</string>
+    <string name="verification_emoji_tree">Árvore</string>
+    <string name="verification_emoji_cactus">Cacto</string>
+    <string name="verification_emoji_mushroom">Cogumelo</string>
+    <string name="verification_emoji_globe">Globo</string>
+    <string name="verification_emoji_moon">Lua</string>
+    <string name="verification_emoji_cloud">Nuvem</string>
+    <string name="verification_emoji_fire">Fogo</string>
+    <string name="verification_emoji_banana">Banana</string>
+    <string name="verification_emoji_apple">Maçã</string>
+    <string name="verification_emoji_strawberry">Morango</string>
+    <string name="verification_emoji_corn">Milho</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Bolo</string>
+    <string name="verification_emoji_heart">Coração</string>
+    <string name="verification_emoji_smiley">Sorriso</string>
+    <string name="verification_emoji_robot">Robô</string>
+    <string name="verification_emoji_hat">Chapéu</string>
+    <string name="verification_emoji_glasses">Óculos</string>
+    <string name="verification_emoji_wrench">Chave inglesa</string>
+    <string name="verification_emoji_santa">Papai-noel</string>
+    <string name="verification_emoji_thumbsup">Joinha</string>
+    <string name="verification_emoji_umbrella">Guarda-chuva</string>
+    <string name="verification_emoji_hourglass">Ampulheta</string>
+    <string name="verification_emoji_clock">Relógio</string>
+    <string name="verification_emoji_gift">Presente</string>
+    <string name="verification_emoji_lightbulb">Lâmpada</string>
+    <string name="verification_emoji_book">Livro</string>
+    <string name="verification_emoji_pencil">Lápis</string>
+    <string name="verification_emoji_paperclip">Clipe de papel</string>
+    <string name="verification_emoji_scissors">Tesoura</string>
+    <string name="verification_emoji_lock">Cadeado</string>
+    <string name="verification_emoji_key">Chave</string>
+    <string name="verification_emoji_hammer">Martelo</string>
+    <string name="verification_emoji_telephone">Telefone</string>
+    <string name="verification_emoji_flag">Bandeira</string>
+    <string name="verification_emoji_train">Trem</string>
+    <string name="verification_emoji_bicycle">Bicicleta</string>
+    <string name="verification_emoji_airplane">Avião</string>
+    <string name="verification_emoji_rocket">Foguete</string>
+    <string name="verification_emoji_trophy">Troféu</string>
+    <string name="verification_emoji_ball">Bola</string>
+    <string name="verification_emoji_guitar">Guitarra</string>
+    <string name="verification_emoji_trumpet">Trombeta</string>
+    <string name="verification_emoji_bell">Sino</string>
+    <string name="verification_emoji_anchor">Âncora</string>
+    <string name="verification_emoji_headphone">Fones de ouvido</string>
+    <string name="verification_emoji_folder">Pasta</string>
+    <string name="verification_emoji_pin">Alfinete</string>
+
+    <string name="initial_sync_start_importing_account">Primeira sincronização:↵
+\nImportando a conta…</string>
+    <string name="initial_sync_start_importing_account_crypto">Primeira sincronização:↵
+\nImportando as chaves de criptografia</string>
+    <string name="initial_sync_start_importing_account_rooms">Primeira sincronização:↵
+\nImportando as salas</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Primeira sincronização:↵
+\nImportando as salas em que você entrou</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Primeira sincronização:↵
+\nImportando as salas em que você foi convidado</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Primeira sincronização:↵
+\nImportando as salas em que você saiu</string>
+    <string name="initial_sync_start_importing_account_groups">Primeira sincronização:↵
+\nImportando as comunidades</string>
+    <string name="initial_sync_start_importing_account_data">Primeira sincronização:↵
+\nImportando os dados da conta</string>
+
+    <string name="event_status_sending_message">Enviando mensagem…</string>
+    <string name="clear_timeline_send_queue">Limpar a fila de envio</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason">Convite de %1$s. Motivo: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">O seu convite. Motivo: %1$s</string>
+    <string name="notice_room_invite_with_reason">%1$s convidou %2$s. Motivo: %3$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Você convidou %1$s. Motivo: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s convidou você. Motivo: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s entrou na sala. Motivo: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Você entrou na sala. Motivo: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s saiu da sala. Motivo: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Você saiu da sala. Motivo: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s recusou o convite. Motivo: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Você recusou o convite. Motivo: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s removeu %2$s. Motivo: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Você removeu %1$s. Motivo: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s removeu o banimento de %2$s. Motivo: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Você removeu o banimento de %1$s. Motivo: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s baniu %2$s. Motivo: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Você baniu %1$s. Motivo: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s enviou um convite para %2$s entrar na sala. Motivo: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Você enviou um convite para %1$s entrar na sala. Motivo: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s revogou o convite para %2$s entrar na sala. Motivo: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Você revogou o convite para %1$s entrar na sala. Motivo: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s aceitou o convite para %2$s. Motivo: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Você aceitou o convite para %1$s. Motivo: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s desfez o convite de %2$s. Motivo: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Você desfez o convite de %1$s. Motivo: %2$s</string>
+
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s adicionou %2$s como um endereço desta sala.</item>
+        <item quantity="other">%1$s adicionou %2$s como endereços desta sala.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Você adicionou %1$s como um endereço desta sala.</item>
+        <item quantity="other">Você adicionou %1$s como endereços desta sala.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s removeu %2$s como um endereço desta sala.</item>
+        <item quantity="other">%1$s removeu %3$s como endereços desta sala.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Você removeu %1$s como um endereço desta sala.</item>
+        <item quantity="other">Você removeu %2$s como endereços desta sala.</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed">%1$s adicionou %2$s e removeu %3$s como endereços desta sala.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Você adicionou %1$s e removeu %2$s como endereços desta sala.</string>
+
+    <string name="notice_room_canonical_alias_set">%1$s definiu o endereço principal desta sala como %2$s.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Você definiu o endereço principal desta sala como %1$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s removeu o endereço principal desta sala.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Você removeu o endereço principal desta sala.</string>
+
+    <string name="notice_room_guest_access_can_join">%1$s permitiu que convidados entrem na sala.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Você permitiu que convidados entrem na sala.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s impediu que convidados entrassem na sala.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Você impediu que convidados entrassem na sala.</string>
+
+    <string name="notice_end_to_end_ok">%1$s ativou a criptografia de ponta a ponta.</string>
+    <string name="notice_end_to_end_ok_by_you">Você ativou a criptografia de ponta a ponta.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s ativou a criptografia de ponta a ponta (algoritmo não reconhecido %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Você ativou a criptografia de ponta a ponta (algoritmo não reconhecido %1$s).</string>
+
+    <string name="key_verification_request_fallback_message">%s deseja confirmar a sua chave, mas o seu aplicativo não suporta a confirmação da chave da conversa. Você precisará usar a confirmação tradicional de chaves para confirmar chaves.</string>
+
+    <string name="call_notification_answer">Aceitar</string>
+    <string name="call_notification_reject">Recusar</string>
+    <string name="call_notification_hangup">Encerrar</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-ru/strings.xml b/matrix-sdk-android/src/main/res/values-ru/strings.xml
index bd0dcef3dd..1657d80f1c 100644
--- a/matrix-sdk-android/src/main/res/values-ru/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ru/strings.xml
@@ -195,9 +195,9 @@
 
     <string name="notice_room_created">%1$s создал(а) комнату</string>
     <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s добавил(а) адрес %2$s для комнаты.</item>
-        <item quantity="few">%1$s добавил(а) адреса %2$s для комнаты.</item>
-        <item quantity="many">%1$s добавил(а) адреса %2$s для комнаты.</item>
+        <item quantity="one">%1$s добавил(а) %2$s в качестве адреса для этой комнаты.</item>
+        <item quantity="few">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
+        <item quantity="many">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
     </plurals>
 
     <plurals name="notice_room_aliases_removed">
@@ -307,4 +307,14 @@
     <string name="notice_end_to_end_ok_by_you">Вы включили сквозное шифрование.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Вы включили сквозное шифрование (неизвестный алгоритм %1$s).</string>
 
+    <string name="notice_room_avatar_changed">%1$s изменил(а) аватар комнаты</string>
+    <string name="notice_room_avatar_changed_by_you">Вы изменили аватар комнаты</string>
+    <string name="notice_call_candidates">%s отправил(а) данные для начала звонка.</string>
+    <string name="notice_call_candidates_by_you">Вы отправили данные для начала звонка.</string>
+    <string name="notice_room_avatar_removed">%1$s удалил(а) аватар комнаты</string>
+    <string name="notice_room_avatar_removed_by_you">Вы удалили аватар комнаты</string>
+    <string name="call_notification_answer">Принять</string>
+    <string name="call_notification_reject">Отклонить</string>
+    <string name="call_notification_hangup">Завершить звонок</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-sk/strings.xml b/matrix-sdk-android/src/main/res/values-sk/strings.xml
index 8aec8fccf9..70e3a6ebd0 100644
--- a/matrix-sdk-android/src/main/res/values-sk/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sk/strings.xml
@@ -1,51 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s poslal obrázok.</string>
+    <string name="summary_user_sent_image">%1$s poslal/a obrázok.</string>
 
-    <string name="notice_room_invite_no_invitee">Pozvanie %s</string>
-    <string name="notice_room_invite">%1$s pozval %2$s</string>
-    <string name="notice_room_invite_you">%1$s vás pozval</string>
-    <string name="notice_room_join">%1$s sa pripojil/a do miestnosti</string>
+    <string name="notice_room_invite_no_invitee">Pozvanie od %s</string>
+    <string name="notice_room_invite">%1$s pozval/a %2$s</string>
+    <string name="notice_room_invite_you">%1$s vás pozval/a</string>
+    <string name="notice_room_join">%1$s vstúpil/a do miestnosti</string>
     <string name="notice_room_leave">%1$s opustil/a miestnosť</string>
-    <string name="notice_room_reject">%1$s odmietol pozvanie</string>
-    <string name="notice_room_kick">%1$s vykázal %2$s</string>
-    <string name="notice_room_unban">%1$s povolil vstup %2$s</string>
-    <string name="notice_room_ban">%1$s zakázal vstup %2$s</string>
-    <string name="notice_room_withdraw">%1$s stiahol pozvanie %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s si zmenil obrázok v profile</string>
-    <string name="notice_display_name_set">%1$s si nastavil zobrazované meno %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s si zmenil zobrazované meno z %2$s na %3$s</string>
-    <string name="notice_display_name_removed">%1$s odstránil svoje zobrazované meno (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s zmenil tému na: %2$s</string>
-    <string name="notice_room_name_changed">%1$s zmenil názov miestnosti na: %2$s</string>
-    <string name="notice_placed_video_call">%s uskutočnil video hovor.</string>
-    <string name="notice_placed_voice_call">%s uskutočnil audio hovor.</string>
-    <string name="notice_answered_call">%s prijal hovor.</string>
-    <string name="notice_ended_call">%s ukončil hovor.</string>
-    <string name="notice_made_future_room_visibility">%1$s sprístupnil budúcu históriu miestnosti %2$s</string>
+    <string name="notice_room_reject">%1$s odmietol/a pozvanie</string>
+    <string name="notice_room_kick">%1$s vykázal/a %2$s</string>
+    <string name="notice_room_unban">%1$s povolil/a vstupovať %2$s</string>
+    <string name="notice_room_ban">%1$s zakázal/a vstupovať %2$s</string>
+    <string name="notice_room_withdraw">%1$s vzal/a späť pozvanie %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s si zmenil/a obrázok v profile</string>
+    <string name="notice_display_name_set">%1$s si nastavil/a zobrazované meno %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s si zmenil/a zobrazované meno %2$s na %3$s</string>
+    <string name="notice_display_name_removed">%1$s odstránil/a svoje zobrazované meno (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s zmenil/a tému na: %2$s</string>
+    <string name="notice_room_name_changed">%1$s zmenil/a názov miestnosti na: %2$s</string>
+    <string name="notice_placed_video_call">%s uskutočnil/a video hovor.</string>
+    <string name="notice_placed_voice_call">%s zatelefonoval/a.</string>
+    <string name="notice_answered_call">%s prijal/a hovor.</string>
+    <string name="notice_ended_call">%s ukončil/a hovor.</string>
+    <string name="notice_made_future_room_visibility">%1$s sprístupnil/a budúcu históriu miestnosti %2$s</string>
     <string name="notice_room_visibility_invited">pre všetkých členov, od kedy boli pozvaní.</string>
     <string name="notice_room_visibility_joined">pre všetkých členov, od kedy vstúpili.</string>
     <string name="notice_room_visibility_shared">pre všetkých členov.</string>
     <string name="notice_room_visibility_world_readable">pre každého.</string>
     <string name="notice_room_visibility_unknown">neznámym (%s).</string>
-    <string name="notice_end_to_end">%1$s povolil E2E šifrovanie (%2$s)</string>
+    <string name="notice_end_to_end">%1$s povolil/a E2E šifrovanie (%2$s)</string>
 
-    <string name="notice_requested_voip_conference">%1$s požiadal o VoIP konferenciu</string>
-    <string name="notice_voip_started">Začala VoIP konferencia</string>
-    <string name="notice_voip_finished">Skončila VoIP konferencia</string>
+    <string name="notice_requested_voip_conference">%1$s požiadal/a o VoIP konferenciu</string>
+    <string name="notice_voip_started">Začala sa VoIP konferencia</string>
+    <string name="notice_voip_finished">Skončila sa VoIP konferencia</string>
 
-    <string name="notice_avatar_changed_too">(a tiež obrázok v profile)</string>
-    <string name="notice_room_name_removed">%1$s odstránil názov miestnosti</string>
-    <string name="notice_room_topic_removed">%1$s odstránil tému miestnosti</string>
-    <string name="notice_profile_change_redacted">%1$s aktualizoval svoj profil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s pozval %2$s vstúpiť do miestnosti</string>
-    <string name="notice_room_third_party_registered_invite">%1$s prijal pozvanie do %2$s</string>
+    <string name="notice_avatar_changed_too">(aj obrázok v profile)</string>
+    <string name="notice_room_name_removed">%1$s odstránil/a názov miestnosti</string>
+    <string name="notice_room_topic_removed">%1$s odstránil/a tému miestnosti</string>
+    <string name="notice_profile_change_redacted">%1$s aktualizoval/a svoj profil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s pozval/a %2$s vstúpiť do miestnosti</string>
+    <string name="notice_room_third_party_registered_invite">%1$s prijal/a pozvanie pre %2$s</string>
 
     <string name="notice_crypto_unable_to_decrypt">** Nie je možné dešifrovať: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Zo zariadenia odosieľateľa nebolo možné získať kľúče potrebné na dešifrovanie tejto správy.</string>
 
-    <string name="could_not_redact">Nie je ožné vymazať</string>
+    <string name="could_not_redact">Nie je možné vymazať</string>
     <string name="unable_to_send_message">Nie je možné odoslať správu</string>
 
     <string name="message_failed_to_upload">Nepodarilo sa nahrať obrázok</string>
@@ -60,7 +60,7 @@
     <string name="medium_email">Emailová adresa</string>
     <string name="medium_phone_number">Telefónne číslo</string>
 
-    <string name="summary_user_sent_sticker">%1$s poslal nálepku.</string>
+    <string name="summary_user_sent_sticker">%1$s poslal/a nálepku.</string>
 
     <string name="room_displayname_invite_from">Pozvanie od %s</string>
     <string name="room_displayname_room_invite">Pozvanie do miestnosti</string>
@@ -75,12 +75,12 @@
     </plurals>
 
 
-    <string name="notice_room_update">%s aktualizoval túto miestnosť.</string>
+    <string name="notice_room_update">%s aktualizoval/a túto miestnosť.</string>
 
-    <string name="notice_event_redacted">Správa odstránená</string>
-    <string name="notice_event_redacted_by">Správa odstránená používateľom %1$s</string>
-    <string name="notice_event_redacted_with_reason">Správa odstránená [dôvod: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Správa odstránená používateľom %1$s [dôvod: %2$s]</string>
+    <string name="notice_event_redacted">Odstránená správa</string>
+    <string name="notice_event_redacted_by">Odstránená správa používateľom %1$s</string>
+    <string name="notice_event_redacted_with_reason">Odstránená správa [dôvod: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Odstránená správa používateľom %1$s [dôvod: %2$s]</string>
     <string name="verification_emoji_dog">Hlava psa</string>
     <string name="verification_emoji_cat">Hlava mačky</string>
     <string name="verification_emoji_lion">Hlava leva</string>
@@ -110,7 +110,7 @@
     <string name="verification_emoji_corn">Kukuričný klas</string>
     <string name="verification_emoji_pizza">Pizza</string>
     <string name="verification_emoji_cake">Narodeninová torta</string>
-    <string name="verification_emoji_heart">Červené</string>
+    <string name="verification_emoji_heart">Červené srdce</string>
     <string name="verification_emoji_smiley">Škeriaca sa tvár</string>
     <string name="verification_emoji_robot">Robot</string>
     <string name="verification_emoji_hat">Cylinder</string>
@@ -154,8 +154,8 @@
 \nPrebieha import miestností</string>
     <string name="initial_sync_start_importing_account_joined_rooms">Úvodná synchronizácia:
 \nPrebieha import miestností, do ktorých ste vstúpili</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Úvodná synchronizácia:
-\nPrebieha import pozvánok</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Úvodná synchronizácia: 
+\nPrebieha import pozvaní</string>
     <string name="initial_sync_start_importing_account_left_rooms">Úvodná synchronizácia:
 \nPrebieha import opustených miestností</string>
     <string name="initial_sync_start_importing_account_groups">Úvodná synchronizácia:
@@ -166,20 +166,20 @@
     <string name="event_status_sending_message">Odosielanie správy…</string>
     <string name="clear_timeline_send_queue">Vymazať správy na odoslanie</string>
 
-    <string name="notice_room_third_party_revoked_invite">%1$s zamietol pozvanie používateľa %2$s vstúpiť do miestnosti</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Pozvanie od používateľa %1$s. Dôvod: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s pozval používateľa %2$s. Dôvod: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s vás pozval. Dôvod: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s sa pripojil/a do miestnosti. Dôvod: %2$s</string>
-    <string name="notice_room_leave_with_reason">Používateľ %1$s odišiel z miestnosti. Dôvod: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s odmietol pozvanie. Dôvod: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s vyhodil používateľa %2$s. Dôvod: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s znovu pridaný používateľom %2$s. Dôvod: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s vyhodil %2$s. Dôvod: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s poslal pozvánku používateľovi %2$s, aby sa pripojil na miestnosť. Dôvod: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s odvolal/a pozvánku pre používateľa %2$s na pripojenie sa na miestnosť. Dôvod: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s prijal pozvanie od používateľa %2$s. Dôvod: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s odoprel/a pozvánku používateľa %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s zamietol/a pozvanie používateľa %2$s vstúpiť do miestnosti</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Pozvanie od %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s pozval/a %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s vás pozval/a. Dôvod: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s vstúpil/a do miestnosti. Dôvod: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s opustil/a miestnosť. Dôvod: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s odmietol/a pozvanie. Dôvod: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s vykázal/a %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s povolil/a vstupovať %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s zakázal/a vstupovať %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s pozval/a %2$s vstúpiť do miestnosti. Dôvod: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s zamietol/a pozvanie používateľa %2$s vstúpiť do miestnosti. Dôvod: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s prijal/a pozvanie pre %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s vzal/a späť pozvanie %2$s. Dôvod: %3$s</string>
 
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s pridal/a adresu %2$s pre túto miestnosť.</item>
@@ -189,14 +189,118 @@
 
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s odstránil/a adresu %2$s pre túto miestnosť.</item>
-        <item quantity="few">%1$s odstránil/a adresy %2$s pre túto miestnosť.</item>
-        <item quantity="other">%1$s odstránil/a adresy %2$s pre túto miestnosť.</item>
+        <item quantity="few">%1$s odstránil/a adresy %3$s pre túto miestnosť.</item>
+        <item quantity="other">%1$s odstránil/a adresy %3$s pre túto miestnosť.</item>
     </plurals>
 
-    <string name="notice_room_aliases_added_and_removed">%1$s pridal/a adresu %2$s a odstránil/a adresu %3$s pre túto miestnosť.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s pridal/a adresy %2$s a odstránil/a adresy %3$s pre túto miestnosť.</string>
 
-    <string name="notice_room_canonical_alias_set">%1$s nastavil/a hlavnú adresu tejto miestnosti na %2$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s odstránil/a hlavnú adresu pre túto miestnosť.</string>
+    <string name="notice_room_canonical_alias_set">%1$s nastavil/a hlavnú adresu tejto miestnosti %2$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s odstránil/a hlavnú adresu tejto miestnosti.</string>
 
     <string name="notice_room_guest_access_can_join">%1$s povolil/a hosťom///návštevníkom prístup do tejto miestnosti.</string>
+    <string name="summary_you_sent_image">Poslali ste obrázok.</string>
+    <string name="summary_you_sent_sticker">Poslali ste nálepku.</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">Pozvanie od vás</string>
+    <string name="notice_room_created">%1$s vytvoril/a miestnosť</string>
+    <string name="notice_room_created_by_you">Vytvorili ste miestnosť</string>
+    <string name="notice_room_invite_by_you">Pozvali ste %1$s</string>
+    <string name="notice_room_join_by_you">Vstúpili ste do miestnosti</string>
+    <string name="notice_room_leave_by_you">Opustili ste miestnosť</string>
+    <string name="notice_room_reject_by_you">Odmietli ste pozvanie</string>
+    <string name="notice_room_kick_by_you">Vykázali ste %1$s</string>
+    <string name="notice_room_unban_by_you">Povolili ste vstupovať %1$s</string>
+    <string name="notice_room_ban_by_you">Zakázali ste vstupovať %1$s</string>
+    <string name="notice_room_withdraw_by_you">Vzali ste späť pozvanie %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Zmenili ste si obrázok v profile</string>
+    <string name="notice_display_name_set_by_you">Nastavili ste si zobrazované meno %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Zmenili ste si zobrazované meno %1$s na %2$s</string>
+    <string name="notice_display_name_removed_by_you">Odstránili ste svoje zobrazované meno %1$s</string>
+    <string name="notice_room_topic_changed_by_you">Zmenili ste tému na: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s zmenil/a obrázok miestnosti</string>
+    <string name="notice_room_avatar_changed_by_you">Zmenili ste obrázok miestnosti</string>
+    <string name="notice_room_name_changed_by_you">Zmenili ste názov miestnosti na: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Uskutočnili ste video hovor.</string>
+    <string name="notice_placed_voice_call_by_you">Zatelefonovali ste.</string>
+    <string name="notice_call_candidates">%s poslal údaje pre nastavenie hovoru.</string>
+    <string name="notice_call_candidates_by_you">Poslali ste údaje na nastavenie hovoru.</string>
+    <string name="notice_answered_call_by_you">Prijali ste hovor.</string>
+    <string name="notice_ended_call_by_you">Ukončili ste hovor.</string>
+    <string name="notice_made_future_room_visibility_by_you">Sprístupnili ste budúcu históriu miestnosti %1$s</string>
+    <string name="notice_end_to_end_by_you">Povolili ste E2E šifrovanie (%1$s)</string>
+    <string name="notice_room_update_by_you">Aktualizovali ste túto miestnosť.</string>
+
+    <string name="notice_requested_voip_conference_by_you">Požiadali ste o VoIP konferenciu</string>
+    <string name="notice_room_name_removed_by_you">Odstránili ste názov miestnosti</string>
+    <string name="notice_room_topic_removed_by_you">Odstránili ste tému miestnosti</string>
+    <string name="notice_room_avatar_removed">%1$s odstránil obrázok miestnosti</string>
+    <string name="notice_room_avatar_removed_by_you">Odstránili ste obrázok miestnosti</string>
+    <string name="notice_profile_change_redacted_by_you">Aktualizovali ste svoj profil %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Pozvali ste %1$s vstúpiť do miestnosti</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Zamietli ste pozvanie používateľa %2$s vstúpiť do miestnosti</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Prijali ste pozvanie pre %1$s</string>
+
+    <string name="notice_widget_added">%1$s pridal/a widget %2$s</string>
+    <string name="notice_widget_added_by_you">Pridali ste widget %1$s</string>
+    <string name="notice_widget_removed">%1$s odstránil/a widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Odstránili ste widget %1$s</string>
+    <string name="notice_widget_modified">%1$s upravil/a widget %2$s</string>
+    <string name="notice_widget_modified_by_you">Upravili ste widget %1$s</string>
+
+    <string name="power_level_admin">Správca</string>
+    <string name="power_level_moderator">Moderátor</string>
+    <string name="power_level_default">Predvolený</string>
+    <string name="power_level_custom">Vlastná úroveň (%1$d)</string>
+    <string name="power_level_custom_no_value">Vlastná úroveň</string>
+
+    <string name="notice_power_level_changed_by_you">Zmenili ste úroveň moci používateľa %1$s.</string>
+    <string name="notice_power_level_changed">%1$s zmenil úroveň moci používateľa %2$s.</string>
+    <string name="notice_power_level_diff">%1$s z %2$s na %3$s</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Pozvanie od vás. Dôvod: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Pozvali ste %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Vstúpili ste do miestnosti. Dôvod: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Opustili ste miestnosť. Dôvod: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Odmietli ste pozvanie. Dôvod: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Vykázali ste %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Povolili ste vstupovať %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Zakázali ste vstupovať %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Pozvali ste %1$s vstúpiť do miestnosti. Dôvod: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Zamietli ste pozvanie používateľa %1$s vstúpiť do miestnosti. Dôvod: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Prijali ste pozvanie pre %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Vzali ste späť pozvanie %1$s. Dôvod: %2$s</string>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Pridali ste adresu %1$s pre túto miestnosť.</item>
+        <item quantity="few">Pridali ste adresy %1$s pre túto miestnosť.</item>
+        <item quantity="other">Pridali ste adresy %1$s pre túto miestnosť.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Odstránili ste adresu %1$s pre túto miestnosť.</item>
+        <item quantity="few">Odstránili ste adresy %2$s pre túto miestnosť.</item>
+        <item quantity="other">Odstránili ste adresy %2$s pre túto miestnosť.</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed_by_you">Pridali ste %1$s a odstránili adresy %2$s pre túto miestnosť.</string>
+
+    <string name="notice_room_canonical_alias_set_by_you">Nastavili ste hlavnú adresu tejto miestnosti %2$s.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Odstránili ste hlavnú adresu tejto miestnosti.</string>
+
+    <string name="notice_room_guest_access_can_join_by_you">Povolili ste hosťom///návštevníkom prístup do tejto miestnosti.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s zakázal/a hosťom///návštevníkom prístup do tejto miestnosti.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Zakázali ste hosťom///návštevníkom prístup do tejto miestnosti.</string>
+
+    <string name="notice_end_to_end_ok">%1$s povolil/a E2E šifrovanie.</string>
+    <string name="notice_end_to_end_ok_by_you">Povolili ste E2E šifrovanie.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s povolil/a E2E šifrovanie (Nerozpoznaný algorytmus %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Povolili ste E2E šifrovanie (Nerozpoznaný algorytmus %1$s).</string>
+
+    <string name="key_verification_request_fallback_message">%s požaduje overenie vašich šifrovacích kľúčov, ale váš klient nepodporuje overenie kľúčov v konverzácii. Budete musieť použiť zastaralú metódu overenia.</string>
+
+    <string name="call_notification_answer">Prijať</string>
+    <string name="call_notification_reject">Odmietnuť</string>
+    <string name="call_notification_hangup">Zavesiť</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
index 48dbd27a1b..ef080e8357 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
@@ -13,7 +13,7 @@
     <string name="notice_room_ban">%1$s 封禁了 %2$s</string>
     <string name="notice_avatar_url_changed">%1$s 更换了他们的头像</string>
     <string name="notice_display_name_set">%1$s 将他们的昵称设置为 %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s 把他的昵称从 %2$s 改为 %3$s</string>
+    <string name="notice_display_name_changed_from">%1$s 把他们的昵称从 %2$s 改为 %3$s</string>
     <string name="notice_display_name_removed">%1$s 移除了他们的昵称 (%2$s)</string>
     <string name="notice_room_topic_changed">%1$s 把主题改为： %2$s</string>
     <string name="notice_room_name_changed">%1$s 把聊天室名称改为： %2$s</string>
@@ -26,7 +26,7 @@
     <string name="notice_room_visibility_shared">所有聊天室成员。</string>
     <string name="notice_room_visibility_world_readable">任何人。</string>
     <string name="notice_room_visibility_unknown">未知（%s）。</string>
-    <string name="notice_end_to_end">%1$s 开启了端对端加密（%2$s）</string>
+    <string name="notice_end_to_end">%1$s 开启了端到端加密（%2$s）</string>
 
     <string name="notice_requested_voip_conference">%1$s 请求了一次 VoIP 会议</string>
     <string name="notice_voip_started">VoIP 会议已开始</string>
@@ -52,9 +52,9 @@
     <string name="medium_email">电子邮箱地址</string>
     <string name="medium_phone_number">手机号码</string>
 
-    <string name="notice_room_withdraw">%1$s 撤销了对 %2$s 的邀请</string>
-    <string name="notice_made_future_room_visibility">%1$s 让之后的聊天室历史记录对 %2$s 可见</string>
-    <string name="notice_profile_change_redacted">%1$s 更新了他们的简介 %2$s</string>
+    <string name="notice_room_withdraw">%1$s 撤回了对 %2$s 的邀请</string>
+    <string name="notice_made_future_room_visibility">%1$s 让未来的聊天室历史记录对 %2$s 可见</string>
+    <string name="notice_profile_change_redacted">%1$s 更新了他的个人档案 %2$s</string>
     <string name="notice_room_third_party_invite">%1$s 向 %2$s 发送了加入聊天室的邀请</string>
     <string name="notice_room_third_party_registered_invite">%1$s 接受了 %2$s 的邀请</string>
 
@@ -155,12 +155,12 @@
     <string name="initial_sync_start_importing_account_data">初始化同步：
 \n正在导入账号数据</string>
 
-    <string name="notice_room_update">%s 升级了聊天室。</string>
+    <string name="notice_room_update">%s 升级了此聊天室。</string>
 
     <string name="event_status_sending_message">正在发送消息…</string>
     <string name="clear_timeline_send_queue">清除正在发送队列</string>
 
-    <string name="notice_room_third_party_revoked_invite">%1$s 撤回了对 %2$s 邀请</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s 撤回了对 %2$s 加入聊天室的邀请</string>
     <string name="verification_emoji_pin">置顶</string>
 
     <string name="notice_room_invite_no_invitee_with_reason">%1$s 的邀请。理由：%2$s</string>
@@ -170,8 +170,8 @@
     <string name="notice_room_leave_with_reason">%1$s 离开了聊天室。理由：%2$s</string>
     <string name="notice_room_reject_with_reason">%1$s 已拒绝邀请。理由：%2$s</string>
     <string name="notice_room_kick_with_reason">%1$s 踢走了 %2$s。理由：%3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s 取消封锁了 %2$s。理由：%3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s 封锁了 %2$s。理由：%3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s 解封了 %2$s。理由：%3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s 封禁了 %2$s。理由：%3$s</string>
     <string name="notice_room_third_party_invite_with_reason">%1$s 已发送邀请给 %2$s 来加入聊天室。理由：%3$s</string>
     <string name="notice_room_third_party_revoked_invite_with_reason">%1$s 撤销了 %2$s 加入聊天室的邀請。理由：%3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s 接受 %2$s 的邀請。理由：%3$s</string>
@@ -185,10 +185,10 @@
         <item quantity="other">%1$s 移除了此聊天室的 %3$s 地址。</item>
     </plurals>
 
-    <string name="notice_room_aliases_added_and_removed">%1$s 为此聊天室新增 %2$s 并移除 %3$s 地址。</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s 为此聊天室新增了 %2$s 并移除 %3$s 地址。</string>
 
-    <string name="notice_room_canonical_alias_set">%1$s 为此聊天室设定了 %2$s 为主地址。</string>
-    <string name="notice_room_canonical_alias_unset">%1$s 为此聊天室移除了主要地址。</string>
+    <string name="notice_room_canonical_alias_set">%1$s 将此聊天室的主地址设为了 %2$s。</string>
+    <string name="notice_room_canonical_alias_unset">%1$s 为此聊天室移除了主地址。</string>
 
     <string name="notice_room_guest_access_can_join">%1$s 已允许访客加入聊天室。</string>
     <string name="notice_room_guest_access_forbidden">%1$s 已禁止访客加入聊天室。</string>
@@ -198,5 +198,99 @@
 
     <string name="key_verification_request_fallback_message">%s 正在请求验证您的密钥，但您的客户端不支援聊天中密钥验证。 您将必须使用旧版的密钥验证来验证金钥。</string>
 
-    <string name="notice_room_created">%1$s 创建了这个房间</string>
+    <string name="notice_room_created">%1$s 创建了这个聊天室</string>
+    <string name="summary_you_sent_image">您发送了一张图片。</string>
+    <string name="summary_you_sent_sticker">您发送了一张贴纸。</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">您的邀请</string>
+    <string name="notice_room_created_by_you">您创建了这个聊天室</string>
+    <string name="notice_room_invite_by_you">您邀请了 %1$s</string>
+    <string name="notice_room_join_by_you">您加入了聊天室</string>
+    <string name="notice_room_leave_by_you">您离开了聊天室</string>
+    <string name="notice_room_reject_by_you">您拒绝了邀请</string>
+    <string name="notice_room_kick_by_you">您移除了 %1$s</string>
+    <string name="notice_room_unban_by_you">您解封了 %1$s</string>
+    <string name="notice_room_ban_by_you">您封禁了 %1$s</string>
+    <string name="notice_room_withdraw_by_you">您撤回了对 %1$s 的邀请</string>
+    <string name="notice_avatar_url_changed_by_you">您更换了您的头像</string>
+    <string name="notice_display_name_set_by_you">您将您的昵称设置为 %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">您将您的昵称从 %1$s 改为 %2$s</string>
+    <string name="notice_display_name_removed_by_you">您移除了您的昵称 (%1$s)</string>
+    <string name="notice_room_topic_changed_by_you">您把主题改为：%1$s</string>
+    <string name="notice_room_avatar_changed">%1$s 变更了聊天室头像</string>
+    <string name="notice_room_avatar_changed_by_you">您变更了聊天室头像</string>
+    <string name="notice_room_name_changed_by_you">您把聊天室名称改为：%1$s</string>
+    <string name="notice_placed_video_call_by_you">您发起了一次视频通话。</string>
+    <string name="notice_placed_voice_call_by_you">您发起了一次语音通话。</string>
+    <string name="notice_call_candidates">%s 发送了数据以建立通话。</string>
+    <string name="notice_call_candidates_by_you">您发送了数据以建立通话。</string>
+    <string name="notice_answered_call_by_you">您接听了通话。</string>
+    <string name="notice_ended_call_by_you">您结束了通话。</string>
+    <string name="notice_made_future_room_visibility_by_you">您已让未来的聊天室记录对 %1$s 可见</string>
+    <string name="notice_end_to_end_by_you">您开启了端到端加密（%1$s）</string>
+    <string name="notice_room_update_by_you">您升级了此聊天室。</string>
+
+    <string name="notice_requested_voip_conference_by_you">您请求了 VoIP 会议</string>
+    <string name="notice_room_name_removed_by_you">您移除了聊天室名称</string>
+    <string name="notice_room_topic_removed_by_you">您移除了聊天室主题</string>
+    <string name="notice_room_avatar_removed">%1$s 移除了聊天室头像</string>
+    <string name="notice_room_avatar_removed_by_you">您移除了聊天室头像</string>
+    <string name="notice_profile_change_redacted_by_you">您更新了您的个人档案 %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">您向 %1$s 发送了加入聊天室的邀请</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">您已撤回了对 %1$s 加入聊天室的邀请</string>
+    <string name="notice_room_third_party_registered_invite_by_you">您接受了 %1$s 的邀请</string>
+
+    <string name="notice_widget_added">%1$s 添加了 %2$s 小部件</string>
+    <string name="notice_widget_added_by_you">您添加了 %1$s 小部件</string>
+    <string name="notice_widget_removed">%1$s 移除了 %2$s 小部件</string>
+    <string name="notice_widget_removed_by_you">您移除了 %1$s 小部件</string>
+    <string name="notice_widget_modified">%1$s 修改了 %2$s 小部件</string>
+    <string name="notice_widget_modified_by_you">您修改了 %1$s 小部件</string>
+
+    <string name="power_level_admin">管理员</string>
+    <string name="power_level_moderator">审核员</string>
+    <string name="power_level_default">默认</string>
+    <string name="power_level_custom">自定义（%1$d）</string>
+    <string name="power_level_custom_no_value">自定义</string>
+
+    <string name="notice_power_level_changed_by_you">您更改了%1$s 的权力等级。</string>
+    <string name="notice_power_level_changed">%1$s 更改了 %2$s 的权力等级。</string>
+    <string name="notice_power_level_diff">%1$s 从 %2$s 到 %3$s</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">您的邀请。理由：%1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">您邀请了 %1$s。理由：%2$s</string>
+    <string name="notice_room_join_with_reason_by_you">您加入了聊天室。理由：%1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">您离开了聊天室。理由：%1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">您拒绝了邀请。理由：%1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">您踢走了 %1$s。理由：%2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">您解封了 %1$s。理由：%2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">您封禁了 %1$s。理由：%2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">您已发送邀请给 %1$s 来加入聊天室。理由：%2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">您撤销了 %1$s 加入聊天室的邀请。理由：%2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">您接受了 %1$s 的邀请。理由：%2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">您撤回了 %1$s 的邀请。理由：%2$s</string>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="other">您新增了 %1$s 为此聊天室的地址。</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="other">您移除了此聊天室的 %2$s 地址。</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed_by_you">您为此聊天室新增了 %1$s 并移除了 %2$s 地址。</string>
+
+    <string name="notice_room_canonical_alias_set_by_you">您将此聊天室的主地址设为了 %1$s。</string>
+    <string name="notice_room_canonical_alias_unset_by_you">您移除了此聊天室的主地址。</string>
+
+    <string name="notice_room_guest_access_can_join_by_you">您已允许访客加入聊天室。</string>
+    <string name="notice_room_guest_access_forbidden_by_you">您已禁止访客加入聊天室。</string>
+
+    <string name="notice_end_to_end_ok_by_you">您已开启端到端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">您已开启端到端加密（无法识别的算法 %1$s）。</string>
+
+    <string name="call_notification_answer">接受</string>
+    <string name="call_notification_reject">拒绝</string>
+    <string name="call_notification_hangup">挂断</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
index f3da62dccc..ee2662f143 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
@@ -200,4 +200,98 @@
     <string name="key_verification_request_fallback_message">%s 正在請求驗證您的金鑰，但您的客戶端不支援聊天中金鑰驗證。您將必須使用舊版的金鑰驗證來驗證金鑰。</string>
 
     <string name="notice_room_created">%1$s 建立了聊天室</string>
+    <string name="summary_you_sent_image">您傳送了圖片。</string>
+    <string name="summary_you_sent_sticker">您傳送了貼圖。</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">您的邀請</string>
+    <string name="notice_room_created_by_you">您建立了聊天室</string>
+    <string name="notice_room_invite_by_you">您邀請了 %1$s</string>
+    <string name="notice_room_join_by_you">您加入了聊天室</string>
+    <string name="notice_room_leave_by_you">您離開的聊天室</string>
+    <string name="notice_room_reject_by_you">您回絕了邀請</string>
+    <string name="notice_room_kick_by_you">您踢除了 %1$s</string>
+    <string name="notice_room_unban_by_you">您取消封鎖了 %1$s</string>
+    <string name="notice_room_ban_by_you">您封鎖了 %1$s</string>
+    <string name="notice_room_withdraw_by_you">您撤銷了 %1$s 的邀請</string>
+    <string name="notice_avatar_url_changed_by_you">您變更了您的大頭貼</string>
+    <string name="notice_display_name_set_by_you">您將您的顯示名稱設定為 %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">您將您的顯示名稱從 %1$s 變更為 %2$s</string>
+    <string name="notice_display_name_removed_by_you">您移除了您的顯示名稱（其曾為 %1$s）</string>
+    <string name="notice_room_topic_changed_by_you">您將主題變更為：%1$s</string>
+    <string name="notice_room_avatar_changed">%1$s 變更了聊天室大頭貼</string>
+    <string name="notice_room_avatar_changed_by_you">您變更了聊天室大頭貼</string>
+    <string name="notice_room_name_changed_by_you">您將聊天室名稱變更為：%1$s</string>
+    <string name="notice_placed_video_call_by_you">您發起了視訊通話。</string>
+    <string name="notice_placed_voice_call_by_you">您發起了音訊通話。</string>
+    <string name="notice_call_candidates">%s 傳送了資料以建立通話。</string>
+    <string name="notice_call_candidates_by_you">您傳送了資料以建立通話。</string>
+    <string name="notice_answered_call_by_you">您接了通話。</string>
+    <string name="notice_ended_call_by_you">您結束了通話。</string>
+    <string name="notice_made_future_room_visibility_by_you">您已將未來的聊天室歷史設定為對 %1$s 可見</string>
+    <string name="notice_end_to_end_by_you">您開啟了端到端加密 (%1$s)</string>
+    <string name="notice_room_update_by_you">您升級了此聊天室。</string>
+
+    <string name="notice_requested_voip_conference_by_you">您請求了 VoIP 會議</string>
+    <string name="notice_room_name_removed_by_you">您移除了聊天室名稱</string>
+    <string name="notice_room_topic_removed_by_you">您移除了聊天室主題</string>
+    <string name="notice_room_avatar_removed">%1$s 移除了聊天室大頭貼</string>
+    <string name="notice_room_avatar_removed_by_you">您移除了聊天室大頭貼</string>
+    <string name="notice_profile_change_redacted_by_you">您更新了您的個人檔案 %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">您傳送了邀請給 %1$s 以加入聊天室</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">您已撤銷對 %1$s 加入聊天室的邀請</string>
+    <string name="notice_room_third_party_registered_invite_by_you">您接受了 %1$s 的邀請</string>
+
+    <string name="notice_widget_added">%1$s 新增了 %2$s 小工具</string>
+    <string name="notice_widget_added_by_you">您新增了 %1$s 小工具</string>
+    <string name="notice_widget_removed">%1$s 移除了 %2$s 小工具</string>
+    <string name="notice_widget_removed_by_you">您移除了 %1$s 小工具</string>
+    <string name="notice_widget_modified">%1$s 修改了 %2$s 小工具</string>
+    <string name="notice_widget_modified_by_you">您修改了 %1$s 小工具</string>
+
+    <string name="power_level_admin">管理員</string>
+    <string name="power_level_moderator">板主</string>
+    <string name="power_level_default">預設</string>
+    <string name="power_level_custom">自訂 (%1$d)</string>
+    <string name="power_level_custom_no_value">自訂</string>
+
+    <string name="notice_power_level_changed_by_you">您變更了 %1$s 的權力等級。</string>
+    <string name="notice_power_level_changed">%1$s 變更了 %2$s 的權力等級。</string>
+    <string name="notice_power_level_diff">%1$s 從 %2$s 到 %3$s</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">您的邀請。理由：%1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">您邀請了 %1$s。理由：%2$s</string>
+    <string name="notice_room_join_with_reason_by_you">您加入了聊天室。理由：%1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">您離開了聊天室。理由：%1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">您回絕了邀請。理由：%1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">您踢除了 %1$s。理由：%2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">您取消封鎖了 %1$s。理由：%2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">您封鎖了 %1$s。理由：%2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">您傳甕了邀請給 %1$s 以加入聊天室。理由：%2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">您撤銷了 %1$s 加入聊天室的邀請。理由：%2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">您接受了 %1$s 的邀請。理由：%2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">您撤回了 %1$s 的邀請。理由：%2$s</string>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="other">您為此聊天室新增了 %1$s 作為地址。</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="other">您為此聊天室移除了 %2$s 作為地址。</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed_by_you">您為此聊天室新增了 %1$s 並移除了 %2$s 作為地址。</string>
+
+    <string name="notice_room_canonical_alias_set_by_you">您將此聊天室的主要地址設定為 %1$s。</string>
+    <string name="notice_room_canonical_alias_unset_by_you">您將此聊天室的主要地址移除。</string>
+
+    <string name="notice_room_guest_access_can_join_by_you">您已允許訪客加入聊天室。</string>
+    <string name="notice_room_guest_access_forbidden_by_you">您已阻止訪客加入聊天室。</string>
+
+    <string name="notice_end_to_end_ok_by_you">您開啟了端到端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">您開啟了端到端加密（無法識別的演算法 %1$s）。</string>
+
+    <string name="call_notification_answer">接受</string>
+    <string name="call_notification_reject">拒絕</string>
+    <string name="call_notification_hangup">掛斷</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/release/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt b/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
similarity index 83%
rename from matrix-sdk-android/src/release/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt
rename to matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
index 56b2ac0d48..c4fed36216 100644
--- a/matrix-sdk-android/src/release/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt
+++ b/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016 Jeff Gilfelt.
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.interceptors
+package org.matrix.android.sdk.internal.network.interceptors
 
-import im.vector.matrix.android.internal.di.MatrixScope
 import okhttp3.Interceptor
 import okhttp3.Response
+import org.matrix.android.sdk.internal.di.MatrixScope
 import java.io.IOException
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/release/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt b/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
similarity index 93%
rename from matrix-sdk-android/src/release/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt
rename to matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
index d2fb4ca898..69b15a1fa5 100644
--- a/matrix-sdk-android/src/release/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt
+++ b/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.network.interceptors
+package org.matrix.android.sdk.internal.network.interceptors
 
 import androidx.annotation.NonNull
 import okhttp3.logging.HttpLoggingInterceptor
diff --git a/matrix-sdk-android/src/sharedTest/java/im/vector/matrix/android/test/shared/TestRules.kt b/matrix-sdk-android/src/sharedTest/java/org/matrix/android/sdk/test/shared/TestRules.kt
similarity index 95%
rename from matrix-sdk-android/src/sharedTest/java/im/vector/matrix/android/test/shared/TestRules.kt
rename to matrix-sdk-android/src/sharedTest/java/org/matrix/android/sdk/test/shared/TestRules.kt
index bf073ecbc3..52aa7ea0c7 100644
--- a/matrix-sdk-android/src/sharedTest/java/im/vector/matrix/android/test/shared/TestRules.kt
+++ b/matrix-sdk-android/src/sharedTest/java/org/matrix/android/sdk/test/shared/TestRules.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.test.shared
+package org.matrix.android.sdk.test.shared
 
 import net.lachlanmckee.timberjunit.TimberTestRule
 
diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/MatrixTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/MatrixTest.kt
similarity index 87%
rename from matrix-sdk-android/src/test/java/im/vector/matrix/android/MatrixTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/MatrixTest.kt
index cef9bb69d7..b0933c7106 100644
--- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/MatrixTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/MatrixTest.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android
+package org.matrix.android.sdk
 
-import im.vector.matrix.android.test.shared.createTimberTestRule
+import org.matrix.android.sdk.test.shared.createTimberTestRule
 import org.junit.Rule
 
 interface MatrixTest {
diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/auth/data/VersionsKtTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/auth/data/VersionsKtTest.kt
similarity index 91%
rename from matrix-sdk-android/src/test/java/im/vector/matrix/android/api/auth/data/VersionsKtTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/auth/data/VersionsKtTest.kt
index fa6e47f96d..69e2f12eb7 100644
--- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/auth/data/VersionsKtTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/auth/data/VersionsKtTest.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.auth.data
+package org.matrix.android.sdk.api.auth.data
 
-import im.vector.matrix.android.internal.auth.version.Versions
-import im.vector.matrix.android.internal.auth.version.isSupportedBySdk
+import org.matrix.android.sdk.internal.auth.version.Versions
+import org.matrix.android.sdk.internal.auth.version.isSupportedBySdk
 import org.amshove.kluent.shouldBe
 import org.junit.Test
 
diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushRuleActionsTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRuleActionsTest.kt
similarity index 92%
rename from matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushRuleActionsTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRuleActionsTest.kt
index 21ea1cbd6a..f213e1b1c1 100644
--- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushRuleActionsTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRuleActionsTest.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
-import im.vector.matrix.android.MatrixTest
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.internal.di.MoshiProvider
+import org.matrix.android.sdk.MatrixTest
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushrulesConditionTest.kt
similarity index 93%
rename from matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushrulesConditionTest.kt
index 1bf40222f8..be5aeaaf0f 100644
--- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/api/pushrules/PushrulesConditionTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushrulesConditionTest.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.api.pushrules
+package org.matrix.android.sdk.api.pushrules
 
-import im.vector.matrix.android.MatrixTest
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
-import im.vector.matrix.android.internal.session.room.RoomGetter
+import org.matrix.android.sdk.MatrixTest
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.internal.session.room.RoomGetter
 import io.mockk.every
 import io.mockk.mockk
 import org.amshove.kluent.shouldBe
diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/keysbackup/util/Base58Test.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
similarity index 93%
rename from matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/keysbackup/util/Base58Test.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
index 6d7ddce0b4..b2d10968b6 100644
--- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/keysbackup/util/Base58Test.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.util
+package org.matrix.android.sdk.internal.crypto.keysbackup.util
 
-import im.vector.matrix.android.MatrixTest
+import org.matrix.android.sdk.MatrixTest
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.FixMethodOrder
diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/keysbackup/util/RecoveryKeyTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
similarity index 96%
rename from matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
index 606be13ed9..6b9d388623 100644
--- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.keysbackup.util
+package org.matrix.android.sdk.internal.crypto.keysbackup.util
 
-import im.vector.matrix.android.MatrixTest
+import org.matrix.android.sdk.MatrixTest
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/store/db/HelperTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/store/db/HelperTest.kt
similarity index 87%
rename from matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/store/db/HelperTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/store/db/HelperTest.kt
index b8524c95e0..cac2d1cba9 100644
--- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/store/db/HelperTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/store/db/HelperTest.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.store.db
+package org.matrix.android.sdk.internal.crypto.store.db
 
-import im.vector.matrix.android.MatrixTest
-import im.vector.matrix.android.internal.util.md5
+import org.matrix.android.sdk.MatrixTest
+import org.matrix.android.sdk.internal.util.md5
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/verification/qrcode/BinaryStringTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt
similarity index 92%
rename from matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/verification/qrcode/BinaryStringTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt
index 8fc93c139e..0f8fe58b7f 100644
--- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/crypto/verification/qrcode/BinaryStringTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.crypto.verification.qrcode
+package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
-import im.vector.matrix.android.MatrixTest
+import org.matrix.android.sdk.MatrixTest
 import org.amshove.kluent.shouldEqualTo
 import org.junit.FixMethodOrder
 import org.junit.Test
diff --git a/matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/task/CoroutineSequencersTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt
similarity index 97%
rename from matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/task/CoroutineSequencersTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt
index 7d460861b1..7bef439417 100644
--- a/matrix-sdk-android/src/test/java/im/vector/matrix/android/internal/task/CoroutineSequencersTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.matrix.android.internal.task
+package org.matrix.android.sdk.internal.task
 
-import im.vector.matrix.android.MatrixTest
+import org.matrix.android.sdk.MatrixTest
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.delay
diff --git a/multipicker/src/main/AndroidManifest.xml b/multipicker/src/main/AndroidManifest.xml
index e1f12697e0..c02a22d1d9 100644
--- a/multipicker/src/main/AndroidManifest.xml
+++ b/multipicker/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotx.multipicker">
+    package="im.vector.lib.multipicker">
 
     <application>
         <provider
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/AudioPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
similarity index 97%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/AudioPicker.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
index 05e4c337b6..17c01bc8e3 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/AudioPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.media.MediaMetadataRetriever
 import android.provider.MediaStore
-import im.vector.riotx.multipicker.entity.MultiPickerAudioType
+import im.vector.lib.multipicker.entity.MultiPickerAudioType
 
 /**
  * Audio file picker implementation
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/CameraPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
similarity index 96%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/CameraPicker.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
index 240d809373..be6fdb5ee8 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/CameraPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
@@ -23,8 +23,8 @@ import android.net.Uri
 import android.provider.MediaStore
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
-import im.vector.riotx.multipicker.entity.MultiPickerImageType
-import im.vector.riotx.multipicker.utils.ImageUtils
+import im.vector.lib.multipicker.entity.MultiPickerImageType
+import im.vector.lib.multipicker.utils.ImageUtils
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Date
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/ContactPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
similarity index 98%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/ContactPicker.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
index a2026475d0..e9ae096174 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/ContactPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
 import android.provider.ContactsContract
-import im.vector.riotx.multipicker.entity.MultiPickerContactType
+import im.vector.lib.multipicker.entity.MultiPickerContactType
 
 /**
  * Contact Picker implementation
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/FilePicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
similarity index 96%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/FilePicker.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
index e8c74fad19..296685886d 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/FilePicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.provider.OpenableColumns
-import im.vector.riotx.multipicker.entity.MultiPickerFileType
+import im.vector.lib.multipicker.entity.MultiPickerFileType
 
 /**
  * Implementation of selecting any type of files
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/ImagePicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
similarity index 95%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/ImagePicker.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
index d7bf383f03..39bd0c27cc 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/ImagePicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.provider.MediaStore
-import im.vector.riotx.multipicker.entity.MultiPickerImageType
-import im.vector.riotx.multipicker.utils.ImageUtils
+import im.vector.lib.multipicker.entity.MultiPickerImageType
+import im.vector.lib.multipicker.utils.ImageUtils
 
 /**
  * Image Picker implementation
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/MultiPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
similarity index 98%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/MultiPicker.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
index 24769e11c3..d28dcf9586 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/MultiPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 class MultiPicker<T> {
 
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/Picker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
similarity index 99%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/Picker.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
index 43ac5d5fdd..65ec77e02a 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/Picker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/VideoPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
similarity index 97%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/VideoPicker.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
index b85ffacd48..7127e9defd 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/VideoPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.media.MediaMetadataRetriever
 import android.provider.MediaStore
-import im.vector.riotx.multipicker.entity.MultiPickerVideoType
+import im.vector.lib.multipicker.entity.MultiPickerVideoType
 
 /**
  * Video Picker implementation
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerAudioType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt
similarity index 95%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerAudioType.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt
index 6afe022024..a779923d46 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerAudioType.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 import android.net.Uri
 
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerBaseType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt
similarity index 94%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerBaseType.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt
index 777e4d8441..c4d22c6a0c 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerBaseType.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 import android.net.Uri
 
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerContactType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt
similarity index 94%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerContactType.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt
index a9135443a2..111e2a5350 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerContactType.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 data class MultiPickerContactType(
         val displayName: String,
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerFileType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt
similarity index 95%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerFileType.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt
index 5417520d28..9baebdeff3 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerFileType.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 import android.net.Uri
 
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerImageType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt
similarity index 95%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerImageType.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt
index b1aef171b4..a3f30fc0d5 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerImageType.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 import android.net.Uri
 
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerVideoType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt
similarity index 95%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerVideoType.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt
index ba9a8d233e..0015052c7c 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerVideoType.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 import android.net.Uri
 
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/provider/MultiPickerFileProvider.kt b/multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt
similarity index 93%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/provider/MultiPickerFileProvider.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt
index 048b2ca199..c553b18acd 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/provider/MultiPickerFileProvider.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.provider
+package im.vector.lib.multipicker.provider
 
 import androidx.core.content.FileProvider
 
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/utils/ImageUtils.kt b/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
similarity index 97%
rename from multipicker/src/main/java/im/vector/riotx/multipicker/utils/ImageUtils.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
index c5171e7d84..a3d69ae8cf 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/utils/ImageUtils.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.utils
+package im.vector.lib.multipicker.utils
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 08142719b9..b5438a0c5b 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -164,8 +164,11 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If it is ok, change the value in file forbidden_strings_in_code.txt
-enum class===74
+enum class===76
 
 ### Do not import temporary legacy classes
-import im.vector.matrix.android.internal.legacy.riot===3
+import org.matrix.android.sdk.internal.legacy.riot===3
 import org.matrix.androidsdk.crypto.data===2
+
+### Use `Context#getSystemService` extension function provided by `core-ktx`
+getSystemService\(Context
diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt
index 17ae015265..0bbe90b31f 100644
--- a/tools/check/forbidden_strings_in_resources.txt
+++ b/tools/check/forbidden_strings_in_resources.txt
@@ -73,10 +73,10 @@ layout_constraintLeft_
 ### Use Preference from androidx library (androidx.preference.PreferenceScreen)
 <PreferenceScreen
 
-### Use im.vector.riotx.core.preference.VectorSwitchPreference to support multiline of the title
+### Use im.vector.app.core.preference.VectorSwitchPreference to support multiline of the title
 <SwitchPreference
 
-### Use im.vector.riotx.core.preference.VectorPreference to support multiline of the title
+### Use im.vector.app.core.preference.VectorPreference to support multiline of the title
 <Preference\n
 
 ### Will crash on API < 21. Use ?colorAccent instead
diff --git a/tools/debug_alter_scalar_token.sh b/tools/debug_alter_scalar_token.sh
index dc33c465fa..8b99e31f82 100755
--- a/tools/debug_alter_scalar_token.sh
+++ b/tools/debug_alter_scalar_token.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_ALTER_SCALAR_TOKEN
+adb shell am broadcast -a im.vector.app.DEBUG_ACTION_ALTER_SCALAR_TOKEN
diff --git a/tools/debug_dump_filesystem.sh b/tools/debug_dump_filesystem.sh
index fe418963bf..9f137087db 100755
--- a/tools/debug_dump_filesystem.sh
+++ b/tools/debug_dump_filesystem.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_DUMP_FILESYSTEM
+adb shell am broadcast -a im.vector.app.DEBUG_ACTION_DUMP_FILESYSTEM
diff --git a/tools/debug_dump_prefs.sh b/tools/debug_dump_prefs.sh
index 2b6bc2a201..89300d2352 100755
--- a/tools/debug_dump_prefs.sh
+++ b/tools/debug_dump_prefs.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_DUMP_PREFERENCES
+adb shell am broadcast -a im.vector.app.DEBUG_ACTION_DUMP_PREFERENCES
diff --git a/tools/jitsi/build_jisti_libs.sh b/tools/jitsi/build_jisti_libs.sh
new file mode 100755
index 0000000000..1341a87d10
--- /dev/null
+++ b/tools/jitsi/build_jisti_libs.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+
+########
+# This script build the Jitsi library with LIBRE_BUILD flag.
+# Following instructions from here https://github.com/jitsi/jitsi-meet/tree/master/android#build-and-use-your-own-sdk-artifactsbinaries
+# It then export the library in a maven repository, that we host here https://github.com/vector-im/jitsi_libre_maven
+
+# exit on any error
+set -e
+
+echo
+echo "##################################################"
+echo "Cloning jitsi-meet repository"
+echo "##################################################"
+
+cd ..
+rm -rf jitsi-meet
+git clone https://github.com/jitsi/jitsi-meet
+
+# We want a libre build!
+export LIBRE_BUILD=true
+
+cd jitsi-meet
+
+# This is commit after version 2.2.2, which does not compile
+# git checkout 5a934c071a5cbe64de275a25d0ed62d8193cdd03
+
+# Version android-sdk-2.9.3, commit abcbbbea12e3ef88012b14723bb8cd42dbefc988
+git checkout android-sdk-2.9.3
+
+echo
+echo "##################################################"
+echo "npm install"
+echo "##################################################"
+
+npm install
+#make
+
+#echo
+#echo "##################################################"
+#echo "Build the Android library"
+#echo "##################################################"
+#
+#pushd android
+#./gradlew assembleRelease
+#popd
+#
+#echo
+#echo "##################################################"
+#echo "Bundle with React Native"
+#echo "##################################################"
+#
+#react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output index.android.bundle --assets-dest android/app/src/main/res/
+
+./android/scripts/release-sdk.sh /tmp/jitsi/
+
+# Also copy jsc
+
+mkdir -p /tmp/jitsi/org/webkit/
+cp -r ./node_modules/jsc-android/dist/org/webkit/android-jsc /tmp/jitsi/org/webkit/
+
+echo
+echo "##################################################"
+echo "Release has been done here: /tmp/jitsi/"
+echo "##################################################"
diff --git a/tools/templates/RiotXFeature/root/src/app_package/Action.kt.ftl b/tools/templates/RiotXFeature/root/src/app_package/Action.kt.ftl
index 7492907e6c..165088318b 100644
--- a/tools/templates/RiotXFeature/root/src/app_package/Action.kt.ftl
+++ b/tools/templates/RiotXFeature/root/src/app_package/Action.kt.ftl
@@ -1,5 +1,5 @@
 package ${escapeKotlinIdentifiers(packageName)}
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class ${actionClass}: VectorViewModelAction
\ No newline at end of file
diff --git a/tools/templates/RiotXFeature/root/src/app_package/Activity.kt.ftl b/tools/templates/RiotXFeature/root/src/app_package/Activity.kt.ftl
index fdac319482..ea301b241b 100644
--- a/tools/templates/RiotXFeature/root/src/app_package/Activity.kt.ftl
+++ b/tools/templates/RiotXFeature/root/src/app_package/Activity.kt.ftl
@@ -3,10 +3,10 @@ package ${escapeKotlinIdentifiers(packageName)}
 import android.content.Context
 import android.content.Intent
 import androidx.appcompat.widget.Toolbar
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
 
 //TODO: add this activity to manifest
 class ${activityClass} : VectorBaseActivity(), ToolbarConfigurable {
diff --git a/tools/templates/RiotXFeature/root/src/app_package/Fragment.kt.ftl b/tools/templates/RiotXFeature/root/src/app_package/Fragment.kt.ftl
index df69078d9d..7e6eac65c8 100644
--- a/tools/templates/RiotXFeature/root/src/app_package/Fragment.kt.ftl
+++ b/tools/templates/RiotXFeature/root/src/app_package/Fragment.kt.ftl
@@ -9,8 +9,8 @@ import com.airbnb.mvrx.args
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
 import javax.inject.Inject
 
 <#if createFragmentArgs>
diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl b/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl
index 4d7d2ee450..59b786ddf5 100644
--- a/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl
+++ b/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl
@@ -1,5 +1,5 @@
 package ${escapeKotlinIdentifiers(packageName)}
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class ${viewEventsClass} : VectorViewEvents
\ No newline at end of file
diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl b/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl
index 1d2ec0a069..d3c50c961c 100644
--- a/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl
+++ b/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl
@@ -6,12 +6,12 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
 
 <#if createViewEvents>
 <#else>
-import im.vector.riotx.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.EmptyViewEvents
 </#if>
 
 class ${viewModelClass} @AssistedInject constructor(@Assisted initialState: ${viewStateClass})
diff --git a/tools/tests/app_standby_off.sh b/tools/tests/app_standby_off.sh
index f285456bc5..24502cb7fe 100755
--- a/tools/tests/app_standby_off.sh
+++ b/tools/tests/app_standby_off.sh
@@ -6,5 +6,5 @@ echo "Standby OFF"
 echo "adb shell dumpsys battery reset"
 adb shell dumpsys battery reset
 
-echo "adb shell am set-inactive im.vector.riotx false"
-adb shell am set-inactive im.vector.riotx false
+echo "adb shell am set-inactive im.vector.app false"
+adb shell am set-inactive im.vector.app false
diff --git a/tools/tests/app_standby_on.sh b/tools/tests/app_standby_on.sh
index c4c690b859..390efe064b 100755
--- a/tools/tests/app_standby_on.sh
+++ b/tools/tests/app_standby_on.sh
@@ -6,5 +6,5 @@ echo "Standby ON"
 echo "adb shell dumpsys battery unplug"
 adb shell dumpsys battery unplug
 
-echo "adb shell am set-inactive im.vector.riotx true"
-adb shell am set-inactive im.vector.riotx true
+echo "adb shell am set-inactive im.vector.app true"
+adb shell am set-inactive im.vector.app true
diff --git a/tools/workmanager/dumpsys_debug.sh b/tools/workmanager/dumpsys_debug.sh
index 42009a27a0..8c4da9909e 100755
--- a/tools/workmanager/dumpsys_debug.sh
+++ b/tools/workmanager/dumpsys_debug.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell dumpsys jobscheduler im.vector.riotx.debug
+adb shell dumpsys jobscheduler im.vector.app.debug
diff --git a/tools/workmanager/dumpsys_release.sh b/tools/workmanager/dumpsys_release.sh
index 5eb7df2bc2..7826e1b3b8 100755
--- a/tools/workmanager/dumpsys_release.sh
+++ b/tools/workmanager/dumpsys_release.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell dumpsys jobscheduler im.vector.riotx
+adb shell dumpsys jobscheduler im.vector.app
diff --git a/vector/build.gradle b/vector/build.gradle
index dd78e7e87c..57fd0cc51a 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -17,7 +17,7 @@ androidExtensions {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 0
-ext.versionPatch = 4
+ext.versionPatch = 5
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -346,6 +346,7 @@ dependencies {
     implementation 'me.saket:better-link-movement-method:2.2.0'
     implementation 'com.google.android:flexbox:1.1.1'
     implementation "androidx.autofill:autofill:$autofill_version"
+    implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta9'
 
     // Custom Tab
     implementation 'androidx.browser:browser:1.2.0'
@@ -404,8 +405,10 @@ dependencies {
 
     implementation 'com.github.BillCarsonFr:JsonViewer:0.5'
 
-    // TODO meant for development purposes only
-    implementation 'org.webrtc:google-webrtc:1.0.+'
+    // WebRTC
+    // org.webrtc:google-webrtc is for development purposes only
+    // implementation 'org.webrtc:google-webrtc:1.0.+'
+    implementation('org.jitsi.react:jitsi-meet-sdk:2.9.3') { transitive = true }
 
     // QR-code
     // Stick to 3.3.3 because of https://github.com/zxing/zxing/issues/1170
diff --git a/vector/lint.xml b/vector/lint.xml
index 9a0c6e9a1c..bd49091a3f 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -6,6 +6,7 @@
     <issue id="MissingTranslation" severity="warning" />
     <issue id="TypographyEllipsis" severity="error" />
     <issue id="ImpliedQuantity" severity="warning" />
+    <issue id="UnusedQuantity" severity="error" />
     <issue id="IconXmlAndPng" severity="error" />
     <issue id="IconDipSize" severity="error" />
     <issue id="IconDuplicatesConfig" severity="error" />
@@ -29,20 +30,22 @@
 
     <!-- RTL -->
     <issue id="RtlEnabled" severity="error" />
-    <!-- Now with min API set to 19, we do not need Left and Right attribute, Start and End is enougth. For the moment, just reduce the severity -->
-    <issue id="RtlHardcoded" severity="warning" />
+    <issue id="RtlHardcoded" severity="error" />
     <issue id="RtlSymmetry" severity="error" />
 
     <!-- Code -->
     <issue id="SetTextI18n" severity="error" />
     <issue id="ViewConstructor" severity="error" />
     <issue id="UseValueOf" severity="error" />
+    <issue id="ObsoleteSdkInt" severity="error" />
     <issue id="Recycle" severity="error" />
     <issue id="KotlinPropertyAccess" severity="error" />
 
-    <!-- Ignore error from HtmlCompressor lib -->
     <issue id="InvalidPackage">
+        <!-- Ignore error from HtmlCompressor lib -->
         <ignore path="**/htmlcompressor-1.4.jar" />
+        <!-- Ignore error from dropbox-core-sdk-3.0.8 lib, which comes with Jitsi library -->
+        <ignore path="**/dropbox-core-sdk-3.0.8.jar" />
     </issue>
 
     <!-- Manifest -->
diff --git a/vector/proguard-rules.pro b/vector/proguard-rules.pro
index bc27767d8a..46fae8338c 100644
--- a/vector/proguard-rules.pro
+++ b/vector/proguard-rules.pro
@@ -20,7 +20,48 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep class im.vector.riotx.features.** { *; }
+-keep class im.vector.app.features.** { *; }
 
 ## print all the rules in a file
 # -printconfiguration ../proguard_files/full-r8-config.txt
+
+# WebRTC
+
+-keep class org.webrtc.** { *; }
+-dontwarn org.chromium.build.BuildHooksAndroid
+
+# Jitsi (else callbacks are not called)
+
+-keep class org.jitsi.meet.** { *; }
+-keep class org.jitsi.meet.sdk.** { *; }
+
+# React Native
+
+# Keep our interfaces so they can be used by other ProGuard rules.
+# See http://sourceforge.net/p/proguard/bugs/466/
+-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
+-keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
+-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
+
+# Do not strip any method/class that is annotated with @DoNotStrip
+-keep @com.facebook.proguard.annotations.DoNotStrip class *
+-keep @com.facebook.common.internal.DoNotStrip class *
+-keepclassmembers class * {
+    @com.facebook.proguard.annotations.DoNotStrip *;
+    @com.facebook.common.internal.DoNotStrip *;
+}
+
+-keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
+  void set*(***);
+  *** get*();
+}
+
+-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
+-keep class * extends com.facebook.react.bridge.NativeModule { *; }
+-keepclassmembers,includedescriptorclasses class * { native <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.UIProp <fields>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
+
+-dontwarn com.facebook.react.**
+-keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
\ No newline at end of file
diff --git a/vector/src/androidTest/java/im/vector/riotx/InstrumentedTest.kt b/vector/src/androidTest/java/im/vector/app/InstrumentedTest.kt
similarity index 91%
rename from vector/src/androidTest/java/im/vector/riotx/InstrumentedTest.kt
rename to vector/src/androidTest/java/im/vector/app/InstrumentedTest.kt
index c34a3ef67b..363c99397d 100644
--- a/vector/src/androidTest/java/im/vector/riotx/InstrumentedTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/InstrumentedTest.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
-import im.vector.riotx.test.shared.createTimberTestRule
+import im.vector.app.test.shared.createTimberTestRule
 import org.junit.Rule
 
 interface InstrumentedTest {
diff --git a/vector/src/androidTest/java/im/vector/riotx/core/utils/TemporaryStoreTest.kt b/vector/src/androidTest/java/im/vector/app/core/utils/TemporaryStoreTest.kt
similarity index 96%
rename from vector/src/androidTest/java/im/vector/riotx/core/utils/TemporaryStoreTest.kt
rename to vector/src/androidTest/java/im/vector/app/core/utils/TemporaryStoreTest.kt
index 020899204d..d8619f1824 100644
--- a/vector/src/androidTest/java/im/vector/riotx/core/utils/TemporaryStoreTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/core/utils/TemporaryStoreTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import org.amshove.kluent.shouldBe
 import org.junit.Test
diff --git a/vector/src/androidTest/java/im/vector/riotx/features/reactions/data/EmojiDataSourceTest.kt b/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
similarity index 97%
rename from vector/src/androidTest/java/im/vector/riotx/features/reactions/data/EmojiDataSourceTest.kt
rename to vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
index a3e45c3cf2..8959416445 100644
--- a/vector/src/androidTest/java/im/vector/riotx/features/reactions/data/EmojiDataSourceTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.reactions.data
+package im.vector.app.features.reactions.data
 
-import im.vector.riotx.InstrumentedTest
+import im.vector.app.InstrumentedTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.FixMethodOrder
diff --git a/vector/src/debug/AndroidManifest.xml b/vector/src/debug/AndroidManifest.xml
index 8bb571902a..36e9ac73df 100644
--- a/vector/src/debug/AndroidManifest.xml
+++ b/vector/src/debug/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotx">
+    package="im.vector.app">
 
     <application>
         <activity android:name=".features.debug.TestLinkifyActivity" />
diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
similarity index 95%
rename from vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt
rename to vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
index 542b0a1cbb..6c4bb925dd 100644
--- a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 import android.os.Bundle
 import android.view.Menu
@@ -22,8 +22,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.toast
+import im.vector.app.R
+import im.vector.app.core.utils.toast
 import kotlinx.android.synthetic.debug.activity_test_material_theme.*
 
 // Rendering is not the same with VectorBaseActivity
diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkActivity.kt
similarity index 94%
rename from vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt
rename to vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkActivity.kt
index f925c7b2c3..e6e1bf04ee 100644
--- a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkActivity.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 class DebugMaterialThemeDarkActivity : DebugMaterialThemeActivity()
diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightActivity.kt
similarity index 94%
rename from vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt
rename to vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightActivity.kt
index 1602bb0553..d1d3061cad 100644
--- a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightActivity.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 class DebugMaterialThemeLightActivity : DebugMaterialThemeActivity()
diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
similarity index 88%
rename from vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt
rename to vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index a197a6f93e..855333d96b 100644
--- a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -14,29 +14,29 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 import android.app.Activity
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.Person
+import androidx.core.content.getSystemService
 import butterknife.OnClick
-import im.vector.matrix.android.internal.crypto.verification.qrcode.toQrCodeData
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.debug.sas.DebugSasEmojiActivity
-import im.vector.riotx.features.qrcode.QrCodeScannerActivity
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.core.utils.toast
+import im.vector.app.features.debug.sas.DebugSasEmojiActivity
+import im.vector.app.features.qrcode.QrCodeScannerActivity
+import org.matrix.android.sdk.internal.crypto.verification.qrcode.toQrCodeData
 import kotlinx.android.synthetic.debug.activity_debug_menu.*
 import timber.log.Timber
 import javax.inject.Inject
@@ -83,7 +83,7 @@ class DebugMenuActivity : VectorBaseActivity() {
 
     @OnClick(R.id.debug_test_notification)
     fun testNotification() {
-        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val notificationManager = getSystemService<NotificationManager>()!!
 
         // Create channel first
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -95,7 +95,7 @@ class DebugMenuActivity : VectorBaseActivity() {
                     )
 
             channel.description = "Channel description"
-            (getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).createNotificationChannel(channel)
+            notificationManager.createNotificationChannel(channel)
 
             val channel2 =
                     NotificationChannel(
@@ -105,7 +105,7 @@ class DebugMenuActivity : VectorBaseActivity() {
                     )
 
             channel2.description = "Channel description 2"
-            (getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).createNotificationChannel(channel2)
+            notificationManager.createNotificationChannel(channel2)
         }
 
         val builder = NotificationCompat.Builder(this, "CHAN")
diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
similarity index 98%
rename from vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt
rename to vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
index 6af4317094..fd28aabd49 100644
--- a/vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -25,7 +25,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotx.R
+import im.vector.app.R
 
 class TestLinkifyActivity : AppCompatActivity() {
 
diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt
similarity index 83%
rename from vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt
rename to vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt
index 170c156858..f22784bc12 100644
--- a/vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug.sas
+package im.vector.app.features.debug.sas
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import im.vector.matrix.android.api.crypto.getAllVerificationEmojis
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import org.matrix.android.sdk.api.crypto.getAllVerificationEmojis
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 
 class DebugSasEmojiActivity : AppCompatActivity() {
diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiController.kt b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiController.kt
rename to vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt
index 5629497de8..9cacdc14c4 100644
--- a/vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiController.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug.sas
+package im.vector.app.features.debug.sas
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation
+import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
 
 data class SasState(
         val emojiList: List<EmojiRepresentation>
diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiItem.kt b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
similarity index 73%
rename from vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiItem.kt
rename to vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
index cf9ca1032c..408aebb186 100644
--- a/vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiItem.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug.sas
+package im.vector.app.features.debug.sas
 
 import android.annotation.SuppressLint
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
 import me.gujun.android.span.image
 import me.gujun.android.span.span
 
-@EpoxyModelClass(layout = im.vector.riotx.R.layout.item_sas_emoji)
+@EpoxyModelClass(layout = im.vector.app.R.layout.item_sas_emoji)
 abstract class SasEmojiItem : VectorEpoxyModel<SasEmojiItem.Holder>() {
 
     @EpoxyAttribute
@@ -50,9 +50,9 @@ abstract class SasEmojiItem : VectorEpoxyModel<SasEmojiItem.Holder>() {
     }
 
     class Holder : VectorEpoxyHolder() {
-        val indexView by bind<TextView>(im.vector.riotx.R.id.sas_emoji_index)
-        val emojiView by bind<TextView>(im.vector.riotx.R.id.sas_emoji)
-        val textView by bind<TextView>(im.vector.riotx.R.id.sas_emoji_text)
-        val idView by bind<TextView>(im.vector.riotx.R.id.sas_emoji_text_id)
+        val indexView by bind<TextView>(im.vector.app.R.id.sas_emoji_index)
+        val emojiView by bind<TextView>(im.vector.app.R.id.sas_emoji)
+        val textView by bind<TextView>(im.vector.app.R.id.sas_emoji_text)
+        val idView by bind<TextView>(im.vector.app.R.id.sas_emoji_text_id)
     }
 }
diff --git a/vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt b/vector/src/debug/java/im/vector/app/receivers/DebugReceiver.kt
similarity index 97%
rename from vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt
rename to vector/src/debug/java/im/vector/app/receivers/DebugReceiver.kt
index 914d7923df..7b64bed08e 100644
--- a/vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt
+++ b/vector/src/debug/java/im/vector/app/receivers/DebugReceiver.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.receivers
+package im.vector.app.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
-import androidx.preference.PreferenceManager
 import androidx.core.content.edit
-import im.vector.riotx.core.utils.lsFiles
+import androidx.preference.PreferenceManager
+import im.vector.app.core.utils.lsFiles
 import timber.log.Timber
 
 /**
diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector/src/debug/res/layout/activity_debug_menu.xml
index 6578258e70..458b44fd05 100644
--- a/vector/src/debug/res/layout/activity_debug_menu.xml
+++ b/vector/src/debug/res/layout/activity_debug_menu.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="im.vector.riotx.features.debug.DebugMenuActivity"
+    tools:context=".features.debug.DebugMenuActivity"
     tools:ignore="HardcodedText">
 
     <ScrollView
@@ -68,7 +68,7 @@
                 android:layout_height="wrap_content"
                 android:text="Scan QR-code" />
 
-            <im.vector.riotx.core.ui.views.QrCodeImageView
+            <im.vector.app.core.ui.views.QrCodeImageView
                 android:id="@+id/debug_qr_code"
                 android:layout_width="200dp"
                 android:layout_height="200dp"
diff --git a/vector/src/debug/res/layout/activity_test_linkify.xml b/vector/src/debug/res/layout/activity_test_linkify.xml
index 4cabd2d972..bbaadb20a2 100644
--- a/vector/src/debug/res/layout/activity_test_linkify.xml
+++ b/vector/src/debug/res/layout/activity_test_linkify.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/riot_secondary_text_color_status"
-    tools:context="im.vector.riotx.features.debug.TestLinkifyActivity">
+    tools:context=".features.debug.TestLinkifyActivity">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/vector/src/debug/res/layout/demo_store_listing.xml b/vector/src/debug/res/layout/demo_store_listing.xml
deleted file mode 100644
index 209a0589c7..0000000000
--- a/vector/src/debug/res/layout/demo_store_listing.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/store_title" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/store_whats_new" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/store_short_description" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/store_full_description" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/fdroid/AndroidManifest.xml b/vector/src/fdroid/AndroidManifest.xml
index 32cdba9251..55f745ddfa 100644
--- a/vector/src/fdroid/AndroidManifest.xml
+++ b/vector/src/fdroid/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotx">
+    package="im.vector.app">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
diff --git a/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt b/vector/src/fdroid/java/im/vector/app/FlavorCode.kt
similarity index 96%
rename from vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt
rename to vector/src/fdroid/java/im/vector/app/FlavorCode.kt
index de1ee2290b..7d8ef22b44 100644
--- a/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt
+++ b/vector/src/fdroid/java/im/vector/app/FlavorCode.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import android.content.Context
 
diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
similarity index 86%
rename from vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
rename to vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
index 3cbd6699fd..b7834ecf45 100644
--- a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.fdroid.features.settings.troubleshoot
+package im.vector.app.fdroid.features.settings.troubleshoot
 
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
similarity index 91%
rename from vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
rename to vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
index 67ca2627bc..3e053d7fec 100644
--- a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.fdroid.features.settings.troubleshoot
+package im.vector.app.fdroid.features.settings.troubleshoot
 
-import android.content.Context
 import android.net.ConnectivityManager
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.getSystemService
 import androidx.core.net.ConnectivityManagerCompat
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import javax.inject.Inject
 
 class TestBackgroundRestrictions @Inject constructor(private val context: AppCompatActivity,
@@ -29,7 +29,7 @@ class TestBackgroundRestrictions @Inject constructor(private val context: AppCom
     : TroubleshootTest(R.string.settings_troubleshoot_test_bg_restricted_title) {
 
     override fun perform() {
-        (context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager).apply {
+        context.getSystemService<ConnectivityManager>()!!.apply {
             // Checks if the device is on a metered network
             if (isActiveNetworkMetered) {
                 // Checks user’s Data Saver settings.
diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
similarity index 81%
rename from vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
rename to vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
index 2abbf7a419..19a6870b2b 100644
--- a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.fdroid.features.settings.troubleshoot
+package im.vector.app.fdroid.features.settings.troubleshoot
 
 import androidx.fragment.app.Fragment
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.isIgnoringBatteryOptimizations
-import im.vector.riotx.core.utils.requestDisablingBatteryOptimization
-import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.R
+import im.vector.app.core.utils.isIgnoringBatteryOptimizations
+import im.vector.app.core.utils.requestDisablingBatteryOptimization
+import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 
 // Not used anymore
 class TestBatteryOptimization(val fragment: Fragment) : TroubleshootTest(R.string.settings_troubleshoot_test_battery_title) {
diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt b/vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
similarity index 95%
rename from vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt
rename to vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
index cd72d705e0..a9574c3bfe 100644
--- a/vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
@@ -17,4 +17,4 @@
 /**
  * Code exclusively used by the FDroid build and not referenced on the main source code
  */
-package im.vector.riotx.fdroid
+package im.vector.app.fdroid
diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
similarity index 87%
rename from vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
rename to vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
index 8c9cdbf63b..1af92ff387 100644
--- a/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.fdroid.receiver
+package im.vector.app.fdroid.receiver
 
 import android.app.AlarmManager
 import android.app.PendingIntent
@@ -24,9 +24,10 @@ import android.content.Intent
 import android.os.Build
 import android.os.PowerManager
 import androidx.core.content.ContextCompat
-import im.vector.matrix.android.internal.session.sync.job.SyncService
-import im.vector.riotx.core.di.HasVectorInjector
-import im.vector.riotx.core.services.VectorSyncService
+import im.vector.app.core.di.HasVectorInjector
+import im.vector.app.core.services.VectorSyncService
+import androidx.core.content.getSystemService
+import org.matrix.android.sdk.internal.session.sync.job.SyncService
 import timber.log.Timber
 
 class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
@@ -42,7 +43,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
         }
 
         // Acquire a lock to give enough time for the sync :/
-        (context.getSystemService(Context.POWER_SERVICE) as PowerManager).run {
+        context.getSystemService<PowerManager>()!!.run {
             newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "riotx:fdroidSynclock").apply {
                 acquire((10_000).toLong())
             }
@@ -74,7 +75,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
             }
             val pIntent = PendingIntent.getBroadcast(context, REQUEST_CODE, intent, PendingIntent.FLAG_UPDATE_CURRENT)
             val firstMillis = System.currentTimeMillis() + delay
-            val alarmMgr = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+            val alarmMgr = context.getSystemService<AlarmManager>()!!
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 alarmMgr.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, firstMillis, pIntent)
             } else {
@@ -86,7 +87,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
             Timber.v("Cancel alarm")
             val intent = Intent(context, AlarmSyncBroadcastReceiver::class.java)
             val pIntent = PendingIntent.getBroadcast(context, REQUEST_CODE, intent, PendingIntent.FLAG_UPDATE_CURRENT)
-            val alarmMgr = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+            val alarmMgr = context.getSystemService<AlarmManager>()!!
             alarmMgr.cancel(pIntent)
         }
     }
diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
similarity index 93%
rename from vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
rename to vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
index 031c2bc5e7..a8a394576b 100644
--- a/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.fdroid.receiver
+package im.vector.app.fdroid.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import im.vector.riotx.core.di.HasVectorInjector
+import im.vector.app.core.di.HasVectorInjector
 import timber.log.Timber
 
 class OnApplicationUpgradeOrRebootReceiver : BroadcastReceiver() {
diff --git a/vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt b/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
similarity index 89%
rename from vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt
rename to vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
index 9205434438..7a8c5fa134 100755
--- a/vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt
+++ b/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
@@ -16,14 +16,14 @@
  */
 @file:Suppress("UNUSED_PARAMETER")
 
-package im.vector.riotx.push.fcm
+package im.vector.app.push.fcm
 
 import android.app.Activity
 import android.content.Context
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.fdroid.receiver.AlarmSyncBroadcastReceiver
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.fdroid.receiver.AlarmSyncBroadcastReceiver
+import im.vector.app.features.settings.VectorPreferences
 import timber.log.Timber
 
 /**
diff --git a/vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
similarity index 75%
rename from vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt
rename to vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
index b88a379450..ce9bad6c26 100644
--- a/vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt
+++ b/vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.push.fcm
+package im.vector.app.push.fcm
 
 import androidx.fragment.app.Fragment
-import im.vector.riotx.fdroid.features.settings.troubleshoot.TestAutoStartBoot
-import im.vector.riotx.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions
-import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings
-import im.vector.riotx.features.settings.troubleshoot.TestPushRulesSettings
-import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings
-import im.vector.riotx.features.settings.troubleshoot.TestSystemSettings
+import im.vector.app.fdroid.features.settings.troubleshoot.TestAutoStartBoot
+import im.vector.app.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions
+import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.app.features.settings.troubleshoot.TestAccountSettings
+import im.vector.app.features.settings.troubleshoot.TestDeviceSettings
+import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings
+import im.vector.app.features.settings.troubleshoot.TestSystemSettings
 import javax.inject.Inject
 
 class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,
diff --git a/vector/src/gplay/AndroidManifest.xml b/vector/src/gplay/AndroidManifest.xml
index db30f21f7a..d849d5fb2d 100755
--- a/vector/src/gplay/AndroidManifest.xml
+++ b/vector/src/gplay/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotx">
+    package="im.vector.app">
 
     <application>
 
diff --git a/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt b/vector/src/gplay/java/im/vector/app/FlavorCode.kt
similarity index 97%
rename from vector/src/gplay/java/im/vector/riotx/FlavorCode.kt
rename to vector/src/gplay/java/im/vector/app/FlavorCode.kt
index 109e9bc978..040296d755 100644
--- a/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt
+++ b/vector/src/gplay/java/im/vector/app/FlavorCode.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import android.content.Context
 import android.content.Intent
diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
similarity index 90%
rename from vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
rename to vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
index 3806893d98..318867af91 100644
--- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.gplay.features.settings.troubleshoot
+package im.vector.app.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.iid.FirebaseInstanceId
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.startAddGoogleAccountIntent
-import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
-import im.vector.riotx.push.fcm.FcmHelper
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.startAddGoogleAccountIntent
+import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.push.fcm.FcmHelper
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
similarity index 91%
rename from vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt
rename to vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
index c28a02d350..133fe1cb05 100644
--- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.gplay.features.settings.troubleshoot
+package im.vector.app.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
similarity index 87%
rename from vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
rename to vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
index 75e888dfb7..6cb9c38fc6 100644
--- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.gplay.features.settings.troubleshoot
+package im.vector.app.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
-import im.vector.matrix.android.api.session.pushers.PusherState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
-import im.vector.riotx.push.fcm.FcmHelper
+import org.matrix.android.sdk.api.session.pushers.PusherState
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.push.fcm.FcmHelper
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt b/vector/src/gplay/java/im/vector/app/gplay/package-info.kt
similarity index 95%
rename from vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt
rename to vector/src/gplay/java/im/vector/app/gplay/package-info.kt
index 02e0382503..a37d300d52 100644
--- a/vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/package-info.kt
@@ -17,4 +17,4 @@
 /**
  * Code exclusively used by the GPlay build and not referenced on the main source code
  */
-package im.vector.riotx.gplay
+package im.vector.app.gplay
diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
similarity index 92%
rename from vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt
rename to vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index 9fadbcafb6..617e40225d 100755
--- a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.gplay.push.fcm
+package im.vector.app.gplay.push.fcm
 
 import android.os.Handler
 import android.os.Looper
@@ -25,21 +25,21 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ProcessLifecycleOwner
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.extensions.vectorComponent
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.features.badge.BadgeProxy
-import im.vector.riotx.features.notifications.NotifiableEventResolver
-import im.vector.riotx.features.notifications.NotifiableMessageEvent
-import im.vector.riotx.features.notifications.NotificationDrawerManager
-import im.vector.riotx.features.notifications.SimpleNotifiableEvent
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.push.fcm.FcmHelper
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.Event
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.features.badge.BadgeProxy
+import im.vector.app.features.notifications.NotifiableEventResolver
+import im.vector.app.features.notifications.NotifiableMessageEvent
+import im.vector.app.features.notifications.NotificationDrawerManager
+import im.vector.app.features.notifications.SimpleNotifiableEvent
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.push.fcm.FcmHelper
 import timber.log.Timber
 
 /**
diff --git a/vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
similarity index 95%
rename from vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt
rename to vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
index b04f9b3703..6c68d6c3b5 100755
--- a/vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.push.fcm
+package im.vector.app.push.fcm
 
 import android.app.Activity
 import android.content.Context
@@ -25,10 +25,10 @@ import androidx.core.content.edit
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.firebase.iid.FirebaseInstanceId
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.features.settings.VectorPreferences
 import timber.log.Timber
 
 /**
diff --git a/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
similarity index 75%
rename from vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt
rename to vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
index 2830822918..b2dad09483 100644
--- a/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.push.fcm
+package im.vector.app.push.fcm
 
 import androidx.fragment.app.Fragment
-import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings
-import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings
-import im.vector.riotx.features.settings.troubleshoot.TestPushRulesSettings
-import im.vector.riotx.features.settings.troubleshoot.TestSystemSettings
-import im.vector.riotx.gplay.features.settings.troubleshoot.TestFirebaseToken
-import im.vector.riotx.gplay.features.settings.troubleshoot.TestPlayServices
-import im.vector.riotx.gplay.features.settings.troubleshoot.TestTokenRegistration
+import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.app.features.settings.troubleshoot.TestAccountSettings
+import im.vector.app.features.settings.troubleshoot.TestDeviceSettings
+import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings
+import im.vector.app.features.settings.troubleshoot.TestSystemSettings
+import im.vector.app.gplay.features.settings.troubleshoot.TestFirebaseToken
+import im.vector.app.gplay.features.settings.troubleshoot.TestPlayServices
+import im.vector.app.gplay.features.settings.troubleshoot.TestTokenRegistration
 import javax.inject.Inject
 
 class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 344a10e75b..f07d992726 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="im.vector.riotx">
+    package="im.vector.app">
 
     <!-- Needed for VOIP call to detect and switch to headset-->
     <uses-permission android:name="android.permission.BLUETOOTH" />
@@ -28,6 +28,14 @@
     <!-- Needed for incoming calls  -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
+    <!-- Jitsi libs adds CALENDAR permissions, but we can remove them safely according to https://github.com/jitsi/jitsi-meet/issues/4068#issuecomment-480482481 -->
+    <uses-permission
+        android:name="android.permission.READ_CALENDAR"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.WRITE_CALENDAR"
+        tools:node="remove" />
+
     <!-- Adding CAMERA permission prevents Chromebooks to see the application on the PlayStore -->
     <!-- Tell that the Camera is not mandatory to install the application -->
     <uses-feature
@@ -124,8 +132,8 @@
                 android:value=".features.home.HomeActivity" />
         </activity>
         <activity android:name=".features.debug.DebugMenuActivity" />
-        <activity android:name="im.vector.riotx.features.createdirect.CreateDirectRoomActivity" />
-        <activity android:name="im.vector.riotx.features.invite.InviteUsersToRoomActivity" />
+        <activity android:name=".features.createdirect.CreateDirectRoomActivity" />
+        <activity android:name=".features.invite.InviteUsersToRoomActivity" />
         <activity android:name=".features.webview.VectorWebViewActivity" />
         <activity android:name=".features.link.LinkHandlerActivity">
             <intent-filter>
@@ -202,9 +210,13 @@
             android:name=".features.attachments.preview.AttachmentsPreviewActivity"
             android:theme="@style/AppTheme.AttachmentsPreview" />
         <activity android:name=".features.call.VectorCallActivity" />
+        <activity
+            android:name=".features.call.conference.VectorJitsiActivity"
+            android:configChanges="orientation|screenSize" />
 
         <activity android:name=".features.terms.ReviewTermsActivity" />
         <activity android:name=".features.widgets.WidgetActivity" />
+        <activity android:name=".features.pin.PinActivity" />
 
         <!-- Services -->
 
diff --git a/vector/src/main/assets/open_source_licenses.html b/vector/src/main/assets/open_source_licenses.html
index c31859719e..17557b7eb3 100755
--- a/vector/src/main/assets/open_source_licenses.html
+++ b/vector/src/main/assets/open_source_licenses.html
@@ -21,9 +21,6 @@
         div {
             padding: 4px;
         }
-
-
-
     </style>
 </head>
 <body>
@@ -392,6 +389,18 @@ SOFTWARE.
     <li>
         <b>Copyright (C) 2018 stfalcon.com</b>
     </li>
+    <li>
+        <b>Jitsi Meet (<a href="https://github.com/jitsi/jitsi-meet">jitsi-meet</a>)</b>
+        <br/>
+        Copyright @ 2020-present 8x8, Inc.
+        <br/>
+        Copyright @ 2017-2018 Atlassian Pty Ltd
+    </li>
+    <li>
+        <b>PFLockScreen-Android</b>
+        <br/>
+        Copyright 2018, Aleksandr Nikiforov
+    </li>
 </ul>
 <pre>
 Apache License
diff --git a/vector/src/main/java/im/vector/riotx/ActiveSessionDataSource.kt b/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/ActiveSessionDataSource.kt
rename to vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt
index 4cafdb8d11..12738e2b0b 100644
--- a/vector/src/main/java/im/vector/riotx/ActiveSessionDataSource.kt
+++ b/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt
@@ -15,11 +15,11 @@
  *
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import arrow.core.Option
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.core.utils.BehaviorDataSource
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.core.utils.BehaviorDataSource
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/riotx/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/AppStateHandler.kt
rename to vector/src/main/java/im/vector/app/AppStateHandler.kt
index cf700cded8..31bc822a22 100644
--- a/vector/src/main/java/im/vector/riotx/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import arrow.core.Option
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.roomSummaryQueryParams
-import im.vector.matrix.rx.rx
-import im.vector.riotx.features.grouplist.ALL_COMMUNITIES_GROUP_ID
-import im.vector.riotx.features.grouplist.SelectedGroupDataSource
-import im.vector.riotx.features.home.HomeRoomListDataSource
-import im.vector.riotx.features.home.room.list.ChronologicalRoomComparator
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import im.vector.app.features.grouplist.ALL_COMMUNITIES_GROUP_ID
+import im.vector.app.features.grouplist.SelectedGroupDataSource
+import im.vector.app.features.home.HomeRoomListDataSource
+import im.vector.app.features.home.room.list.ChronologicalRoomComparator
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.functions.BiFunction
 import io.reactivex.rxkotlin.addTo
+import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt b/vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt
rename to vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt
index 0a338ce042..3aad81529c 100644
--- a/vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt
+++ b/vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import android.graphics.Typeface
 import androidx.core.provider.FontsContractCompat
diff --git a/vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt b/vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt
rename to vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt
index 945ddaec5a..dbb0848e74 100644
--- a/vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt
+++ b/vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx
+package im.vector.app
 
 import android.content.Context
 import androidx.core.provider.FontRequest
diff --git a/vector/src/main/java/im/vector/riotx/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/VectorApplication.kt
rename to vector/src/main/java/im/vector/app/VectorApplication.kt
index 241240d7e3..303b9d585a 100644
--- a/vector/src/main/java/im/vector/riotx/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import android.app.Application
 import android.content.Context
@@ -32,26 +32,27 @@ import com.airbnb.epoxy.EpoxyAsyncUtil
 import com.airbnb.epoxy.EpoxyController
 import com.facebook.stetho.Stetho
 import com.gabrielittner.threetenbp.LazyThreeTen
-import im.vector.matrix.android.api.Matrix
-import im.vector.matrix.android.api.MatrixConfiguration
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.api.legacy.LegacySessionImporter
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.DaggerVectorComponent
-import im.vector.riotx.core.di.HasVectorInjector
-import im.vector.riotx.core.di.VectorComponent
-import im.vector.riotx.core.extensions.configureAndStart
-import im.vector.riotx.core.rx.RxConfig
-import im.vector.riotx.features.configuration.VectorConfiguration
-import im.vector.riotx.features.disclaimer.doNotShowDisclaimerDialog
-import im.vector.riotx.features.lifecycle.VectorActivityLifecycleCallbacks
-import im.vector.riotx.features.notifications.NotificationDrawerManager
-import im.vector.riotx.features.notifications.NotificationUtils
-import im.vector.riotx.features.popup.PopupAlertManager
-import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.version.VersionProvider
-import im.vector.riotx.push.fcm.FcmHelper
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.legacy.LegacySessionImporter
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.DaggerVectorComponent
+import im.vector.app.core.di.HasVectorInjector
+import im.vector.app.core.di.VectorComponent
+import im.vector.app.core.extensions.configureAndStart
+import im.vector.app.core.rx.RxConfig
+import im.vector.app.features.configuration.VectorConfiguration
+import im.vector.app.features.disclaimer.doNotShowDisclaimerDialog
+import im.vector.app.features.lifecycle.VectorActivityLifecycleCallbacks
+import im.vector.app.features.notifications.NotificationDrawerManager
+import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.features.pin.PinLocker
+import im.vector.app.features.popup.PopupAlertManager
+import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.version.VersionProvider
+import im.vector.app.push.fcm.FcmHelper
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -82,6 +83,7 @@ class VectorApplication :
     @Inject lateinit var appStateHandler: AppStateHandler
     @Inject lateinit var rxConfig: RxConfig
     @Inject lateinit var popupAlertManager: PopupAlertManager
+    @Inject lateinit var pinLocker: PinLocker
 
     lateinit var vectorComponent: VectorComponent
 
@@ -153,6 +155,7 @@ class VectorApplication :
             }
         })
         ProcessLifecycleOwner.get().lifecycle.addObserver(appStateHandler)
+        ProcessLifecycleOwner.get().lifecycle.addObserver(pinLocker)
         // This should be done as early as possible
         // initKnownEmojiHashSet(appContext)
     }
diff --git a/vector/src/main/java/im/vector/riotx/core/animations/AppBarStateChangeListener.kt b/vector/src/main/java/im/vector/app/core/animations/AppBarStateChangeListener.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/animations/AppBarStateChangeListener.kt
rename to vector/src/main/java/im/vector/app/core/animations/AppBarStateChangeListener.kt
index bbc78d7937..9402888818 100644
--- a/vector/src/main/java/im/vector/riotx/core/animations/AppBarStateChangeListener.kt
+++ b/vector/src/main/java/im/vector/app/core/animations/AppBarStateChangeListener.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener
diff --git a/vector/src/main/java/im/vector/riotx/core/animations/Constants.kt b/vector/src/main/java/im/vector/app/core/animations/Constants.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/animations/Constants.kt
rename to vector/src/main/java/im/vector/app/core/animations/Constants.kt
index ccc18c4915..dae65dc319 100644
--- a/vector/src/main/java/im/vector/riotx/core/animations/Constants.kt
+++ b/vector/src/main/java/im/vector/app/core/animations/Constants.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 const val ANIMATION_DURATION_SHORT = 200L
diff --git a/vector/src/main/java/im/vector/riotx/core/animations/MatrixItemAppBarStateChangeListener.kt b/vector/src/main/java/im/vector/app/core/animations/MatrixItemAppBarStateChangeListener.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/animations/MatrixItemAppBarStateChangeListener.kt
rename to vector/src/main/java/im/vector/app/core/animations/MatrixItemAppBarStateChangeListener.kt
index 427f37ba49..2172ed19ce 100644
--- a/vector/src/main/java/im/vector/riotx/core/animations/MatrixItemAppBarStateChangeListener.kt
+++ b/vector/src/main/java/im/vector/app/core/animations/MatrixItemAppBarStateChangeListener.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 import android.view.View
 import com.google.android.material.appbar.AppBarLayout
diff --git a/vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt b/vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt
rename to vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt
index 1819e003f9..d8ffde20ef 100644
--- a/vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt
+++ b/vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 import android.animation.Animator
 
diff --git a/vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt b/vector/src/main/java/im/vector/app/core/animations/SimpleTransitionListener.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt
rename to vector/src/main/java/im/vector/app/core/animations/SimpleTransitionListener.kt
index 728127b374..66afd1a269 100644
--- a/vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt
+++ b/vector/src/main/java/im/vector/app/core/animations/SimpleTransitionListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 import androidx.transition.Transition
 
diff --git a/vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt b/vector/src/main/java/im/vector/app/core/animations/VectorFullTransitionSet.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt
rename to vector/src/main/java/im/vector/app/core/animations/VectorFullTransitionSet.kt
index 83bc6f0d01..bfcac8a066 100644
--- a/vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt
+++ b/vector/src/main/java/im/vector/app/core/animations/VectorFullTransitionSet.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotx/core/animations/behavior/PercentViewBehavior.kt b/vector/src/main/java/im/vector/app/core/animations/behavior/PercentViewBehavior.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/core/animations/behavior/PercentViewBehavior.kt
rename to vector/src/main/java/im/vector/app/core/animations/behavior/PercentViewBehavior.kt
index 37c07b8293..8b42485cb6 100644
--- a/vector/src/main/java/im/vector/riotx/core/animations/behavior/PercentViewBehavior.kt
+++ b/vector/src/main/java/im/vector/app/core/animations/behavior/PercentViewBehavior.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.animations.behavior
+package im.vector.app.core.animations.behavior
 
 import android.animation.ArgbEvaluator
 import android.content.Context
@@ -24,7 +24,7 @@ import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.withStyledAttributes
 
-import im.vector.riotx.R
+import im.vector.app.R
 import kotlin.math.abs
 
 private const val UNSPECIFIED_INT = Integer.MAX_VALUE
diff --git a/vector/src/main/java/im/vector/riotx/core/contacts/ContactsDataSource.kt b/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/core/contacts/ContactsDataSource.kt
rename to vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
index fd23e495b9..f5a5e240c6 100644
--- a/vector/src/main/java/im/vector/riotx/core/contacts/ContactsDataSource.kt
+++ b/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.contacts
+package im.vector.app.core.contacts
 
 import android.content.Context
 import android.database.Cursor
diff --git a/vector/src/main/java/im/vector/riotx/core/contacts/MappedContact.kt b/vector/src/main/java/im/vector/app/core/contacts/MappedContact.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/contacts/MappedContact.kt
rename to vector/src/main/java/im/vector/app/core/contacts/MappedContact.kt
index c89a3d4b01..6bff1f7da9 100644
--- a/vector/src/main/java/im/vector/riotx/core/contacts/MappedContact.kt
+++ b/vector/src/main/java/im/vector/app/core/contacts/MappedContact.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.contacts
+package im.vector.app.core.contacts
 
 import android.net.Uri
 
diff --git a/vector/src/main/java/im/vector/riotx/core/date/VectorDateFormatter.kt b/vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt
similarity index 59%
rename from vector/src/main/java/im/vector/riotx/core/date/VectorDateFormatter.kt
rename to vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt
index 344398b91e..02050b0a56 100644
--- a/vector/src/main/java/im/vector/riotx/core/date/VectorDateFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt
@@ -14,23 +14,41 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.date
+package im.vector.app.core.date
 
 import android.content.Context
+import android.text.format.DateFormat
 import android.text.format.DateUtils
-import im.vector.riotx.core.resources.LocaleProvider
+import im.vector.app.core.resources.LocaleProvider
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.format.DateTimeFormatter
+import java.util.Calendar
+import java.util.Date
 import javax.inject.Inject
 
+/**
+ * Returns the timestamp for the start of the day of the provided time.
+ * For example, for the time "Jul 21, 11:11" the start of the day: "Jul 21, 00:00" is returned.
+ */
+fun startOfDay(time: Long): Long {
+    val calendar = Calendar.getInstance()
+    calendar.time = Date(time)
+    calendar.set(Calendar.HOUR_OF_DAY, 0)
+    calendar.set(Calendar.MINUTE, 0)
+    calendar.set(Calendar.SECOND, 0)
+    calendar.set(Calendar.MILLISECOND, 0)
+    return calendar.time.time
+}
+
 class VectorDateFormatter @Inject constructor(private val context: Context,
                                               private val localeProvider: LocaleProvider) {
 
     private val messageHourFormatter by lazy {
         DateTimeFormatter.ofPattern("H:mm", localeProvider.current())
     }
+
     private val messageDayFormatter by lazy {
-        DateTimeFormatter.ofPattern("EEE d MMM", localeProvider.current())
+        DateTimeFormatter.ofPattern(DateFormat.getBestDateTimePattern(localeProvider.current(), "EEE d MMM"))
     }
 
     fun formatMessageHour(localDateTime: LocalDateTime): String {
@@ -41,15 +59,23 @@ class VectorDateFormatter @Inject constructor(private val context: Context,
         return messageDayFormatter.format(localDateTime)
     }
 
+    /**
+     * Formats a localized relative date time for the last 2 days, e.g, "Today, HH:MM", "Yesterday, HH:MM" or
+     * "2 days ago, HH:MM".
+     * For earlier timestamps the absolute date time is returned, e.g. "Month Day, HH:MM".
+     *
+     * @param time the absolute timestamp [ms] that should be formatted relative to now
+     */
     fun formatRelativeDateTime(time: Long?): String {
         if (time == null) {
             return ""
         }
+        val now = System.currentTimeMillis()
         return DateUtils.getRelativeDateTimeString(
                 context,
                 time,
                 DateUtils.DAY_IN_MILLIS,
-                2 * DateUtils.DAY_IN_MILLIS,
+                now - startOfDay(now - 2 * DateUtils.DAY_IN_MILLIS),
                 DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_TIME
         ).toString()
     }
diff --git a/vector/src/main/java/im/vector/riotx/core/di/ActiveSessionHolder.kt b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/core/di/ActiveSessionHolder.kt
rename to vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
index 2dc7b24ebf..1c47b38fdc 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/ActiveSessionHolder.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import arrow.core.Option
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.ActiveSessionDataSource
-import im.vector.riotx.features.call.WebRtcPeerConnectionManager
-import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler
-import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler
-import im.vector.riotx.features.notifications.PushRuleTriggerListener
-import im.vector.riotx.features.session.SessionListener
+import im.vector.app.ActiveSessionDataSource
+import im.vector.app.features.call.WebRtcPeerConnectionManager
+import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
+import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
+import im.vector.app.features.notifications.PushRuleTriggerListener
+import im.vector.app.features.session.SessionListener
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/core/di/AssistedInjectModule.kt b/vector/src/main/java/im/vector/app/core/di/AssistedInjectModule.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/di/AssistedInjectModule.kt
rename to vector/src/main/java/im/vector/app/core/di/AssistedInjectModule.kt
index 17e0bd71e5..0ba4bedb92 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/AssistedInjectModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/AssistedInjectModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import com.squareup.inject.assisted.dagger2.AssistedModule
 import dagger.Module
diff --git a/vector/src/main/java/im/vector/riotx/core/di/FragmentKey.kt b/vector/src/main/java/im/vector/app/core/di/FragmentKey.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/di/FragmentKey.kt
rename to vector/src/main/java/im/vector/app/core/di/FragmentKey.kt
index 57b5c902e5..bc2dc40a15 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/FragmentKey.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentKey.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import androidx.fragment.app.Fragment
 import dagger.MapKey
diff --git a/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
similarity index 70%
rename from vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt
rename to vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index bc5a985d9f..1aa9902137 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -15,98 +15,99 @@
  *
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentFactory
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap
-import im.vector.riotx.features.attachments.preview.AttachmentsPreviewFragment
-import im.vector.riotx.features.contactsbook.ContactsBookFragment
-import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
-import im.vector.riotx.features.crypto.quads.SharedSecuredStorageKeyFragment
-import im.vector.riotx.features.crypto.quads.SharedSecuredStoragePassphraseFragment
-import im.vector.riotx.features.crypto.recover.BootstrapAccountPasswordFragment
-import im.vector.riotx.features.crypto.recover.BootstrapConclusionFragment
-import im.vector.riotx.features.crypto.recover.BootstrapConfirmPassphraseFragment
-import im.vector.riotx.features.crypto.recover.BootstrapEnterPassphraseFragment
-import im.vector.riotx.features.crypto.recover.BootstrapMigrateBackupFragment
-import im.vector.riotx.features.crypto.recover.BootstrapSaveRecoveryKeyFragment
-import im.vector.riotx.features.crypto.recover.BootstrapSetupRecoveryKeyFragment
-import im.vector.riotx.features.crypto.recover.BootstrapWaitingFragment
-import im.vector.riotx.features.crypto.verification.cancel.VerificationCancelFragment
-import im.vector.riotx.features.crypto.verification.cancel.VerificationNotMeFragment
-import im.vector.riotx.features.crypto.verification.choose.VerificationChooseMethodFragment
-import im.vector.riotx.features.crypto.verification.conclusion.VerificationConclusionFragment
-import im.vector.riotx.features.crypto.verification.emoji.VerificationEmojiCodeFragment
-import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment
-import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment
-import im.vector.riotx.features.crypto.verification.request.VerificationRequestFragment
-import im.vector.riotx.features.discovery.DiscoverySettingsFragment
-import im.vector.riotx.features.discovery.change.SetIdentityServerFragment
-import im.vector.riotx.features.grouplist.GroupListFragment
-import im.vector.riotx.features.home.HomeDetailFragment
-import im.vector.riotx.features.home.HomeDrawerFragment
-import im.vector.riotx.features.home.LoadingFragment
-import im.vector.riotx.features.home.room.breadcrumbs.BreadcrumbsFragment
-import im.vector.riotx.features.home.room.detail.RoomDetailFragment
-import im.vector.riotx.features.home.room.list.RoomListFragment
-import im.vector.riotx.features.login.LoginCaptchaFragment
-import im.vector.riotx.features.login.LoginFragment
-import im.vector.riotx.features.login.LoginGenericTextInputFormFragment
-import im.vector.riotx.features.login.LoginResetPasswordFragment
-import im.vector.riotx.features.login.LoginResetPasswordMailConfirmationFragment
-import im.vector.riotx.features.login.LoginResetPasswordSuccessFragment
-import im.vector.riotx.features.login.LoginServerSelectionFragment
-import im.vector.riotx.features.login.LoginServerUrlFormFragment
-import im.vector.riotx.features.login.LoginSignUpSignInSelectionFragment
-import im.vector.riotx.features.login.LoginSignUpSignInSsoFragment
-import im.vector.riotx.features.login.LoginSplashFragment
-import im.vector.riotx.features.login.LoginWaitForEmailFragment
-import im.vector.riotx.features.login.LoginWebFragment
-import im.vector.riotx.features.login.terms.LoginTermsFragment
-import im.vector.riotx.features.qrcode.QrCodeScannerFragment
-import im.vector.riotx.features.reactions.EmojiChooserFragment
-import im.vector.riotx.features.reactions.EmojiSearchResultFragment
-import im.vector.riotx.features.roomdirectory.PublicRoomsFragment
-import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment
-import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment
-import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
-import im.vector.riotx.features.roommemberprofile.RoomMemberProfileFragment
-import im.vector.riotx.features.roommemberprofile.devices.DeviceListFragment
-import im.vector.riotx.features.roommemberprofile.devices.DeviceTrustInfoActionFragment
-import im.vector.riotx.features.roomprofile.RoomProfileFragment
-import im.vector.riotx.features.roomprofile.banned.RoomBannedMemberListFragment
-import im.vector.riotx.features.roomprofile.members.RoomMemberListFragment
-import im.vector.riotx.features.roomprofile.settings.RoomSettingsFragment
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsFragment
-import im.vector.riotx.features.roomprofile.uploads.files.RoomUploadsFilesFragment
-import im.vector.riotx.features.roomprofile.uploads.media.RoomUploadsMediaFragment
-import im.vector.riotx.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment
-import im.vector.riotx.features.settings.VectorSettingsHelpAboutFragment
-import im.vector.riotx.features.settings.VectorSettingsLabsFragment
-import im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment
-import im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment
-import im.vector.riotx.features.settings.VectorSettingsPreferencesFragment
-import im.vector.riotx.features.settings.VectorSettingsSecurityPrivacyFragment
-import im.vector.riotx.features.settings.account.deactivation.DeactivateAccountFragment
-import im.vector.riotx.features.settings.crosssigning.CrossSigningSettingsFragment
-import im.vector.riotx.features.settings.devices.VectorSettingsDevicesFragment
-import im.vector.riotx.features.settings.devtools.AccountDataFragment
-import im.vector.riotx.features.settings.devtools.GossipingEventsPaperTrailFragment
-import im.vector.riotx.features.settings.devtools.IncomingKeyRequestListFragment
-import im.vector.riotx.features.settings.devtools.KeyRequestsFragment
-import im.vector.riotx.features.settings.devtools.OutgoingKeyRequestListFragment
-import im.vector.riotx.features.settings.ignored.VectorSettingsIgnoredUsersFragment
-import im.vector.riotx.features.settings.locale.LocalePickerFragment
-import im.vector.riotx.features.settings.push.PushGatewaysFragment
-import im.vector.riotx.features.share.IncomingShareFragment
-import im.vector.riotx.features.signout.soft.SoftLogoutFragment
-import im.vector.riotx.features.terms.ReviewTermsFragment
-import im.vector.riotx.features.userdirectory.KnownUsersFragment
-import im.vector.riotx.features.userdirectory.UserDirectoryFragment
-import im.vector.riotx.features.widgets.WidgetFragment
+import im.vector.app.features.attachments.preview.AttachmentsPreviewFragment
+import im.vector.app.features.contactsbook.ContactsBookFragment
+import im.vector.app.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
+import im.vector.app.features.crypto.quads.SharedSecuredStorageKeyFragment
+import im.vector.app.features.crypto.quads.SharedSecuredStoragePassphraseFragment
+import im.vector.app.features.crypto.recover.BootstrapAccountPasswordFragment
+import im.vector.app.features.crypto.recover.BootstrapConclusionFragment
+import im.vector.app.features.crypto.recover.BootstrapConfirmPassphraseFragment
+import im.vector.app.features.crypto.recover.BootstrapEnterPassphraseFragment
+import im.vector.app.features.crypto.recover.BootstrapMigrateBackupFragment
+import im.vector.app.features.crypto.recover.BootstrapSaveRecoveryKeyFragment
+import im.vector.app.features.crypto.recover.BootstrapSetupRecoveryKeyFragment
+import im.vector.app.features.crypto.recover.BootstrapWaitingFragment
+import im.vector.app.features.crypto.verification.cancel.VerificationCancelFragment
+import im.vector.app.features.crypto.verification.cancel.VerificationNotMeFragment
+import im.vector.app.features.crypto.verification.choose.VerificationChooseMethodFragment
+import im.vector.app.features.crypto.verification.conclusion.VerificationConclusionFragment
+import im.vector.app.features.crypto.verification.emoji.VerificationEmojiCodeFragment
+import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment
+import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment
+import im.vector.app.features.crypto.verification.request.VerificationRequestFragment
+import im.vector.app.features.discovery.DiscoverySettingsFragment
+import im.vector.app.features.discovery.change.SetIdentityServerFragment
+import im.vector.app.features.grouplist.GroupListFragment
+import im.vector.app.features.home.HomeDetailFragment
+import im.vector.app.features.home.HomeDrawerFragment
+import im.vector.app.features.home.LoadingFragment
+import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment
+import im.vector.app.features.home.room.detail.RoomDetailFragment
+import im.vector.app.features.home.room.list.RoomListFragment
+import im.vector.app.features.login.LoginCaptchaFragment
+import im.vector.app.features.login.LoginFragment
+import im.vector.app.features.login.LoginGenericTextInputFormFragment
+import im.vector.app.features.login.LoginResetPasswordFragment
+import im.vector.app.features.login.LoginResetPasswordMailConfirmationFragment
+import im.vector.app.features.login.LoginResetPasswordSuccessFragment
+import im.vector.app.features.login.LoginServerSelectionFragment
+import im.vector.app.features.login.LoginServerUrlFormFragment
+import im.vector.app.features.login.LoginSignUpSignInSelectionFragment
+import im.vector.app.features.login.LoginSignUpSignInSsoFragment
+import im.vector.app.features.login.LoginSplashFragment
+import im.vector.app.features.login.LoginWaitForEmailFragment
+import im.vector.app.features.login.LoginWebFragment
+import im.vector.app.features.login.terms.LoginTermsFragment
+import im.vector.app.features.pin.PinFragment
+import im.vector.app.features.qrcode.QrCodeScannerFragment
+import im.vector.app.features.reactions.EmojiChooserFragment
+import im.vector.app.features.reactions.EmojiSearchResultFragment
+import im.vector.app.features.roomdirectory.PublicRoomsFragment
+import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
+import im.vector.app.features.roomdirectory.picker.RoomDirectoryPickerFragment
+import im.vector.app.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
+import im.vector.app.features.roommemberprofile.RoomMemberProfileFragment
+import im.vector.app.features.roommemberprofile.devices.DeviceListFragment
+import im.vector.app.features.roommemberprofile.devices.DeviceTrustInfoActionFragment
+import im.vector.app.features.roomprofile.RoomProfileFragment
+import im.vector.app.features.roomprofile.banned.RoomBannedMemberListFragment
+import im.vector.app.features.roomprofile.members.RoomMemberListFragment
+import im.vector.app.features.roomprofile.settings.RoomSettingsFragment
+import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment
+import im.vector.app.features.roomprofile.uploads.files.RoomUploadsFilesFragment
+import im.vector.app.features.roomprofile.uploads.media.RoomUploadsMediaFragment
+import im.vector.app.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment
+import im.vector.app.features.settings.VectorSettingsHelpAboutFragment
+import im.vector.app.features.settings.VectorSettingsLabsFragment
+import im.vector.app.features.settings.VectorSettingsNotificationPreferenceFragment
+import im.vector.app.features.settings.VectorSettingsNotificationsTroubleshootFragment
+import im.vector.app.features.settings.VectorSettingsPreferencesFragment
+import im.vector.app.features.settings.VectorSettingsSecurityPrivacyFragment
+import im.vector.app.features.settings.account.deactivation.DeactivateAccountFragment
+import im.vector.app.features.settings.crosssigning.CrossSigningSettingsFragment
+import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment
+import im.vector.app.features.settings.devtools.AccountDataFragment
+import im.vector.app.features.settings.devtools.GossipingEventsPaperTrailFragment
+import im.vector.app.features.settings.devtools.IncomingKeyRequestListFragment
+import im.vector.app.features.settings.devtools.KeyRequestsFragment
+import im.vector.app.features.settings.devtools.OutgoingKeyRequestListFragment
+import im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment
+import im.vector.app.features.settings.locale.LocalePickerFragment
+import im.vector.app.features.settings.push.PushGatewaysFragment
+import im.vector.app.features.share.IncomingShareFragment
+import im.vector.app.features.signout.soft.SoftLogoutFragment
+import im.vector.app.features.terms.ReviewTermsFragment
+import im.vector.app.features.userdirectory.KnownUsersFragment
+import im.vector.app.features.userdirectory.UserDirectoryFragment
+import im.vector.app.features.widgets.WidgetFragment
 
 @Module
 interface FragmentModule {
@@ -536,6 +537,11 @@ interface FragmentModule {
     @FragmentKey(ContactsBookFragment::class)
     fun bindPhoneBookFragment(fragment: ContactsBookFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(PinFragment::class)
+    fun bindPinFragment(fragment: PinFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(RoomBannedMemberListFragment::class)
diff --git a/vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt b/vector/src/main/java/im/vector/app/core/di/HasScreenInjector.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt
rename to vector/src/main/java/im/vector/app/core/di/HasScreenInjector.kt
index 62e359c0ae..4618bd04d1 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt
+++ b/vector/src/main/java/im/vector/app/core/di/HasScreenInjector.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 interface HasScreenInjector {
 
diff --git a/vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt b/vector/src/main/java/im/vector/app/core/di/HasVectorInjector.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt
rename to vector/src/main/java/im/vector/app/core/di/HasVectorInjector.kt
index c141f0e9e1..79254defcc 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt
+++ b/vector/src/main/java/im/vector/app/core/di/HasVectorInjector.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 interface HasVectorInjector {
 
diff --git a/vector/src/main/java/im/vector/riotx/core/di/ImageManager.kt b/vector/src/main/java/im/vector/app/core/di/ImageManager.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/core/di/ImageManager.kt
rename to vector/src/main/java/im/vector/app/core/di/ImageManager.kt
index 74a01e76ec..60ce70a0b3 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/ImageManager.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ImageManager.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import android.content.Context
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.model.GlideUrl
 import com.github.piasy.biv.BigImageViewer
 import com.github.piasy.biv.loader.glide.GlideImageLoader
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.ActiveSessionDataSource
-import im.vector.riotx.core.glide.FactoryUrl
+import im.vector.app.ActiveSessionDataSource
+import im.vector.app.core.glide.FactoryUrl
+import org.matrix.android.sdk.api.session.Session
 import java.io.InputStream
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
similarity index 58%
rename from vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt
rename to vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index 2838a42169..d337ec7977 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -14,66 +14,68 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentFactory
 import androidx.lifecycle.ViewModelProvider
 import dagger.BindsInstance
 import dagger.Component
-import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.preference.UserAvatarPreference
-import im.vector.riotx.features.MainActivity
-import im.vector.riotx.features.call.CallControlsBottomSheet
-import im.vector.riotx.features.call.VectorCallActivity
-import im.vector.riotx.features.createdirect.CreateDirectRoomActivity
-import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
-import im.vector.riotx.features.crypto.quads.SharedSecureStorageActivity
-import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheet
-import im.vector.riotx.features.debug.DebugMenuActivity
-import im.vector.riotx.features.home.HomeActivity
-import im.vector.riotx.features.home.HomeModule
-import im.vector.riotx.features.home.room.detail.RoomDetailActivity
-import im.vector.riotx.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
-import im.vector.riotx.features.home.room.detail.timeline.action.MessageActionsBottomSheet
-import im.vector.riotx.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet
-import im.vector.riotx.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet
-import im.vector.riotx.features.home.room.detail.widget.RoomWidgetsBottomSheet
-import im.vector.riotx.features.home.room.filtered.FilteredRoomsActivity
-import im.vector.riotx.features.home.room.list.RoomListModule
-import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsBottomSheet
-import im.vector.riotx.features.invite.InviteUsersToRoomActivity
-import im.vector.riotx.features.invite.VectorInviteView
-import im.vector.riotx.features.link.LinkHandlerActivity
-import im.vector.riotx.features.login.LoginActivity
-import im.vector.riotx.features.media.VectorAttachmentViewerActivity
-import im.vector.riotx.features.media.BigImageViewerActivity
-import im.vector.riotx.features.media.ImageMediaViewerActivity
-import im.vector.riotx.features.media.VideoMediaViewerActivity
-import im.vector.riotx.features.navigation.Navigator
-import im.vector.riotx.features.permalink.PermalinkHandlerActivity
-import im.vector.riotx.features.qrcode.QrCodeScannerActivity
-import im.vector.riotx.features.rageshake.BugReportActivity
-import im.vector.riotx.features.rageshake.BugReporter
-import im.vector.riotx.features.rageshake.RageShake
-import im.vector.riotx.features.reactions.EmojiReactionPickerActivity
-import im.vector.riotx.features.reactions.widget.ReactionButton
-import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
-import im.vector.riotx.features.roomdirectory.createroom.CreateRoomActivity
-import im.vector.riotx.features.roommemberprofile.RoomMemberProfileActivity
-import im.vector.riotx.features.roommemberprofile.devices.DeviceListBottomSheet
-import im.vector.riotx.features.roomprofile.RoomProfileActivity
-import im.vector.riotx.features.settings.VectorSettingsActivity
-import im.vector.riotx.features.settings.devices.DeviceVerificationInfoBottomSheet
-import im.vector.riotx.features.share.IncomingShareActivity
-import im.vector.riotx.features.signout.soft.SoftLogoutActivity
-import im.vector.riotx.features.terms.ReviewTermsActivity
-import im.vector.riotx.features.ui.UiStateRepository
-import im.vector.riotx.features.widgets.WidgetActivity
-import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionBottomSheet
-import im.vector.riotx.features.workers.signout.SignOutBottomSheetDialogFragment
+import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.preference.UserAvatarPreference
+import im.vector.app.features.MainActivity
+import im.vector.app.features.call.CallControlsBottomSheet
+import im.vector.app.features.call.VectorCallActivity
+import im.vector.app.features.call.conference.VectorJitsiActivity
+import im.vector.app.features.createdirect.CreateDirectRoomActivity
+import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity
+import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
+import im.vector.app.features.crypto.recover.BootstrapBottomSheet
+import im.vector.app.features.crypto.verification.VerificationBottomSheet
+import im.vector.app.features.debug.DebugMenuActivity
+import im.vector.app.features.home.HomeActivity
+import im.vector.app.features.home.HomeModule
+import im.vector.app.features.home.room.detail.RoomDetailActivity
+import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
+import im.vector.app.features.home.room.detail.timeline.action.MessageActionsBottomSheet
+import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet
+import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet
+import im.vector.app.features.home.room.detail.widget.RoomWidgetsBottomSheet
+import im.vector.app.features.home.room.filtered.FilteredRoomsActivity
+import im.vector.app.features.home.room.list.RoomListModule
+import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
+import im.vector.app.features.invite.InviteUsersToRoomActivity
+import im.vector.app.features.invite.VectorInviteView
+import im.vector.app.features.link.LinkHandlerActivity
+import im.vector.app.features.login.LoginActivity
+import im.vector.app.features.media.BigImageViewerActivity
+import im.vector.app.features.media.ImageMediaViewerActivity
+import im.vector.app.features.media.VectorAttachmentViewerActivity
+import im.vector.app.features.media.VideoMediaViewerActivity
+import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.permalink.PermalinkHandlerActivity
+import im.vector.app.features.pin.PinLocker
+import im.vector.app.features.qrcode.QrCodeScannerActivity
+import im.vector.app.features.rageshake.BugReportActivity
+import im.vector.app.features.rageshake.BugReporter
+import im.vector.app.features.rageshake.RageShake
+import im.vector.app.features.reactions.EmojiReactionPickerActivity
+import im.vector.app.features.reactions.widget.ReactionButton
+import im.vector.app.features.roomdirectory.RoomDirectoryActivity
+import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity
+import im.vector.app.features.roommemberprofile.RoomMemberProfileActivity
+import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
+import im.vector.app.features.roomprofile.RoomProfileActivity
+import im.vector.app.features.settings.VectorSettingsActivity
+import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheet
+import im.vector.app.features.share.IncomingShareActivity
+import im.vector.app.features.signout.soft.SoftLogoutActivity
+import im.vector.app.features.terms.ReviewTermsActivity
+import im.vector.app.features.ui.UiStateRepository
+import im.vector.app.features.widgets.WidgetActivity
+import im.vector.app.features.widgets.permissions.RoomWidgetPermissionBottomSheet
+import im.vector.app.features.workers.signout.SignOutBottomSheetDialogFragment
 
 @Component(
         dependencies = [
@@ -101,6 +103,7 @@ interface ScreenComponent {
     fun bugReporter(): BugReporter
     fun rageShake(): RageShake
     fun navigator(): Navigator
+    fun pinLocker(): PinLocker
     fun errorFormatter(): ErrorFormatter
     fun uiStateRepository(): UiStateRepository
     fun unrecognizedCertificateDialog(): UnrecognizedCertificateDialog
@@ -138,6 +141,7 @@ interface ScreenComponent {
     fun inject(activity: WidgetActivity)
     fun inject(activity: VectorCallActivity)
     fun inject(activity: VectorAttachmentViewerActivity)
+    fun inject(activity: VectorJitsiActivity)
 
     /* ==========================================================================================
      * BottomSheets
diff --git a/vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt b/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt
rename to vector/src/main/java/im/vector/app/core/di/ScreenModule.kt
index 56fac34f1e..5f50f186d0 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import dagger.Module
 import dagger.Provides
-import im.vector.riotx.core.glide.GlideApp
+import im.vector.app.core.glide.GlideApp
 
 @Module
 object ScreenModule {
diff --git a/vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt b/vector/src/main/java/im/vector/app/core/di/ScreenScope.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt
rename to vector/src/main/java/im/vector/app/core/di/ScreenScope.kt
index 27f39b1e73..c39d6a947e 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenScope.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import javax.inject.Scope
 
diff --git a/vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt b/vector/src/main/java/im/vector/app/core/di/VectorAssistedModule.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt
rename to vector/src/main/java/im/vector/app/core/di/VectorAssistedModule.kt
index 9d04521d49..78a935a1d4 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorAssistedModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 /*
 @Module(includes = [AssistedInject_VectorAssistedModule::class])
diff --git a/vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
similarity index 56%
rename from vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt
rename to vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
index 36dda5aa39..c6dfd3e10c 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
@@ -14,48 +14,50 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import android.content.Context
 import android.content.res.Resources
 import dagger.BindsInstance
 import dagger.Component
-import im.vector.matrix.android.api.Matrix
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.ActiveSessionDataSource
-import im.vector.riotx.EmojiCompatFontProvider
-import im.vector.riotx.EmojiCompatWrapper
-import im.vector.riotx.VectorApplication
-import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.core.utils.AssetReader
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.features.call.WebRtcPeerConnectionManager
-import im.vector.riotx.features.configuration.VectorConfiguration
-import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler
-import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler
-import im.vector.riotx.features.grouplist.SelectedGroupDataSource
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.HomeRoomListDataSource
-import im.vector.riotx.features.html.EventHtmlRenderer
-import im.vector.riotx.features.html.VectorHtmlCompressor
-import im.vector.riotx.features.login.ReAuthHelper
-import im.vector.riotx.features.navigation.Navigator
-import im.vector.riotx.features.notifications.NotifiableEventResolver
-import im.vector.riotx.features.notifications.NotificationBroadcastReceiver
-import im.vector.riotx.features.notifications.NotificationDrawerManager
-import im.vector.riotx.features.notifications.NotificationUtils
-import im.vector.riotx.features.notifications.PushRuleTriggerListener
-import im.vector.riotx.features.popup.PopupAlertManager
-import im.vector.riotx.features.rageshake.BugReporter
-import im.vector.riotx.features.rageshake.VectorFileLogger
-import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler
-import im.vector.riotx.features.reactions.data.EmojiDataSource
-import im.vector.riotx.features.session.SessionListener
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.ui.UiStateRepository
+import im.vector.app.ActiveSessionDataSource
+import im.vector.app.EmojiCompatFontProvider
+import im.vector.app.EmojiCompatWrapper
+import im.vector.app.VectorApplication
+import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.utils.AssetReader
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.call.WebRtcPeerConnectionManager
+import im.vector.app.features.configuration.VectorConfiguration
+import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
+import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
+import im.vector.app.features.grouplist.SelectedGroupDataSource
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.HomeRoomListDataSource
+import im.vector.app.features.html.EventHtmlRenderer
+import im.vector.app.features.html.VectorHtmlCompressor
+import im.vector.app.features.login.ReAuthHelper
+import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.notifications.NotifiableEventResolver
+import im.vector.app.features.notifications.NotificationBroadcastReceiver
+import im.vector.app.features.notifications.NotificationDrawerManager
+import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.features.notifications.PushRuleTriggerListener
+import im.vector.app.features.pin.PinCodeStore
+import im.vector.app.features.pin.PinLocker
+import im.vector.app.features.popup.PopupAlertManager
+import im.vector.app.features.rageshake.BugReporter
+import im.vector.app.features.rageshake.VectorFileLogger
+import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.app.features.reactions.data.EmojiDataSource
+import im.vector.app.features.session.SessionListener
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.ui.UiStateRepository
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.session.Session
 import javax.inject.Singleton
 
 @Component(modules = [VectorModule::class])
@@ -132,12 +134,16 @@ interface VectorComponent {
 
     fun uiStateRepository(): UiStateRepository
 
+    fun pinCodeStore(): PinCodeStore
+
     fun emojiDataSource(): EmojiDataSource
 
     fun alertManager(): PopupAlertManager
 
     fun reAuthHelper(): ReAuthHelper
 
+    fun pinLocker(): PinLocker
+
     fun webRtcPeerConnectionManager(): WebRtcPeerConnectionManager
 
     @Component.Factory
diff --git a/vector/src/main/java/im/vector/riotx/core/di/VectorFragmentFactory.kt b/vector/src/main/java/im/vector/app/core/di/VectorFragmentFactory.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/di/VectorFragmentFactory.kt
rename to vector/src/main/java/im/vector/app/core/di/VectorFragmentFactory.kt
index 6b33b9e2a7..f761d99114 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/VectorFragmentFactory.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorFragmentFactory.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentFactory
diff --git a/vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt b/vector/src/main/java/im/vector/app/core/di/VectorModule.kt
similarity index 75%
rename from vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt
rename to vector/src/main/java/im/vector/app/core/di/VectorModule.kt
index 50cfeaf415..87581628e7 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import android.content.Context
 import android.content.Context.MODE_PRIVATE
@@ -23,16 +23,18 @@ import android.content.res.Resources
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import im.vector.matrix.android.api.Matrix
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.api.legacy.LegacySessionImporter
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.core.error.DefaultErrorFormatter
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.features.navigation.DefaultNavigator
-import im.vector.riotx.features.navigation.Navigator
-import im.vector.riotx.features.ui.SharedPreferencesUiStateRepository
-import im.vector.riotx.features.ui.UiStateRepository
+import im.vector.app.core.error.DefaultErrorFormatter
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.features.navigation.DefaultNavigator
+import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.pin.PinCodeStore
+import im.vector.app.features.pin.SharedPrefPinCodeStore
+import im.vector.app.features.ui.SharedPreferencesUiStateRepository
+import im.vector.app.features.ui.UiStateRepository
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.legacy.LegacySessionImporter
+import org.matrix.android.sdk.api.session.Session
 
 @Module
 abstract class VectorModule {
@@ -86,4 +88,7 @@ abstract class VectorModule {
 
     @Binds
     abstract fun bindUiStateRepository(repository: SharedPreferencesUiStateRepository): UiStateRepository
+
+    @Binds
+    abstract fun bindPinCodeStore(store: SharedPrefPinCodeStore): PinCodeStore
 }
diff --git a/vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt b/vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt
rename to vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt
index 999b004beb..ded2a562c5 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
diff --git a/vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt b/vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt
rename to vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt
index 09c8aadb51..5f0ee30821 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import androidx.lifecycle.ViewModel
 import dagger.MapKey
diff --git a/vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
similarity index 75%
rename from vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt
rename to vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
index 6ac6fa03da..836dab00c5 100644
--- a/vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap
-import im.vector.riotx.core.platform.ConfigurationViewModel
-import im.vector.riotx.features.call.SharedActiveCallViewModel
-import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel
-import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel
-import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
-import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel
-import im.vector.riotx.features.discovery.DiscoverySharedViewModel
-import im.vector.riotx.features.home.HomeSharedActionViewModel
-import im.vector.riotx.features.home.room.detail.RoomDetailSharedActionViewModel
-import im.vector.riotx.features.home.room.detail.timeline.action.MessageSharedActionViewModel
-import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
-import im.vector.riotx.features.reactions.EmojiChooserViewModel
-import im.vector.riotx.features.roomdirectory.RoomDirectorySharedActionViewModel
-import im.vector.riotx.features.roomprofile.RoomProfileSharedActionViewModel
-import im.vector.riotx.features.userdirectory.UserDirectorySharedActionViewModel
+import im.vector.app.core.platform.ConfigurationViewModel
+import im.vector.app.features.call.SharedActiveCallViewModel
+import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel
+import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel
+import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
+import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel
+import im.vector.app.features.discovery.DiscoverySharedViewModel
+import im.vector.app.features.home.HomeSharedActionViewModel
+import im.vector.app.features.home.room.detail.RoomDetailSharedActionViewModel
+import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel
+import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
+import im.vector.app.features.reactions.EmojiChooserViewModel
+import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
+import im.vector.app.features.roomprofile.RoomProfileSharedActionViewModel
+import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel
 
 @Module
 interface ViewModelModule {
diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/ConfirmationDialogBuilder.kt b/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/dialogs/ConfirmationDialogBuilder.kt
rename to vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
index aa95b29c4d..0d9fb9d93d 100644
--- a/vector/src/main/java/im/vector/riotx/core/dialogs/ConfirmationDialogBuilder.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.dialogs
+package im.vector.app.core.dialogs
 
 import android.app.Activity
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
-import im.vector.riotx.R
+import im.vector.app.R
 import kotlinx.android.synthetic.main.dialog_confirmation_with_reason.view.*
 
 object ConfirmationDialogBuilder {
diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt b/vector/src/main/java/im/vector/app/core/dialogs/DialogLocker.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt
rename to vector/src/main/java/im/vector/app/core/dialogs/DialogLocker.kt
index a6c1558948..caad06c959 100644
--- a/vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/DialogLocker.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.dialogs
+package im.vector.app.core.dialogs
 
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
-import im.vector.riotx.core.platform.Restorable
+import im.vector.app.core.platform.Restorable
 import timber.log.Timber
 
 private const val KEY_DIALOG_IS_DISPLAYED = "DialogLocker.KEY_DIALOG_IS_DISPLAYED"
diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt
rename to vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt
index 7275136382..b4087d5ce1 100644
--- a/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.dialogs
+package im.vector.app.core.dialogs
 
 import android.app.Activity
 import android.text.Editable
@@ -23,9 +23,9 @@ import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.SimpleTextWatcher
+import im.vector.app.R
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.SimpleTextWatcher
 
 class ExportKeysDialog {
 
diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/Extensions.kt b/vector/src/main/java/im/vector/app/core/dialogs/Extensions.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/dialogs/Extensions.kt
rename to vector/src/main/java/im/vector/app/core/dialogs/Extensions.kt
index 1b90e88864..f444fca221 100644
--- a/vector/src/main/java/im/vector/riotx/core/dialogs/Extensions.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/Extensions.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.dialogs
+package im.vector.app.core.dialogs
 
 import androidx.annotation.ColorRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
-import im.vector.riotx.R
+import im.vector.app.R
 
 fun AlertDialog.withColoredButton(whichButton: Int, @ColorRes color: Int = R.color.vector_error_color): AlertDialog {
     getButton(whichButton)?.setTextColor(ContextCompat.getColor(context, color))
diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/ManuallyVerifyDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/core/dialogs/ManuallyVerifyDialog.kt
rename to vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt
index 9863f7030f..f57212d16e 100644
--- a/vector/src/main/java/im/vector/riotx/core/dialogs/ManuallyVerifyDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.dialogs
+package im.vector.app.core.dialogs
 
 import android.app.Activity
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import im.vector.matrix.android.api.extensions.getFingerprintHumanReadable
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.riotx.R
+import im.vector.app.R
+import org.matrix.android.sdk.api.extensions.getFingerprintHumanReadable
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 
 object ManuallyVerifyDialog {
 
diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt
rename to vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt
index 3f1582563c..76cdf1d329 100644
--- a/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.dialogs
+package im.vector.app.core.dialogs
 
 import android.app.Activity
 import android.content.DialogInterface
@@ -24,10 +24,10 @@ import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.SimpleTextWatcher
+import im.vector.app.R
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.SimpleTextWatcher
 
 class PromptPasswordDialog {
 
diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/UnrecognizedCertificateDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/dialogs/UnrecognizedCertificateDialog.kt
rename to vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
index af2c23848f..753cfd646c 100644
--- a/vector/src/main/java/im/vector/riotx/core/dialogs/UnrecognizedCertificateDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.dialogs
+package im.vector.app.core.dialogs
 
 import android.app.Activity
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import im.vector.matrix.android.internal.network.ssl.Fingerprint
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.internal.network.ssl.Fingerprint
 import timber.log.Timber
 import java.util.HashMap
 import java.util.HashSet
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/DividerItem.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/DividerItem.kt
index 8051804145..a08b7d7e0c 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/DividerItem.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
+import im.vector.app.R
 
 /**
  * Default background color is for the bottom sheets (R.attr.vctr_list_bottom_sheet_divider_color).
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/EmptyItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/EmptyItem.kt
index c0eb007952..aaf870667b 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/EmptyItem.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
+import im.vector.app.R
 
 @EpoxyModelClass(layout = R.layout.item_empty)
 abstract class EmptyItem : VectorEpoxyModel<EmptyItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/ErrorWithRetryItem.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/ErrorWithRetryItem.kt
index 8bc266da31..f555a70d3f 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/ErrorWithRetryItem.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import android.widget.Button
 import android.widget.TextView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
+import im.vector.app.R
 
 @EpoxyModelClass(layout = R.layout.item_error_retry)
 abstract class ErrorWithRetryItem : VectorEpoxyModel<ErrorWithRetryItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/HelpFooterItem.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/HelpFooterItem.kt
index b9c06ecda8..bb39bd41d6 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/HelpFooterItem.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
+import im.vector.app.R
 
 @EpoxyModelClass(layout = R.layout.item_help_footer)
 abstract class HelpFooterItem : VectorEpoxyModel<HelpFooterItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt b/vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt
index 1ee3d5e2b6..dfbdfff2b8 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.riotx.core.platform.DefaultListUpdateCallback
-import im.vector.riotx.core.platform.Restorable
+import im.vector.app.core.platform.DefaultListUpdateCallback
+import im.vector.app.core.platform.Restorable
 import java.util.concurrent.atomic.AtomicReference
 
 private const val LAYOUT_MANAGER_STATE = "LAYOUT_MANAGER_STATE"
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/Listener.kt b/vector/src/main/java/im/vector/app/core/epoxy/Listener.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/Listener.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/Listener.kt
index c85f186abb..e271b5abb5 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/Listener.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/Listener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import android.view.View
 
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/LoadingItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/LoadingItem.kt
index e48b680126..5cf87bbf78 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/LoadingItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_loading)
 abstract class LoadingItem : VectorEpoxyModel<LoadingItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/NoResultItem.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/NoResultItem.kt
index beb3e91702..d38ed93225 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/NoResultItem.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
+import im.vector.app.R
 
 @EpoxyModelClass(layout = R.layout.item_no_result)
 abstract class NoResultItem : VectorEpoxyModel<NoResultItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/SquareLoadingItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/SquareLoadingItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/SquareLoadingItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/SquareLoadingItem.kt
index c0f6eb198f..7844a75dae 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/SquareLoadingItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/SquareLoadingItem.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
+import im.vector.app.R
 
 @EpoxyModelClass(layout = R.layout.item_loading_square)
 abstract class SquareLoadingItem : VectorEpoxyModel<SquareLoadingItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt
index d7874d46e5..8a75a6bddf 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import android.view.View
 import com.airbnb.epoxy.EpoxyHolder
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyModel.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyModel.kt
index a1ea79cae6..fcb5a473a4 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import androidx.annotation.CallSuper
 import androidx.lifecycle.Lifecycle
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/ZeroItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/ZeroItem.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/ZeroItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/ZeroItem.kt
index b64abdcc6c..a65e37f96b 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/ZeroItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/ZeroItem.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy
+package im.vector.app.core.epoxy
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
+import im.vector.app.R
 
 /**
  * Item of size (0, 0).
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonStyle.kt b/vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonStyle.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonStyle.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonStyle.kt
index d6cc90c0e9..ad9638cf10 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonStyle.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonStyle.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy.attributes
+package im.vector.app.core.epoxy.attributes
 
 enum class ButtonStyle {
     POSITIVE,
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonType.kt b/vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonType.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonType.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonType.kt
index b3cbe9cd84..d9c171cc29 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonType.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy.attributes
+package im.vector.app.core.epoxy.attributes
 
 enum class ButtonType {
     NO_BUTTON,
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/IconMode.kt b/vector/src/main/java/im/vector/app/core/epoxy/attributes/IconMode.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/attributes/IconMode.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/attributes/IconMode.kt
index c6b1ebf505..48e8d7ed92 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/IconMode.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/attributes/IconMode.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy.attributes
+package im.vector.app.core.epoxy.attributes
 
 enum class IconMode {
     NONE,
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt
index f6acbb17c0..4beefeb737 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.core.epoxy.bottomsheet
+package im.vector.app.core.epoxy.bottomsheet
 
 import android.content.res.ColorStateList
 import android.view.View
@@ -28,10 +28,10 @@ import androidx.core.view.isVisible
 import androidx.core.widget.ImageViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.themes.ThemeUtils
 
 /**
  * A action for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
index 26e6fddad0..a5f19258ef 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.core.epoxy.bottomsheet
+package im.vector.app.core.epoxy.bottomsheet
 
 import android.text.method.MovementMethod
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.tools.findPillsAndProcess
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.tools.findPillsAndProcess
+import org.matrix.android.sdk.api.util.MatrixItem
 
 /**
  * A message preview for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
index 5e1229bf2f..0c5919e5f3 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.core.epoxy.bottomsheet
+package im.vector.app.core.epoxy.bottomsheet
 
 import android.graphics.Typeface
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.EmojiCompatFontProvider
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.EmojiCompatFontProvider
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 /**
  * A quick reaction list for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
index 0ded037f29..a495f14b6e 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.core.epoxy.bottomsheet
+package im.vector.app.core.epoxy.bottomsheet
 
 import android.content.res.ColorStateList
 import android.view.View
@@ -24,16 +24,16 @@ import androidx.core.content.ContextCompat
 import androidx.core.widget.ImageViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.ClickListener
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.epoxy.onClick
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.util.MatrixItem
 
 /**
  * A room preview for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
index df5ce4f073..119950f1b8 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.core.epoxy.bottomsheet
+package im.vector.app.core.epoxy.bottomsheet
 
 import android.view.View
 import android.widget.TextView
@@ -22,9 +22,9 @@ import androidx.annotation.DrawableRes
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 /**
  * A send state for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/BaseProfileMatrixItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/BaseProfileMatrixItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
index 58005ac788..54fc13194d 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/BaseProfileMatrixItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy.profiles
+package im.vector.app.core.epoxy.profiles
 
 import android.view.View
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.crypto.util.toImageRes
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.crypto.util.toImageRes
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.util.MatrixItem
 
 abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder> : VectorEpoxyModel<T>() {
     @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt
index c06307387d..c5d5ee52a8 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy.profiles
+package im.vector.app.core.epoxy.profiles
 
 import android.content.res.ColorStateList
 import android.view.View
@@ -25,13 +25,13 @@ import androidx.core.view.isVisible
 import androidx.core.widget.ImageViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_profile_action)
 abstract class ProfileActionItem : VectorEpoxyModel<ProfileActionItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileItemExtensions.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileItemExtensions.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt
index 1f3aff0de6..fdbe9f7f94 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileItemExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt
@@ -15,14 +15,14 @@
  *
  */
 
-package im.vector.riotx.core.epoxy.profiles
+package im.vector.app.core.epoxy.profiles
 
 import androidx.annotation.DrawableRes
 import com.airbnb.epoxy.EpoxyController
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.core.epoxy.ClickListener
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
 
 fun EpoxyController.buildProfileSection(title: String) {
     profileSectionItem {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt
index f704c7dd7d..e8fc671d33 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt
@@ -15,14 +15,14 @@
  *
  */
 
-package im.vector.riotx.core.epoxy.profiles
+package im.vector.app.core.epoxy.profiles
 
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
 
 @EpoxyModelClass(layout = R.layout.item_profile_matrix_item)
 abstract class ProfileMatrixItem : BaseProfileMatrixItem<ProfileMatrixItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt
index 1ad538ec6d..4966032dde 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt
@@ -15,13 +15,13 @@
  *
  */
 
-package im.vector.riotx.core.epoxy.profiles
+package im.vector.app.core.epoxy.profiles
 
 import android.widget.ProgressBar
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
+import im.vector.app.R
 
 @EpoxyModelClass(layout = R.layout.item_profile_matrix_item_progress)
 abstract class ProfileMatrixItemWithProgress : BaseProfileMatrixItem<ProfileMatrixItemWithProgress.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileSectionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileSectionItem.kt
rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt
index ea3e66ad03..6fa1ed23be 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileSectionItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.epoxy.profiles
+package im.vector.app.core.epoxy.profiles
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass(layout = R.layout.item_profile_section)
 abstract class ProfileSectionItem: VectorEpoxyModel<ProfileSectionItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt
rename to vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index e33f19a59c..051847321a 100644
--- a/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.error
+package im.vector.app.core.error
 
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.api.failure.isInvalidPassword
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.failure.isInvalidPassword
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import java.net.HttpURLConnection
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
diff --git a/vector/src/main/java/im/vector/riotx/core/error/ResourceLimitErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/error/ResourceLimitErrorFormatter.kt
rename to vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt
index 9725120738..ce0b2d0703 100644
--- a/vector/src/main/java/im/vector/riotx/core/error/ResourceLimitErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.error
+package im.vector.app.core.error
 
 import android.content.Context
 import androidx.annotation.StringRes
 import androidx.core.text.HtmlCompat
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.riotx.R
+import im.vector.app.R
+import org.matrix.android.sdk.api.failure.MatrixError
 import me.gujun.android.span.span
 
 class ResourceLimitErrorFormatter(private val context: Context) {
diff --git a/vector/src/main/java/im/vector/riotx/core/error/fatal.kt b/vector/src/main/java/im/vector/app/core/error/fatal.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/error/fatal.kt
rename to vector/src/main/java/im/vector/app/core/error/fatal.kt
index ad6a99928a..8105e7fff9 100644
--- a/vector/src/main/java/im/vector/riotx/core/error/fatal.kt
+++ b/vector/src/main/java/im/vector/app/core/error/fatal.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.error
+package im.vector.app.core.error
 
 import timber.log.Timber
 
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt b/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt
rename to vector/src/main/java/im/vector/app/core/extensions/Activity.kt
index cc6eb54154..ee94013d1b 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import android.app.Activity
 import android.os.Parcelable
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
-import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseActivity
 
 fun VectorBaseActivity.addFragment(frameId: Int, fragment: Fragment) {
     supportFragmentManager.commitTransaction { add(frameId, fragment) }
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt
rename to vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt
index 99a5cb5a1a..c3e6520a46 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import android.os.Bundle
 import android.util.Patterns
 import androidx.fragment.app.Fragment
 import com.google.i18n.phonenumbers.NumberParseException
 import com.google.i18n.phonenumbers.PhoneNumberUtil
-import im.vector.matrix.android.api.extensions.ensurePrefix
+import org.matrix.android.sdk.api.extensions.ensurePrefix
 
 fun Boolean.toOnOff() = if (this) "ON" else "OFF"
 
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Collections.kt b/vector/src/main/java/im/vector/app/core/extensions/Collections.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/extensions/Collections.kt
rename to vector/src/main/java/im/vector/app/core/extensions/Collections.kt
index af5d5babb6..5168915c9c 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/Collections.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Collections.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 inline fun <reified T> List<T>.nextOrNull(index: Int) = getOrNull(index + 1)
 inline fun <reified T> List<T>.prevOrNull(index: Int) = getOrNull(index - 1)
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Context.kt b/vector/src/main/java/im/vector/app/core/extensions/Context.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/core/extensions/Context.kt
rename to vector/src/main/java/im/vector/app/core/extensions/Context.kt
index 3fdc4dbd8e..c1c435edf2 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/Context.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Context.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import android.content.Context
-import im.vector.riotx.core.di.HasVectorInjector
-import im.vector.riotx.core.di.VectorComponent
+import im.vector.app.core.di.HasVectorInjector
+import im.vector.app.core.di.VectorComponent
 
 fun Context.vectorComponent(): VectorComponent {
     val appContext = applicationContext
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt
rename to vector/src/main/java/im/vector/app/core/extensions/EditText.kt
index e0e2a78de5..355dd8442f 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import android.text.Editable
 import android.text.InputType
@@ -23,8 +23,8 @@ import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import androidx.annotation.DrawableRes
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.SimpleTextWatcher
+import im.vector.app.R
+import im.vector.app.core.platform.SimpleTextWatcher
 
 fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_filter,
                            @DrawableRes clearIconRes: Int = R.drawable.ic_x_gray) {
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Event.kt b/vector/src/main/java/im/vector/app/core/extensions/Event.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/core/extensions/Event.kt
rename to vector/src/main/java/im/vector/app/core/extensions/Event.kt
index 7d387c40ec..00f1e1f876 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/Event.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Event.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.riotx.core.resources.DateProvider
+import im.vector.app.core.resources.DateProvider
+import org.matrix.android.sdk.api.session.events.model.Event
 import org.threeten.bp.LocalDateTime
 
 fun Event.localDateTime(): LocalDateTime {
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Exhaustive.kt b/vector/src/main/java/im/vector/app/core/extensions/Exhaustive.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/extensions/Exhaustive.kt
rename to vector/src/main/java/im/vector/app/core/extensions/Exhaustive.kt
index ac6e14392e..158ea84f0c 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/Exhaustive.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Exhaustive.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 // Trick to ensure that when block is exhaustive
 val <T> T.exhaustive: T get() = this
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt
rename to vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
index 4c007e60d6..6ba250ee1b 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import android.app.Activity
 import android.os.Parcelable
 import androidx.fragment.app.Fragment
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.selectTxtFileToWrite
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.selectTxtFileToWrite
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt b/vector/src/main/java/im/vector/app/core/extensions/FragmentManager.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt
rename to vector/src/main/java/im/vector/app/core/extensions/FragmentManager.kt
index 83ac540830..1d437c0701 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/FragmentManager.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import androidx.fragment.app.FragmentTransaction
-import im.vector.matrix.android.api.extensions.tryThis
+import org.matrix.android.sdk.api.extensions.tryThis
 
 inline fun androidx.fragment.app.FragmentManager.commitTransactionNow(func: FragmentTransaction.() -> FragmentTransaction) {
     // Could throw and make the app crash
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt b/vector/src/main/java/im/vector/app/core/extensions/Iterable.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt
rename to vector/src/main/java/im/vector/app/core/extensions/Iterable.kt
index b9907f8789..56a9bbe39f 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Iterable.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 /**
  * Returns the last element yielding the smallest value of the given function or `null` if there are no elements.
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt b/vector/src/main/java/im/vector/app/core/extensions/LiveData.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt
rename to vector/src/main/java/im/vector/app/core/extensions/LiveData.kt
index 23af9e320f..192953f609 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/LiveData.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
-import im.vector.riotx.core.utils.EventObserver
-import im.vector.riotx.core.utils.FirstThrottler
-import im.vector.riotx.core.utils.LiveEvent
+import im.vector.app.core.utils.EventObserver
+import im.vector.app.core.utils.FirstThrottler
+import im.vector.app.core.utils.LiveEvent
 
 inline fun <T> LiveData<T>.observeK(owner: LifecycleOwner, crossinline observer: (T?) -> Unit) {
     this.observe(owner, Observer { observer(it) })
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt b/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt
rename to vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt
index 3762c52d45..03ce44f33f 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -22,8 +22,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.epoxy.EpoxyVisibilityTracker
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
 
 /**
  * Apply a Vertical LinearLayout Manager to the recyclerView and set the adapter from the epoxy controller
@@ -46,7 +45,7 @@ fun RecyclerView.configureWith(epoxyController: EpoxyController,
     if (showDivider) {
         addItemDecoration(
                 DividerItemDecoration(context, DividerItemDecoration.VERTICAL).apply {
-                    ContextCompat.getDrawable(context, ThemeUtils.getResourceId(context, R.drawable.divider_horizontal_light))?.let {
+                    ContextCompat.getDrawable(context, R.drawable.divider_horizontal)?.let {
                         setDrawable(it)
                     }
                 }
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Session.kt b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/core/extensions/Session.kt
rename to vector/src/main/java/im/vector/app/core/extensions/Session.kt
index 9d49319896..6f0fd51525 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/Session.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import android.content.Context
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ProcessLifecycleOwner
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.api.session.sync.FilterService
-import im.vector.riotx.core.services.VectorSyncService
+import im.vector.app.core.services.VectorSyncService
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.api.session.sync.FilterService
 import timber.log.Timber
 
 fun Session.configureAndStart(context: Context) {
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Set.kt b/vector/src/main/java/im/vector/app/core/extensions/Set.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/extensions/Set.kt
rename to vector/src/main/java/im/vector/app/core/extensions/Set.kt
index 43eb1b0d7c..a78fb85a1d 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/Set.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Set.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 // Create a new Set including the provided element if not already present, or removing the element if already present
 fun <T> Set<T>.toggle(element: T): Set<T> {
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt
rename to vector/src/main/java/im/vector/app/core/extensions/TextView.kt
index 9fbeb5f2af..cafcf6d1d8 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import android.text.Spannable
 import android.text.SpannableString
@@ -24,8 +24,8 @@ import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.features.themes.ThemeUtils
 
 /**
  * Set a text in the TextView, or set visibility to GONE if the text is null
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt b/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
similarity index 77%
rename from vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt
rename to vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
index 388ec9bebe..63e35c1c0f 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 fun TimelineEvent.canReact(): Boolean {
     // Only event of type Event.EVENT_TYPE_MESSAGE are supported for the moment
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt
rename to vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt
index 7614fda619..38977d33ba 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import java.net.URLEncoder
 
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/View.kt b/vector/src/main/java/im/vector/app/core/extensions/View.kt
similarity index 78%
rename from vector/src/main/java/im/vector/riotx/core/extensions/View.kt
rename to vector/src/main/java/im/vector/app/core/extensions/View.kt
index 41f98ed264..7ec86d3508 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/View.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/View.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
-import android.content.Context
 import android.view.View
 import android.view.inputmethod.InputMethodManager
+import androidx.core.content.getSystemService
 
 fun View.hideKeyboard() {
-    val imm = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+    val imm = context?.getSystemService<InputMethodManager>()
     imm?.hideSoftInputFromWindow(windowToken, 0)
 }
 
@@ -29,6 +29,6 @@ fun View.showKeyboard(andRequestFocus: Boolean = false) {
     if (andRequestFocus) {
         requestFocus()
     }
-    val imm = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+    val imm = context?.getSystemService<InputMethodManager>()
     imm?.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
 }
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt
rename to vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
index e7bd2122b6..31aaac41f0 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.extensions
+package im.vector.app.core.extensions
 
 import android.text.InputType
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import androidx.appcompat.widget.SearchView
-import im.vector.riotx.R
+import im.vector.app.R
 
 /**
  * Remove left margin of a SearchView
diff --git a/vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt b/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt
rename to vector/src/main/java/im/vector/app/core/files/FileSaver.kt
index 21bc16b09f..c4acbb5e65 100644
--- a/vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt
+++ b/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.files
+package im.vector.app.core.files
 
 import android.app.DownloadManager
 import android.content.ContentValues
@@ -23,6 +23,7 @@ import android.net.Uri
 import android.os.Build
 import android.provider.MediaStore
 import androidx.annotation.WorkerThread
+import androidx.core.content.getSystemService
 import arrow.core.Try
 import okio.buffer
 import okio.sink
@@ -85,7 +86,7 @@ fun addEntryToDownloadManager(context: Context,
                 null
             }
         } else {
-            val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as? DownloadManager
+            val downloadManager = context.getSystemService<DownloadManager>()
             @Suppress("DEPRECATION")
             downloadManager?.addCompletedDownload(title, description, true, mimeType, file.absolutePath, file.length(), true)
             return null
diff --git a/vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt
similarity index 79%
rename from vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt
rename to vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt
index 88e60d4f7e..1888012450 100644
--- a/vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.glide
+package im.vector.app.core.glide
 
 import com.bumptech.glide.load.Option
-import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
+import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
 
-const val ElementToDecryptOptionKey = "im.vector.riotx.core.glide.ElementToDecrypt"
+const val ElementToDecryptOptionKey = "im.vector.app.core.glide.ElementToDecrypt"
 
 val ELEMENT_TO_DECRYPT = Option.memory(
         ElementToDecryptOptionKey, ElementToDecrypt("", "", ""))
diff --git a/vector/src/main/java/im/vector/riotx/core/glide/FactoryUrl.kt b/vector/src/main/java/im/vector/app/core/glide/FactoryUrl.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/glide/FactoryUrl.kt
rename to vector/src/main/java/im/vector/app/core/glide/FactoryUrl.kt
index fc037894db..d52d5814ad 100644
--- a/vector/src/main/java/im/vector/riotx/core/glide/FactoryUrl.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/FactoryUrl.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.glide
+package im.vector.app.core.glide
 
 import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
 import com.bumptech.glide.load.model.GlideUrl
 import com.bumptech.glide.load.model.ModelLoader
 import com.bumptech.glide.load.model.ModelLoaderFactory
 import com.bumptech.glide.load.model.MultiModelLoaderFactory
-import im.vector.riotx.ActiveSessionDataSource
+import im.vector.app.ActiveSessionDataSource
 import okhttp3.OkHttpClient
 import java.io.InputStream
 
diff --git a/vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt b/vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt
rename to vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt
index a9bd910851..a51410165b 100644
--- a/vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.glide
+package im.vector.app.core.glide
 
 import android.content.Context
 import android.util.Log
@@ -24,8 +24,8 @@ import com.bumptech.glide.GlideBuilder
 import com.bumptech.glide.Registry
 import com.bumptech.glide.annotation.GlideModule
 import com.bumptech.glide.module.AppGlideModule
-import im.vector.riotx.core.extensions.vectorComponent
-import im.vector.riotx.features.media.ImageContentRenderer
+import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.features.media.ImageContentRenderer
 import java.io.InputStream
 
 @GlideModule
diff --git a/vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt
rename to vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index 510eef71e1..295609548f 100644
--- a/vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.glide
+package im.vector.app.core.glide
 
 import com.bumptech.glide.Priority
 import com.bumptech.glide.load.DataSource
@@ -24,9 +24,9 @@ import com.bumptech.glide.load.model.ModelLoader
 import com.bumptech.glide.load.model.ModelLoaderFactory
 import com.bumptech.glide.load.model.MultiModelLoaderFactory
 import com.bumptech.glide.signature.ObjectKey
-import im.vector.matrix.android.api.Matrix
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.features.media.ImageContentRenderer
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.features.media.ImageContentRenderer
+import org.matrix.android.sdk.api.Matrix
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/core/hardware/HardwareInfo.kt b/vector/src/main/java/im/vector/app/core/hardware/HardwareInfo.kt
similarity index 80%
rename from vector/src/main/java/im/vector/riotx/core/hardware/HardwareInfo.kt
rename to vector/src/main/java/im/vector/app/core/hardware/HardwareInfo.kt
index 1ce0dda025..a9aa7be267 100644
--- a/vector/src/main/java/im/vector/riotx/core/hardware/HardwareInfo.kt
+++ b/vector/src/main/java/im/vector/app/core/hardware/HardwareInfo.kt
@@ -16,13 +16,13 @@
 
 @file:Suppress("DEPRECATION")
 
-package im.vector.riotx.core.hardware
+package im.vector.app.core.hardware
 
 import android.content.Context
 import android.hardware.Camera
 import android.hardware.camera2.CameraCharacteristics
 import android.hardware.camera2.CameraManager
-import android.os.Build
+import androidx.core.content.getSystemService
 import javax.inject.Inject
 
 class HardwareInfo @Inject constructor(
@@ -32,11 +32,7 @@ class HardwareInfo @Inject constructor(
      * Tell if the device has a back (or external) camera
      */
     fun hasBackCamera(): Boolean {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            return Camera.getNumberOfCameras() > 0
-        }
-
-        val manager = context.getSystemService(Context.CAMERA_SERVICE) as CameraManager? ?: return Camera.getNumberOfCameras() > 0
+        val manager = context.getSystemService<CameraManager>() ?: return Camera.getNumberOfCameras() > 0
 
         return manager.cameraIdList.any {
             val lensFacing = manager.getCameraCharacteristics(it).get(CameraCharacteristics.LENS_FACING)
diff --git a/vector/src/main/java/im/vector/riotx/core/hardware/vibrator.kt b/vector/src/main/java/im/vector/app/core/hardware/vibrator.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/core/hardware/vibrator.kt
rename to vector/src/main/java/im/vector/app/core/hardware/vibrator.kt
index 8fc24d7fff..2746fde18a 100644
--- a/vector/src/main/java/im/vector/riotx/core/hardware/vibrator.kt
+++ b/vector/src/main/java/im/vector/app/core/hardware/vibrator.kt
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.hardware
+package im.vector.app.core.hardware
 
 import android.content.Context
 import android.os.Build
 import android.os.VibrationEffect
 import android.os.Vibrator
+import androidx.core.content.getSystemService
 
 fun vibrate(context: Context, durationMillis: Long = 100) {
-    val vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator? ?: return
+    val vibrator = context.getSystemService<Vibrator>() ?: return
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
         vibrator.vibrate(VibrationEffect.createOneShot(durationMillis, VibrationEffect.DEFAULT_AMPLITUDE))
     } else {
diff --git a/vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt b/vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt
rename to vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt
index 11710d3e13..24e03b4f40 100644
--- a/vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt
+++ b/vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.intent
+package im.vector.app.core.intent
 
 import android.content.ClipData
 import android.content.ClipDescription
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import androidx.core.util.PatternsCompat.WEB_URL
 
 /**
@@ -87,13 +86,9 @@ fun analyseIntent(intent: Intent): List<ExternalIntentData> {
         }
     }
 
-    var clipData: ClipData? = null
+    val clipData: ClipData? = intent.clipData
     var mimeTypes: List<String>? = null
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-        clipData = intent.clipData
-    }
-
     // multiple data
     if (null != clipData) {
         if (null != clipData.description) {
diff --git a/vector/src/main/java/im/vector/riotx/core/intent/Filename.kt b/vector/src/main/java/im/vector/app/core/intent/Filename.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/intent/Filename.kt
rename to vector/src/main/java/im/vector/app/core/intent/Filename.kt
index 2b6740f62f..5d118c19a1 100644
--- a/vector/src/main/java/im/vector/riotx/core/intent/Filename.kt
+++ b/vector/src/main/java/im/vector/app/core/intent/Filename.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.intent
+package im.vector.app.core.intent
 
 import android.content.Context
 import android.net.Uri
diff --git a/vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt b/vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt
rename to vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt
index b6ca7fbe8b..c8a2bf65d5 100644
--- a/vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt
+++ b/vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.intent
+package im.vector.app.core.intent
 
 import android.content.Context
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import im.vector.riotx.core.utils.getFileExtension
+import im.vector.app.core.utils.getFileExtension
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt b/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt
rename to vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt
index ae4131b5e9..bc45ab5676 100644
--- a/vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt
+++ b/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.linkify
+package im.vector.app.core.linkify
 
 /**
  * Better support for geo URi
diff --git a/vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt b/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt
rename to vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt
index 99b0316cbe..d7dea789d3 100644
--- a/vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt
+++ b/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.linkify
+package im.vector.app.core.linkify
 
 import android.text.Spannable
 import android.text.style.URLSpan
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/BadgeFloatingActionButton.kt b/vector/src/main/java/im/vector/app/core/platform/BadgeFloatingActionButton.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/core/platform/BadgeFloatingActionButton.kt
rename to vector/src/main/java/im/vector/app/core/platform/BadgeFloatingActionButton.kt
index 49931e2b54..088a535435 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/BadgeFloatingActionButton.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/BadgeFloatingActionButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.content.Context
 import android.graphics.Canvas
@@ -28,7 +28,7 @@ import android.text.TextPaint
 import android.util.AttributeSet
 import androidx.core.content.res.use
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import im.vector.riotx.R
+import im.vector.app.R
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.max
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt b/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt
rename to vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
index 9753b26691..cb05a2ac7d 100755
--- a/vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
@@ -24,7 +24,7 @@ import android.widget.Button
 import android.widget.FrameLayout
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
-import im.vector.riotx.R
+import im.vector.app.R
 import kotlinx.android.synthetic.main.view_button_state.view.*
 
 class ButtonStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt b/vector/src/main/java/im/vector/app/core/platform/CheckableConstraintLayout.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt
rename to vector/src/main/java/im/vector/app/core/platform/CheckableConstraintLayout.kt
index 4943e986c8..e81acac327 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/CheckableConstraintLayout.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt b/vector/src/main/java/im/vector/app/core/platform/CheckableFrameLayout.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt
rename to vector/src/main/java/im/vector/app/core/platform/CheckableFrameLayout.kt
index 281adc0b05..a755903468 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/CheckableFrameLayout.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/CheckableImageView.kt b/vector/src/main/java/im/vector/app/core/platform/CheckableImageView.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/platform/CheckableImageView.kt
rename to vector/src/main/java/im/vector/app/core/platform/CheckableImageView.kt
index 3f8c3f1b45..a6e82347b6 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/CheckableImageView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/CheckableImageView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt b/vector/src/main/java/im/vector/app/core/platform/CheckableView.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt
rename to vector/src/main/java/im/vector/app/core/platform/CheckableView.kt
index 2380c42ec0..bf24e01cb3 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/CheckableView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/ConfigurationViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt
rename to vector/src/main/java/im/vector/app/core/platform/ConfigurationViewModel.kt
index 779307526e..9186dba368 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/ConfigurationViewModel.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import im.vector.riotx.core.extensions.postLiveEvent
-import im.vector.riotx.core.utils.LiveEvent
-import im.vector.riotx.features.configuration.VectorConfiguration
+import im.vector.app.core.extensions.postLiveEvent
+import im.vector.app.core.utils.LiveEvent
+import im.vector.app.features.configuration.VectorConfiguration
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt b/vector/src/main/java/im/vector/app/core/platform/DefaultListUpdateCallback.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt
rename to vector/src/main/java/im/vector/app/core/platform/DefaultListUpdateCallback.kt
index 11b73dead9..b6cab4e29f 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/DefaultListUpdateCallback.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import androidx.recyclerview.widget.ListUpdateCallback
 
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/MaxHeightScrollView.kt b/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/platform/MaxHeightScrollView.kt
rename to vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt
index 99c158252f..139ccc8c05 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/MaxHeightScrollView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
 import androidx.core.content.withStyledAttributes
 import androidx.core.widget.NestedScrollView
-import im.vector.riotx.R
+import im.vector.app.R
 
 private const val DEFAULT_MAX_HEIGHT = 200
 
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt b/vector/src/main/java/im/vector/app/core/platform/OnBackPressed.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt
rename to vector/src/main/java/im/vector/app/core/platform/OnBackPressed.kt
index c8a58997a1..195fab6482 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/OnBackPressed.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 interface OnBackPressed {
 
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt b/vector/src/main/java/im/vector/app/core/platform/Restorable.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt
rename to vector/src/main/java/im/vector/app/core/platform/Restorable.kt
index e80af54619..280ed97935 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/Restorable.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.os.Bundle
 
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt
rename to vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
index 58ec4b22c6..12f173d0ac 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.view.View
 import android.widget.ProgressBar
@@ -22,10 +22,10 @@ import androidx.annotation.CallSuper
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import butterknife.BindView
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.hideKeyboard
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.hideKeyboard
+import org.matrix.android.sdk.api.session.Session
 import kotlinx.android.synthetic.main.activity.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt b/vector/src/main/java/im/vector/app/core/platform/SimpleTextWatcher.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt
rename to vector/src/main/java/im/vector/app/core/platform/SimpleTextWatcher.kt
index f968bfb5c1..75deebe1ba 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/SimpleTextWatcher.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.text.Editable
 import android.text.TextWatcher
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/StateView.kt b/vector/src/main/java/im/vector/app/core/platform/StateView.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/platform/StateView.kt
rename to vector/src/main/java/im/vector/app/core/platform/StateView.kt
index bc24874f9f..2af3235cdf 100755
--- a/vector/src/main/java/im/vector/riotx/core/platform/StateView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/StateView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.content.Context
 import android.graphics.drawable.Drawable
@@ -22,7 +22,7 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
 import androidx.core.view.isVisible
-import im.vector.riotx.R
+import im.vector.app.R
 import kotlinx.android.synthetic.main.view_state.view.*
 
 class StateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt b/vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt
rename to vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt
index e20ed0bfa3..c42a47c40c 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import androidx.appcompat.widget.Toolbar
 
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
rename to vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index 59bf7a8aeb..11a6e326ac 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
+import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Parcelable
@@ -45,34 +47,39 @@ import butterknife.Unbinder
 import com.airbnb.mvrx.MvRx
 import com.bumptech.glide.util.Util
 import com.google.android.material.snackbar.Snackbar
-import im.vector.matrix.android.api.failure.GlobalError
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.DaggerScreenComponent
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.di.HasVectorInjector
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.di.VectorComponent
-import im.vector.riotx.core.dialogs.DialogLocker
-import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.observeEvent
-import im.vector.riotx.core.extensions.vectorComponent
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.MainActivity
-import im.vector.riotx.features.MainActivityArgs
-import im.vector.riotx.features.configuration.VectorConfiguration
-import im.vector.riotx.features.consent.ConsentNotGivenHelper
-import im.vector.riotx.features.navigation.Navigator
-import im.vector.riotx.features.rageshake.BugReportActivity
-import im.vector.riotx.features.rageshake.BugReporter
-import im.vector.riotx.features.rageshake.RageShake
-import im.vector.riotx.features.session.SessionListener
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.themes.ActivityOtherThemes
-import im.vector.riotx.features.themes.ThemeUtils
-import im.vector.riotx.receivers.DebugReceiver
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.DaggerScreenComponent
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.di.HasVectorInjector
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.di.VectorComponent
+import im.vector.app.core.dialogs.DialogLocker
+import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.observeEvent
+import im.vector.app.core.extensions.observeNotNull
+import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.core.utils.toast
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
+import im.vector.app.features.configuration.VectorConfiguration
+import im.vector.app.features.consent.ConsentNotGivenHelper
+import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.pin.PinActivity
+import im.vector.app.features.pin.PinLocker
+import im.vector.app.features.pin.PinMode
+import im.vector.app.features.pin.UnlockedActivity
+import im.vector.app.features.rageshake.BugReportActivity
+import im.vector.app.features.rageshake.BugReporter
+import im.vector.app.features.rageshake.RageShake
+import im.vector.app.features.session.SessionListener
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.themes.ActivityOtherThemes
+import im.vector.app.features.themes.ThemeUtils
+import im.vector.app.receivers.DebugReceiver
+import org.matrix.android.sdk.api.failure.GlobalError
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
@@ -116,6 +123,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
     private lateinit var configurationViewModel: ConfigurationViewModel
     private lateinit var sessionListener: SessionListener
     protected lateinit var bugReporter: BugReporter
+    private lateinit var pinLocker: PinLocker
     lateinit var rageShake: RageShake
 
     lateinit var navigator: Navigator
@@ -181,6 +189,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
         viewModelFactory = screenComponent.viewModelFactory()
         configurationViewModel = viewModelProvider.get(ConfigurationViewModel::class.java)
         bugReporter = screenComponent.bugReporter()
+        pinLocker = screenComponent.pinLocker()
         // Shake detector
         rageShake = screenComponent.rageShake()
         navigator = screenComponent.navigator()
@@ -193,7 +202,11 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
                 finish()
             }
         })
-
+        pinLocker.getLiveState().observeNotNull(this) {
+            if (this@VectorBaseActivity !is UnlockedActivity && it == PinLocker.State.LOCKED) {
+                navigator.openPinCode(this, PinMode.AUTH)
+            }
+        }
         sessionListener = vectorComponent.sessionListener()
         sessionListener.globalErrorLiveData.observeEvent(this) {
             handleGlobalError(it)
@@ -285,6 +298,21 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
         uiDisposables.dispose()
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == PinActivity.PIN_REQUEST_CODE) {
+            when (resultCode) {
+                Activity.RESULT_OK                 -> {
+                    pinLocker.unlock()
+                }
+                else                               -> {
+                    pinLocker.block()
+                    moveTaskToBack(true)
+                }
+            }
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         Timber.i("onResume Activity ${this.javaClass.simpleName}")
@@ -294,7 +322,6 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
         if (this !is BugReportActivity && vectorPreferences.useRageshake()) {
             rageShake.start()
         }
-
         DebugReceiver
                 .getIntentFilter(this)
                 .takeIf { BuildConfig.DEBUG }
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/platform/VectorBaseBottomSheetDialogFragment.kt
rename to vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
index 393642139e..9ed5c5c455 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.app.Dialog
 import android.content.Context
@@ -35,9 +35,9 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.jakewharton.rxbinding3.view.clicks
-import im.vector.riotx.core.di.DaggerScreenComponent
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.utils.DimensionConverter
+import im.vector.app.core.di.DaggerScreenComponent
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.utils.DimensionConverter
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt
rename to vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index f4343a3e58..4ce4d210b0 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -16,7 +16,7 @@
 
 @file:Suppress("DEPRECATION")
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import android.app.ProgressDialog
 import android.content.Context
@@ -40,13 +40,13 @@ import com.airbnb.mvrx.MvRx
 import com.bumptech.glide.util.Util.assertMainThread
 import com.google.android.material.snackbar.Snackbar
 import com.jakewharton.rxbinding3.view.clicks
-import im.vector.riotx.R
-import im.vector.riotx.core.di.DaggerScreenComponent
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.features.navigation.Navigator
+import im.vector.app.R
+import im.vector.app.core.di.DaggerScreenComponent
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.features.navigation.Navigator
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorEventViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/core/platform/VectorEventViewModel.kt
rename to vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt
index e928be3343..2d499db531 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/VectorEventViewModel.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import androidx.lifecycle.ViewModel
-import im.vector.riotx.core.utils.MutableDataSource
-import im.vector.riotx.core.utils.PublishDataSource
+import im.vector.app.core.utils.MutableDataSource
+import im.vector.app.core.utils.PublishDataSource
 
 interface VectorSharedAction
 
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewEvents.kt b/vector/src/main/java/im/vector/app/core/platform/VectorViewEvents.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/platform/VectorViewEvents.kt
rename to vector/src/main/java/im/vector/app/core/platform/VectorViewEvents.kt
index b5c191f81a..979394a988 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorViewEvents.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 /**
  * Interface for View Events
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt
rename to vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt
index 11cd9c485e..6429c9dfe5 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.BaseMvRxViewModel
@@ -22,8 +22,8 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Success
-import im.vector.riotx.core.utils.DataSource
-import im.vector.riotx.core.utils.PublishDataSource
+import im.vector.app.core.utils.DataSource
+import im.vector.app.core.utils.PublishDataSource
 import io.reactivex.Observable
 import io.reactivex.Single
 
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModelAction.kt b/vector/src/main/java/im/vector/app/core/platform/VectorViewModelAction.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/platform/VectorViewModelAction.kt
rename to vector/src/main/java/im/vector/app/core/platform/VectorViewModelAction.kt
index 81c1996497..a6ce118eb7 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModelAction.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorViewModelAction.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 interface VectorViewModelAction
 
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/ViewModelTask.kt b/vector/src/main/java/im/vector/app/core/platform/ViewModelTask.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/platform/ViewModelTask.kt
rename to vector/src/main/java/im/vector/app/core/platform/ViewModelTask.kt
index abe5cc9095..a673fd4406 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/ViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/ViewModelTask.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
diff --git a/vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt b/vector/src/main/java/im/vector/app/core/platform/WaitingViewData.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt
rename to vector/src/main/java/im/vector/app/core/platform/WaitingViewData.kt
index 9a079a6c38..e1e9c7e39f 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/WaitingViewData.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.platform
+package im.vector.app.core.platform
 
 /**
  * Model to display a Waiting View
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt b/vector/src/main/java/im/vector/app/core/preference/AddressPreference.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt
rename to vector/src/main/java/im/vector/app/core/preference/AddressPreference.kt
index 3226327e51..44bd158935 100755
--- a/vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/AddressPreference.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.preference
+package im.vector.app.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
 import androidx.preference.PreferenceViewHolder
-import im.vector.riotx.R
+import im.vector.app.R
 
 /**
  * Preference used in Room setting for Room aliases
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt b/vector/src/main/java/im/vector/app/core/preference/ProgressBarPreference.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt
rename to vector/src/main/java/im/vector/app/core/preference/ProgressBarPreference.kt
index 73a65d6fb0..2bf1b32d7d 100755
--- a/vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/ProgressBarPreference.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.preference
+package im.vector.app.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
 import androidx.preference.Preference
-import im.vector.riotx.R
+import im.vector.app.R
 
 class ProgressBarPreference : Preference {
 
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/PushRulePreference.kt b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/preference/PushRulePreference.kt
rename to vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
index 16dd1bb486..87584a9db0 100755
--- a/vector/src/main/java/im/vector/riotx/core/preference/PushRulePreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.preference
+package im.vector.app.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
@@ -22,10 +22,10 @@ import android.view.View
 import android.widget.RadioGroup
 import android.widget.TextView
 import androidx.preference.PreferenceViewHolder
-import im.vector.matrix.android.api.pushrules.RuleSetKey
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.api.pushrules.rest.PushRuleAndKind
-import im.vector.riotx.R
+import im.vector.app.R
+import org.matrix.android.sdk.api.pushrules.RuleSetKey
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.pushrules.rest.PushRuleAndKind
 
 class PushRulePreference : VectorPreference {
 
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt b/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
similarity index 64%
rename from vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt
rename to vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
index c7fcf85a16..e3b4430fe0 100755
--- a/vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.preference
+package im.vector.app.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
@@ -22,17 +22,14 @@ import android.widget.ImageView
 import android.widget.ProgressBar
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.vectorComponent
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.toMatrixItem
 
-open class UserAvatarPreference : Preference {
-
-    internal var mAvatarView: ImageView? = null
-    internal var mSession: Session? = null
+class UserAvatarPreference : Preference {
+    private var mAvatarView: ImageView? = null
     private var mLoadingProgressBar: ProgressBar? = null
 
     private var avatarRenderer: AvatarRenderer = context.vectorComponent().avatarRenderer()
@@ -51,24 +48,11 @@ open class UserAvatarPreference : Preference {
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
-
         mAvatarView = holder.itemView.findViewById(R.id.settings_avatar)
         mLoadingProgressBar = holder.itemView.findViewById(R.id.avatar_update_progress_bar)
-        refreshAvatar()
     }
 
-    open fun refreshAvatar() {
-        val session = mSession ?: return
-        val view = mAvatarView ?: return
-        session.getUser(session.myUserId)?.let {
-            avatarRenderer.render(it.toMatrixItem(), view)
-        } ?: run {
-            avatarRenderer.render(MatrixItem.UserItem(session.myUserId), view)
-        }
-    }
-
-    fun setSession(session: Session) {
-        mSession = session
-        refreshAvatar()
+    fun refreshAvatar(user: User) {
+        mAvatarView?.let { avatarRenderer.render(user.toMatrixItem(), it) }
     }
 }
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorEditTextPreference.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt
rename to vector/src/main/java/im/vector/app/core/preference/VectorEditTextPreference.kt
index e2c61118a7..840e5fa510 100644
--- a/vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/VectorEditTextPreference.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.preference
+package im.vector.app.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.TextView
 import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceViewHolder
-import im.vector.riotx.R
+import im.vector.app.R
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorGroupPreference.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt
rename to vector/src/main/java/im/vector/app/core/preference/VectorGroupPreference.kt
index 4415aa5a4a..4eb3677fd5 100644
--- a/vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/VectorGroupPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.preference
+package im.vector.app.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
@@ -26,9 +26,9 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.preference.PreferenceViewHolder
 import androidx.preference.SwitchPreference
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.group.Group
-import im.vector.riotx.R
+import im.vector.app.R
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.group.Group
 
 class VectorGroupPreference : SwitchPreference {
 
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorListPreference.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt
rename to vector/src/main/java/im/vector/app/core/preference/VectorListPreference.kt
index 174c52d831..e7e8ab8d24 100644
--- a/vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/VectorListPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.preference
+package im.vector.app.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
@@ -22,7 +22,7 @@ import android.view.View
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
-import im.vector.riotx.R
+import im.vector.app.R
 
 /**
  * Customize ListPreference class to add a warning icon to the right side of the list.
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt
rename to vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt
index 048625ded6..4a9bb6a6f5 100755
--- a/vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.preference
+package im.vector.app.core.preference
 
 import android.animation.Animator
 import android.animation.ArgbEvaluator
@@ -28,8 +28,8 @@ import android.widget.TextView
 import androidx.core.animation.doOnEnd
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.features.themes.ThemeUtils
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt b/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt
rename to vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt
index d71bcccd5b..e61cde8ebd 100644
--- a/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.preference
+package im.vector.app.core.preference
 
 import android.content.Context
 import android.graphics.Typeface
@@ -23,8 +23,8 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceViewHolder
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.features.themes.ThemeUtils
 
 /**
  * Customize PreferenceCategory class to redefine some attributes.
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorSwitchPreference.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt
rename to vector/src/main/java/im/vector/app/core/preference/VectorSwitchPreference.kt
index 4728856e32..c97991bfcb 100644
--- a/vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/VectorSwitchPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.preference
+package im.vector.app.core.preference
 
 import android.animation.Animator
 import android.animation.ArgbEvaluator
@@ -26,8 +26,8 @@ import android.widget.TextView
 import androidx.core.animation.doOnEnd
 import androidx.preference.PreferenceViewHolder
 import androidx.preference.SwitchPreference
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.features.themes.ThemeUtils
 
 /**
  * Switch preference with title on multiline (only used in XML)
diff --git a/vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt
rename to vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index 69367e529c..f0d27182e7 100644
--- a/vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.pushers
+package im.vector.app.core.pushers
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.resources.AppNameProvider
-import im.vector.riotx.core.resources.LocaleProvider
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.resources.AppNameProvider
+import im.vector.app.core.resources.LocaleProvider
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.MatrixCallback
 import java.util.UUID
 import javax.inject.Inject
 import kotlin.math.abs
diff --git a/vector/src/main/java/im/vector/riotx/core/qrcode/QrCode.kt b/vector/src/main/java/im/vector/app/core/qrcode/QrCode.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/qrcode/QrCode.kt
rename to vector/src/main/java/im/vector/app/core/qrcode/QrCode.kt
index 110427a3ec..f79ae7afd9 100644
--- a/vector/src/main/java/im/vector/riotx/core/qrcode/QrCode.kt
+++ b/vector/src/main/java/im/vector/app/core/qrcode/QrCode.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.qrcode
+package im.vector.app.core.qrcode
 
 import android.graphics.Bitmap
 import android.graphics.Color
diff --git a/vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt b/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt
rename to vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
index d77a55a914..9874c1744f 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.resources
+package im.vector.app.core.resources
 
 import android.content.Context
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt b/vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt
rename to vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
index 76c7088174..395b75d336 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.resources
+package im.vector.app.core.resources
 
 import android.content.Context
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.core.content.ContextCompat
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.features.themes.ThemeUtils
 import javax.inject.Inject
 
 class ColorProvider @Inject constructor(private val context: Context) {
diff --git a/vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt b/vector/src/main/java/im/vector/app/core/resources/DateProvider.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt
rename to vector/src/main/java/im/vector/app/core/resources/DateProvider.kt
index 7a13a9f099..5769b04d29 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/DateProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.resources
+package im.vector.app.core.resources
 
 import org.threeten.bp.Instant
 import org.threeten.bp.LocalDateTime
diff --git a/vector/src/main/java/im/vector/riotx/core/resources/DrawableProvider.kt b/vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/resources/DrawableProvider.kt
rename to vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt
index c71def27f2..2f6b9aa6d2 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/DrawableProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.resources
+package im.vector.app.core.resources
 
 import android.content.Context
 import android.graphics.drawable.Drawable
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.features.themes.ThemeUtils
 import javax.inject.Inject
 
 class DrawableProvider @Inject constructor(private val context: Context) {
diff --git a/vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt
rename to vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
index c78a5a99b8..4ddf24414f 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.resources
+package im.vector.app.core.resources
 
 import android.content.res.Resources
 import androidx.core.os.ConfigurationCompat
diff --git a/vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt b/vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt
rename to vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt
index 236caec081..7ab2271c57 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.resources
+package im.vector.app.core.resources
 
 import android.content.Context
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import im.vector.riotx.core.utils.getFileExtension
+import im.vector.app.core.utils.getFileExtension
 import timber.log.Timber
 import java.io.InputStream
 
diff --git a/vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt b/vector/src/main/java/im/vector/app/core/resources/StringArrayProvider.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt
rename to vector/src/main/java/im/vector/app/core/resources/StringArrayProvider.kt
index 16742f5eea..9ed3c02ba4 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/StringArrayProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.resources
+package im.vector.app.core.resources
 
 import android.content.res.Resources
 import androidx.annotation.ArrayRes
diff --git a/vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt b/vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt
rename to vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
index cd1c2a7518..7e322daaae 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.resources
+package im.vector.app.core.resources
 
 import android.content.res.Resources
 import androidx.annotation.NonNull
diff --git a/vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt
rename to vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
index fa4b09ed4c..302e55d1e7 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.resources
+package im.vector.app.core.resources
 
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorPreferences
 import javax.inject.Inject
 
 class UserPreferencesProvider @Inject constructor(private val vectorPreferences: VectorPreferences) {
diff --git a/vector/src/main/java/im/vector/riotx/core/resources/VersionCodeProvider.kt b/vector/src/main/java/im/vector/app/core/resources/VersionCodeProvider.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/resources/VersionCodeProvider.kt
rename to vector/src/main/java/im/vector/app/core/resources/VersionCodeProvider.kt
index 342fc4e48b..1e136bbcc2 100644
--- a/vector/src/main/java/im/vector/riotx/core/resources/VersionCodeProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/VersionCodeProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.resources
+package im.vector.app.core.resources
 
 import android.content.Context
 import android.os.Build
diff --git a/vector/src/main/java/im/vector/riotx/core/rx/RxConfig.kt b/vector/src/main/java/im/vector/app/core/rx/RxConfig.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/rx/RxConfig.kt
rename to vector/src/main/java/im/vector/app/core/rx/RxConfig.kt
index 73e68a6bf0..ab0ffb7802 100644
--- a/vector/src/main/java/im/vector/riotx/core/rx/RxConfig.kt
+++ b/vector/src/main/java/im/vector/app/core/rx/RxConfig.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.rx
+package im.vector.app.core.rx
 
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorPreferences
 import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/core/services/BluetoothHeadsetReceiver.kt b/vector/src/main/java/im/vector/app/core/services/BluetoothHeadsetReceiver.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/services/BluetoothHeadsetReceiver.kt
rename to vector/src/main/java/im/vector/app/core/services/BluetoothHeadsetReceiver.kt
index a56c4c73c6..3f2cd2566e 100644
--- a/vector/src/main/java/im/vector/riotx/core/services/BluetoothHeadsetReceiver.kt
+++ b/vector/src/main/java/im/vector/app/core/services/BluetoothHeadsetReceiver.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.services
+package im.vector.app.core.services
 
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothClass
diff --git a/vector/src/main/java/im/vector/riotx/core/services/CallRingPlayer.kt b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/services/CallRingPlayer.kt
rename to vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
index f7f64d65f5..b14a097eb6 100644
--- a/vector/src/main/java/im/vector/riotx/core/services/CallRingPlayer.kt
+++ b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.services
+package im.vector.app.core.services
 
 import android.content.Context
 import android.media.AudioAttributes
 import android.media.AudioManager
 import android.media.MediaPlayer
 import android.os.Build
-import im.vector.riotx.R
+import androidx.core.content.getSystemService
+import im.vector.app.R
 import timber.log.Timber
 
 class CallRingPlayer(
@@ -33,7 +34,7 @@ class CallRingPlayer(
     private var player: MediaPlayer? = null
 
     fun start() {
-        val audioManager: AudioManager = applicationContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        val audioManager = applicationContext.getSystemService<AudioManager>()!!
         player?.release()
         player = createPlayer()
 
diff --git a/vector/src/main/java/im/vector/riotx/core/services/CallService.kt b/vector/src/main/java/im/vector/app/core/services/CallService.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/core/services/CallService.kt
rename to vector/src/main/java/im/vector/app/core/services/CallService.kt
index 723cfe3add..1362c20be1 100644
--- a/vector/src/main/java/im/vector/riotx/core/services/CallService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/CallService.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.services
+package im.vector.app.core.services
 
 import android.content.Context
 import android.content.Intent
@@ -24,10 +24,10 @@ import android.support.v4.media.session.MediaSessionCompat
 import android.view.KeyEvent
 import androidx.core.content.ContextCompat
 import androidx.media.session.MediaButtonReceiver
-import im.vector.riotx.core.extensions.vectorComponent
-import im.vector.riotx.features.call.WebRtcPeerConnectionManager
-import im.vector.riotx.features.call.telecom.CallConnection
-import im.vector.riotx.features.notifications.NotificationUtils
+import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.features.call.WebRtcPeerConnectionManager
+import im.vector.app.features.call.telecom.CallConnection
+import im.vector.app.features.notifications.NotificationUtils
 import timber.log.Timber
 
 /**
@@ -172,7 +172,7 @@ class CallService : VectorService(), WiredHeadsetStateReceiver.HeadsetEventListe
         // turn the screen on for 3 seconds
 //            if (Matrix.getInstance(VectorApp.getInstance())!!.pushManager.isScreenTurnedOn) {
 //                try {
-//                    val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
+//                    val pm = getSystemService<PowerManager>()!!
 //                    val wl = pm.newWakeLock(
 //                            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or PowerManager.ACQUIRE_CAUSES_WAKEUP,
 //                            CallService::class.java.simpleName)
@@ -260,14 +260,14 @@ class CallService : VectorService(), WiredHeadsetStateReceiver.HeadsetEventListe
     companion object {
         private const val NOTIFICATION_ID = 6480
 
-        private const val ACTION_INCOMING_RINGING_CALL = "im.vector.riotx.core.services.CallService.ACTION_INCOMING_RINGING_CALL"
-        private const val ACTION_OUTGOING_RINGING_CALL = "im.vector.riotx.core.services.CallService.ACTION_OUTGOING_RINGING_CALL"
-        private const val ACTION_CALL_CONNECTING = "im.vector.riotx.core.services.CallService.ACTION_CALL_CONNECTING"
-        private const val ACTION_ONGOING_CALL = "im.vector.riotx.core.services.CallService.ACTION_ONGOING_CALL"
-        private const val ACTION_ONGOING_CALL_BG = "im.vector.riotx.core.services.CallService.ACTION_ONGOING_CALL_BG"
-        private const val ACTION_NO_ACTIVE_CALL = "im.vector.riotx.core.services.CallService.NO_ACTIVE_CALL"
-//        private const val ACTION_ACTIVITY_VISIBLE = "im.vector.riotx.core.services.CallService.ACTION_ACTIVITY_VISIBLE"
-//        private const val ACTION_STOP_RINGING = "im.vector.riotx.core.services.CallService.ACTION_STOP_RINGING"
+        private const val ACTION_INCOMING_RINGING_CALL = "im.vector.app.core.services.CallService.ACTION_INCOMING_RINGING_CALL"
+        private const val ACTION_OUTGOING_RINGING_CALL = "im.vector.app.core.services.CallService.ACTION_OUTGOING_RINGING_CALL"
+        private const val ACTION_CALL_CONNECTING = "im.vector.app.core.services.CallService.ACTION_CALL_CONNECTING"
+        private const val ACTION_ONGOING_CALL = "im.vector.app.core.services.CallService.ACTION_ONGOING_CALL"
+        private const val ACTION_ONGOING_CALL_BG = "im.vector.app.core.services.CallService.ACTION_ONGOING_CALL_BG"
+        private const val ACTION_NO_ACTIVE_CALL = "im.vector.app.core.services.CallService.NO_ACTIVE_CALL"
+//        private const val ACTION_ACTIVITY_VISIBLE = "im.vector.app.core.services.CallService.ACTION_ACTIVITY_VISIBLE"
+//        private const val ACTION_STOP_RINGING = "im.vector.app.core.services.CallService.ACTION_STOP_RINGING"
 
         private const val EXTRA_IS_VIDEO = "EXTRA_IS_VIDEO"
         private const val EXTRA_ROOM_NAME = "EXTRA_ROOM_NAME"
diff --git a/vector/src/main/java/im/vector/riotx/core/services/VectorService.kt b/vector/src/main/java/im/vector/app/core/services/VectorService.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/services/VectorService.kt
rename to vector/src/main/java/im/vector/app/core/services/VectorService.kt
index 53777837af..888f7a8cac 100644
--- a/vector/src/main/java/im/vector/riotx/core/services/VectorService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/VectorService.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.services
+package im.vector.app.core.services
 
 import android.app.Service
 import android.content.Intent
diff --git a/vector/src/main/java/im/vector/riotx/core/services/VectorSyncService.kt b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/core/services/VectorSyncService.kt
rename to vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
index 314e12db05..20ceb07fb5 100644
--- a/vector/src/main/java/im/vector/riotx/core/services/VectorSyncService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.services
+package im.vector.app.core.services
 
 import android.app.AlarmManager
 import android.app.NotificationManager
@@ -21,10 +21,11 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import im.vector.matrix.android.internal.session.sync.job.SyncService
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.vectorComponent
-import im.vector.riotx.features.notifications.NotificationUtils
+import androidx.core.content.getSystemService
+import im.vector.app.R
+import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.features.notifications.NotificationUtils
+import org.matrix.android.sdk.internal.session.sync.job.SyncService
 
 class VectorSyncService : SyncService() {
 
@@ -64,7 +65,7 @@ class VectorSyncService : SyncService() {
     }
 
     private fun removeForegroundNotification() {
-        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val notificationManager = getSystemService<NotificationManager>()!!
         notificationManager.cancel(NotificationUtils.NOTIFICATION_ID_FOREGROUND_SERVICE)
     }
 
@@ -75,7 +76,7 @@ class VectorSyncService : SyncService() {
             PendingIntent.getService(this, 0, newIntent(this, sessionId), 0)
         }
         val firstMillis = System.currentTimeMillis() + delay
-        val alarmMgr = getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        val alarmMgr = getSystemService<AlarmManager>()!!
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             alarmMgr.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, firstMillis, pendingIntent)
         } else {
diff --git a/vector/src/main/java/im/vector/riotx/core/services/WiredHeadsetStateReceiver.kt b/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/services/WiredHeadsetStateReceiver.kt
rename to vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt
index e63c7f5049..e276e24851 100644
--- a/vector/src/main/java/im/vector/riotx/core/services/WiredHeadsetStateReceiver.kt
+++ b/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.services
+package im.vector.app.core.services
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericButtonItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericButtonItem.kt
rename to vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
index 731de9a705..d1df785381 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.ui.list
+package im.vector.app.core.ui.list
 
 import android.view.View
 import androidx.annotation.ColorInt
@@ -21,10 +21,10 @@ import androidx.annotation.DrawableRes
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.button.MaterialButton
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.themes.ThemeUtils
 
 /**
  * A generic button list item.
@@ -36,7 +36,7 @@ abstract class GenericButtonItem : VectorEpoxyModel<GenericButtonItem.Holder>()
     var text: String? = null
 
     @EpoxyAttribute
-    var itemClickAction: View.OnClickListener? = null
+    var buttonClickAction: View.OnClickListener? = null
 
     @EpoxyAttribute
     @ColorInt
@@ -57,7 +57,7 @@ abstract class GenericButtonItem : VectorEpoxyModel<GenericButtonItem.Holder>()
             holder.button.icon = null
         }
 
-        itemClickAction?.let { holder.view.setOnClickListener(it) }
+        buttonClickAction?.let { holder.button.setOnClickListener(it) }
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt
rename to vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
index 7d73a1949f..2539e59ae4 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.ui.list
+package im.vector.app.core.ui.list
 
 import android.view.Gravity
 import android.widget.TextView
 import androidx.annotation.ColorInt
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.themes.ThemeUtils
 
 /**
  * A generic list item.
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt
rename to vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
index c4704d85c7..832250fab4 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.ui.list
+package im.vector.app.core.ui.list
 
 import android.view.View
 import android.widget.Button
@@ -24,10 +24,10 @@ import androidx.annotation.DrawableRes
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 /**
  * A generic list item.
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemHeader.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemHeader.kt
rename to vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt
index 6ab5b59fa1..d0c65aff95 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemHeader.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.ui.list
+package im.vector.app.core.ui.list
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 /**
  * A generic list item header left aligned with notice color.
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemWithValue.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt
rename to vector/src/main/java/im/vector/app/core/ui/list/GenericItemWithValue.kt
index 354ca8eb3f..f9d32a9f1e 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemWithValue.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.ui.list
+package im.vector.app.core.ui.list
 
 import android.view.View
 import android.widget.ImageView
@@ -23,12 +23,12 @@ import androidx.annotation.DrawableRes
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.themes.ThemeUtils
 
 /**
  * A generic list item.
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericLoaderItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericLoaderItem.kt
similarity index 68%
rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericLoaderItem.kt
rename to vector/src/main/java/im/vector/app/core/ui/list/GenericLoaderItem.kt
index bba51d6a42..634e58e943 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericLoaderItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericLoaderItem.kt
@@ -1,9 +1,9 @@
-package im.vector.riotx.core.ui.list
+package im.vector.app.core.ui.list
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 /**
  * A generic list item header left aligned with notice color.
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/model/Size.kt b/vector/src/main/java/im/vector/app/core/ui/model/Size.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/ui/model/Size.kt
rename to vector/src/main/java/im/vector/app/core/ui/model/Size.kt
index 4a07bb2cea..bdfb835b86 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/model/Size.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/model/Size.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.ui.model
+package im.vector.app.core.ui.model
 
 import androidx.annotation.Px
 
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ActiveCallView.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallView.kt
rename to vector/src/main/java/im/vector/app/core/ui/views/ActiveCallView.kt
index 9507a4daf8..19d1fbb6f6 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ActiveCallView.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.ui.views
+package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.RelativeLayout
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.features.themes.ThemeUtils
 
 class ActiveCallView @JvmOverloads constructor(
         context: Context,
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallViewHolder.kt b/vector/src/main/java/im/vector/app/core/ui/views/ActiveCallViewHolder.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallViewHolder.kt
rename to vector/src/main/java/im/vector/app/core/ui/views/ActiveCallViewHolder.kt
index 6a5519adbc..43346e583e 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallViewHolder.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ActiveCallViewHolder.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.ui.views
+package im.vector.app.core.ui.views
 
 import android.view.View
 import androidx.cardview.widget.CardView
 import androidx.core.view.isVisible
-import im.vector.matrix.android.api.session.call.CallState
-import im.vector.matrix.android.api.session.call.EglUtils
-import im.vector.matrix.android.api.session.call.MxCall
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.call.WebRtcPeerConnectionManager
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.call.WebRtcPeerConnectionManager
+import org.matrix.android.sdk.api.session.call.CallState
+import org.matrix.android.sdk.api.session.call.EglUtils
+import org.matrix.android.sdk.api.session.call.MxCall
 import org.webrtc.RendererCommon
 import org.webrtc.SurfaceViewRenderer
 
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt
new file mode 100644
index 0000000000..240ad61c40
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.ui.views
+
+import android.content.Context
+import android.text.SpannableString
+import android.text.method.LinkMovementMethod
+import android.text.style.ClickableSpan
+import android.util.AttributeSet
+import android.view.View
+import android.widget.RelativeLayout
+import android.widget.TextView
+import androidx.core.view.isVisible
+import im.vector.app.R
+import im.vector.app.core.utils.tappableMatchingText
+import im.vector.app.features.home.room.detail.RoomDetailViewState
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+
+class ActiveConferenceView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : RelativeLayout(context, attrs, defStyleAttr) {
+
+    interface Callback {
+        fun onTapJoinAudio(jitsiWidget: Widget)
+        fun onTapJoinVideo(jitsiWidget: Widget)
+        fun onDelete(jitsiWidget: Widget)
+    }
+
+    var callback: Callback? = null
+    var jitsiWidget: Widget? = null
+
+    init {
+        setupView()
+    }
+
+    private fun setupView() {
+        inflate(context, R.layout.view_active_conference_view, this)
+        setBackgroundColor(ThemeUtils.getColor(context, R.attr.colorPrimary))
+
+        // "voice" and "video" texts are underlined and clickable
+        val voiceString = context.getString(R.string.ongoing_conference_call_voice)
+        val videoString = context.getString(R.string.ongoing_conference_call_video)
+
+        val fullMessage = context.getString(R.string.ongoing_conference_call, voiceString, videoString)
+
+        val styledText = SpannableString(fullMessage)
+        styledText.tappableMatchingText(voiceString, object : ClickableSpan() {
+            override fun onClick(widget: View) {
+                jitsiWidget?.let {
+                    callback?.onTapJoinAudio(it)
+                }
+            }
+        })
+        styledText.tappableMatchingText(videoString, object : ClickableSpan() {
+            override fun onClick(widget: View) {
+                jitsiWidget?.let {
+                    callback?.onTapJoinVideo(it)
+                }
+            }
+        })
+
+        findViewById<TextView>(R.id.activeConferenceInfo).apply {
+            text = styledText
+            movementMethod = LinkMovementMethod.getInstance()
+        }
+
+        findViewById<TextView>(R.id.deleteWidgetButton).setOnClickListener {
+            jitsiWidget?.let { callback?.onDelete(it) }
+        }
+    }
+
+    fun render(state: RoomDetailViewState) {
+        val summary = state.asyncRoomSummary()
+        if (summary?.membership == Membership.JOIN) {
+            // We only display banner for 'live' widgets
+            val activeConf =
+                    state.activeRoomWidgets()?.firstOrNull {
+                        // for now only jitsi?
+                        it.type == WidgetType.Jitsi
+                    }
+
+            if (activeConf == null) {
+                isVisible = false
+            } else {
+                isVisible = true
+                jitsiWidget = activeConf
+            }
+            // if sent by me or if i can moderate?
+            findViewById<TextView>(R.id.deleteWidgetButton).isVisible = state.isAllowedToManageWidgets
+        } else {
+            isVisible = false
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/BottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/core/ui/views/BottomSheetActionButton.kt
rename to vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
index 455e856833..0259898ee3 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/views/BottomSheetActionButton.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.ui.views
+package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
-import android.os.Build
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
@@ -31,9 +30,9 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.themes.ThemeUtils
 
 class BottomSheetActionButton @JvmOverloads constructor(
         context: Context,
@@ -105,13 +104,7 @@ class BottomSheetActionButton @JvmOverloads constructor(
     var tint: Int? = null
         set(value) {
             field = value
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                leftIconImageView.imageTintList = value?.let { ColorStateList.valueOf(value) }
-            } else {
-                leftIcon?.let {
-                    leftIcon = ThemeUtils.tintDrawable(context, it, value ?: ThemeUtils.getColor(context, android.R.attr.textColor))
-                }
-            }
+            leftIconImageView.imageTintList = value?.let { ColorStateList.valueOf(value) }
         }
 
     init {
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/JumpToReadMarkerView.kt b/vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/ui/views/JumpToReadMarkerView.kt
rename to vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt
index b2adde449a..169f24520b 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/views/JumpToReadMarkerView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt
@@ -16,14 +16,14 @@
 
  */
 
-package im.vector.riotx.core.ui.views
+package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.RelativeLayout
 import androidx.core.content.ContextCompat
-import im.vector.riotx.R
+import im.vector.app.R
 import kotlinx.android.synthetic.main.view_jump_to_read_marker.view.*
 
 class JumpToReadMarkerView @JvmOverloads constructor(
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt b/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt
rename to vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt
index 0152f7c2a8..14d9261204 100755
--- a/vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.ui.views
+package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -27,7 +27,7 @@ import androidx.preference.PreferenceManager
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
-import im.vector.riotx.R
+import im.vector.app.R
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/NotificationAreaView.kt b/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/ui/views/NotificationAreaView.kt
rename to vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt
index 653975aea3..828e0ab687 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/views/NotificationAreaView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.ui.views
+package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.graphics.Color
@@ -24,12 +24,12 @@ import android.view.View
 import android.widget.RelativeLayout
 import androidx.core.content.ContextCompat
 import androidx.core.text.italic
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.riotx.R
-import im.vector.riotx.core.error.ResourceLimitErrorFormatter
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.error.ResourceLimitErrorFormatter
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.session.events.model.Event
 import kotlinx.android.synthetic.main.view_notification_area.view.*
 import me.gujun.android.span.span
 import me.saket.bettermovementmethod.BetterLinkMovementMethod
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt
rename to vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
index c0d8d6ad50..65577d18f3 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.ui.views
+package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -24,7 +24,7 @@ import androidx.annotation.IntRange
 import butterknife.BindColor
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotx.R
+import im.vector.app.R
 
 /**
  * A password strength bar custom widget
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/QrCodeImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/ui/views/QrCodeImageView.kt
rename to vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt
index 7cf54ae588..11e319ab78 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/views/QrCodeImageView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.ui.views
+package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.graphics.Color
@@ -22,8 +22,8 @@ import android.graphics.drawable.AnimationDrawable
 import android.graphics.drawable.BitmapDrawable
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
-import im.vector.riotx.core.qrcode.toBitMatrix
-import im.vector.riotx.core.qrcode.toBitmap
+import im.vector.app.core.qrcode.toBitMatrix
+import im.vector.app.core.qrcode.toBitmap
 import kotlin.random.Random
 
 class QrCodeImageView @JvmOverloads constructor(
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/ReadReceiptsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/core/ui/views/ReadReceiptsView.kt
rename to vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
index c5e2fdf375..2ce3396d0c 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/views/ReadReceiptsView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.ui.views
+package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -22,11 +22,11 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.core.view.isVisible
-import im.vector.riotx.R
-import im.vector.riotx.core.glide.GlideApp
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData
-import im.vector.riotx.features.home.room.detail.timeline.item.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
+import im.vector.app.features.home.room.detail.timeline.item.toMatrixItem
 import kotlinx.android.synthetic.main.view_read_receipts.view.*
 
 private const val MAX_RECEIPT_DISPLAYED = 5
@@ -98,7 +98,12 @@ class ReadReceiptsView @JvmOverloads constructor(
                     }
                 else ->
                     if (displayNames.size >= 2) {
-                        context.getString(R.string.two_and_some_others_read, displayNames[0], displayNames[1], (readReceipts.size - 2))
+                        val qty = readReceipts.size - 2
+                        context.resources.getQuantityString(R.plurals.two_and_some_others_read,
+                                qty,
+                                displayNames[0],
+                                displayNames[1],
+                                qty)
                     } else {
                         context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
                     }
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/AssetReader.kt b/vector/src/main/java/im/vector/app/core/utils/AssetReader.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/utils/AssetReader.kt
rename to vector/src/main/java/im/vector/app/core/utils/AssetReader.kt
index 908f0e68b6..41fca42cb3 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/AssetReader.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/AssetReader.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.content.Context
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/DataSource.kt b/vector/src/main/java/im/vector/app/core/utils/DataSource.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/utils/DataSource.kt
rename to vector/src/main/java/im/vector/app/core/utils/DataSource.kt
index 6f6057cb43..8a908ad1d4 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/DataSource.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/DataSource.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.jakewharton.rxrelay2.PublishRelay
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt b/vector/src/main/java/im/vector/app/core/utils/DebouncedClickListener.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt
rename to vector/src/main/java/im/vector/app/core/utils/DebouncedClickListener.kt
index 230b11f14d..8f96a286d9 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/DebouncedClickListener.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.view.View
 import java.util.WeakHashMap
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt b/vector/src/main/java/im/vector/app/core/utils/Debouncer.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt
rename to vector/src/main/java/im/vector/app/core/utils/Debouncer.kt
index 95035f6c96..a5e0005c2a 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Debouncer.kt
@@ -15,7 +15,7 @@
   * limitations under the License.
 
  */
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.os.Handler
 
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/DefaultSubscriber.kt b/vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/utils/DefaultSubscriber.kt
rename to vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt
index 42e04b70f5..99c28becbc 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/DefaultSubscriber.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import io.reactivex.Completable
 import io.reactivex.Single
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt
rename to vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
index 9d73493e74..7b5417c18a 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.content.Context
 import android.webkit.WebView
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/DimensionConverter.kt b/vector/src/main/java/im/vector/app/core/utils/DimensionConverter.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/utils/DimensionConverter.kt
rename to vector/src/main/java/im/vector/app/core/utils/DimensionConverter.kt
index 01cd6a4f8f..d0ed9e5d48 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/DimensionConverter.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/DimensionConverter.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.content.res.Resources
 import android.util.TypedValue
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt
rename to vector/src/main/java/im/vector/app/core/utils/Emoji.kt
index e91a2896bc..b3b9a39f30 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import java.util.regex.Pattern
 
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/EvenBetterLinkMovementMethod.kt b/vector/src/main/java/im/vector/app/core/utils/EvenBetterLinkMovementMethod.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/utils/EvenBetterLinkMovementMethod.kt
rename to vector/src/main/java/im/vector/app/core/utils/EvenBetterLinkMovementMethod.kt
index 1e565c0f4b..b9c1386933 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/EvenBetterLinkMovementMethod.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/EvenBetterLinkMovementMethod.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.text.Spanned
 import android.text.style.ClickableSpan
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt
rename to vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index 9c2d12514a..b314401138 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.app.Activity
 import android.app.DownloadManager
@@ -35,11 +35,12 @@ import androidx.browser.customtabs.CustomTabsIntent
 import androidx.browser.customtabs.CustomTabsSession
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.core.content.getSystemService
 import androidx.fragment.app.Fragment
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.R
-import im.vector.riotx.features.notifications.NotificationUtils
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.features.notifications.NotificationUtils
+import org.matrix.android.sdk.api.extensions.tryThis
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -133,9 +134,7 @@ fun openFileSelection(activity: Activity,
                       allowMultipleSelection: Boolean,
                       requestCode: Int) {
     val fileIntent = Intent(Intent.ACTION_GET_CONTENT)
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-        fileIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, allowMultipleSelection)
-    }
+    fileIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, allowMultipleSelection)
 
     fileIntent.addCategory(Intent.CATEGORY_OPENABLE)
     fileIntent.type = "*/*"
@@ -309,11 +308,23 @@ fun shareMedia(context: Context, file: File, mediaMimeType: String?) {
     }
 }
 
+private fun appendTimeToFilename(name: String): String {
+    val dateExtension = SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(Date())
+    if (!name.contains(".")) return name + "_" + dateExtension
+
+    val filename = name.substringBeforeLast(".")
+    val fileExtension = name.substringAfterLast(".")
+
+    return """${filename}_$dateExtension.$fileExtension"""
+}
+
 fun saveMedia(context: Context, file: File, title: String, mediaMimeType: String?, notificationUtils: NotificationUtils) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        val filename = appendTimeToFilename(title)
+
         val values = ContentValues().apply {
-            put(MediaStore.Images.Media.TITLE, title)
-            put(MediaStore.Images.Media.DISPLAY_NAME, title)
+            put(MediaStore.Images.Media.TITLE, filename)
+            put(MediaStore.Images.Media.DISPLAY_NAME, filename)
             put(MediaStore.Images.Media.MIME_TYPE, mediaMimeType)
             put(MediaStore.Images.Media.DATE_ADDED, System.currentTimeMillis())
             put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis())
@@ -339,7 +350,7 @@ fun saveMedia(context: Context, file: File, title: String, mediaMimeType: String
             }
             notificationUtils.buildDownloadFileNotification(
                     uri,
-                    title,
+                    filename,
                     mediaMimeType ?: "application/octet-stream"
             ).let { notification ->
                 notificationUtils.showNotificationMessage("DL", uri.hashCode(), notification)
@@ -375,7 +386,7 @@ private fun saveMediaLegacy(context: Context, mediaMimeType: String?, title: Str
             }
             val savedFile = saveFileIntoLegacy(file, downloadDir, outputFilename)
             if (savedFile != null) {
-                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as? DownloadManager
+                val downloadManager = context.getSystemService<DownloadManager>()
                 downloadManager?.addCompletedDownload(
                         savedFile.name,
                         title,
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt b/vector/src/main/java/im/vector/app/core/utils/FileUtils.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt
rename to vector/src/main/java/im/vector/app/core/utils/FileUtils.kt
index 839356a129..ab99ba61bd 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/FileUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.content.Context
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/FirstThrottler.kt b/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/utils/FirstThrottler.kt
rename to vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt
index eb66d3aebf..915e955fa6 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/FirstThrottler.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 /**
  * Simple ThrottleFirst
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Handler.kt b/vector/src/main/java/im/vector/app/core/utils/Handler.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/utils/Handler.kt
rename to vector/src/main/java/im/vector/app/core/utils/Handler.kt
index 91a035d24b..c7ec97f53e 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/Handler.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Handler.kt
@@ -16,7 +16,7 @@
 
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.os.Handler
 import android.os.HandlerThread
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/JsonViewerStyler.kt b/vector/src/main/java/im/vector/app/core/utils/JsonViewerStyler.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/core/utils/JsonViewerStyler.kt
rename to vector/src/main/java/im/vector/app/core/utils/JsonViewerStyler.kt
index 94b08b22d6..ab203e2fa0 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/JsonViewerStyler.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/JsonViewerStyler.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.ColorProvider
+import im.vector.app.R
+import im.vector.app.core.resources.ColorProvider
 import org.billcarsonfr.jsonviewer.JSonViewerStyleProvider
 
 fun createJSonViewerStyleProvider(colorProvider: ColorProvider): JSonViewerStyleProvider {
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/KeyboardStateUtils.kt b/vector/src/main/java/im/vector/app/core/utils/KeyboardStateUtils.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/utils/KeyboardStateUtils.kt
rename to vector/src/main/java/im/vector/app/core/utils/KeyboardStateUtils.kt
index c525d588ae..5c6c95c957 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/KeyboardStateUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/KeyboardStateUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.app.Activity
 import android.graphics.Rect
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt b/vector/src/main/java/im/vector/app/core/utils/LiveEvent.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt
rename to vector/src/main/java/im/vector/app/core/utils/LiveEvent.kt
index 78ea4fb8b4..061790cb7a 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/LiveEvent.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import androidx.lifecycle.Observer
 
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt
rename to vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
index 6f081d52de..38c97830ca 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.Manifest
 import android.app.Activity
@@ -27,7 +27,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import im.vector.riotx.R
+import im.vector.app.R
 import timber.log.Timber
 
 private const val LOG_TAG = "PermissionUtils"
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt b/vector/src/main/java/im/vector/app/core/utils/RingtoneUtils.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt
rename to vector/src/main/java/im/vector/app/core/utils/RingtoneUtils.kt
index 5345658207..82b8c3a51a 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/RingtoneUtils.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.content.Context
 import android.media.Ringtone
 import android.media.RingtoneManager
 import android.net.Uri
-import androidx.preference.PreferenceManager
 import androidx.core.content.edit
-import im.vector.riotx.features.settings.VectorPreferences
+import androidx.preference.PreferenceManager
+import im.vector.app.features.settings.VectorPreferences
 
 /**
  * This file manages the sound ringtone for calls.
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/SnapHelperUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/utils/SnapHelperUtils.kt
rename to vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt
index 70831730b4..e039e0bde5 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/SnapHelperUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SnapHelper
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/SpannableUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SpannableUtils.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/utils/SpannableUtils.kt
rename to vector/src/main/java/im/vector/app/core/utils/SpannableUtils.kt
index 6536da73f5..69702fc793 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/SpannableUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SpannableUtils.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.text.Spannable
 import android.text.style.BulletSpan
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt
rename to vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index 900d5565dc..0e722da34a 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.annotation.TargetApi
 import android.app.Activity
@@ -30,9 +30,10 @@ import android.provider.Settings
 import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.getSystemService
 import androidx.fragment.app.Fragment
-import im.vector.riotx.R
-import im.vector.riotx.features.notifications.NotificationUtils
+import im.vector.app.R
+import im.vector.app.features.notifications.NotificationUtils
 
 /**
  * Tells if the application ignores battery optimizations.
@@ -47,7 +48,7 @@ import im.vector.riotx.features.notifications.NotificationUtils
 fun isIgnoringBatteryOptimizations(context: Context): Boolean {
     // no issue before Android M, battery optimisations did not exist
     return Build.VERSION.SDK_INT < Build.VERSION_CODES.M
-            || (context.getSystemService(Context.POWER_SERVICE) as PowerManager?)?.isIgnoringBatteryOptimizations(context.packageName) == true
+            || context.getSystemService<PowerManager>()?.isIgnoringBatteryOptimizations(context.packageName) == true
 }
 
 fun isAirplaneModeOn(context: Context): Boolean {
@@ -84,7 +85,7 @@ fun requestDisablingBatteryOptimization(activity: Activity, fragment: Fragment?,
  * @param text    the text to copy
  */
 fun copyToClipboard(context: Context, text: CharSequence, showToast: Boolean = true, @StringRes toastMessage: Int = R.string.copied_to_clipboard) {
-    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+    val clipboard = context.getSystemService<ClipboardManager>()!!
     clipboard.setPrimaryClip(ClipData.newPlainText("", text))
     if (showToast) {
         context.toast(toastMessage)
@@ -100,15 +101,10 @@ fun startNotificationSettingsIntent(activity: AppCompatActivity, requestCode: In
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
         intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
         intent.putExtra(Settings.EXTRA_APP_PACKAGE, activity.packageName)
-    } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+    } else {
         intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
         intent.putExtra("app_package", activity.packageName)
         intent.putExtra("app_uid", activity.applicationInfo?.uid)
-    } else {
-        intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
-        intent.addCategory(Intent.CATEGORY_DEFAULT)
-        val uri = Uri.fromParts("package", activity.packageName, null)
-        intent.data = uri
     }
     activity.startActivityForResult(intent, requestCode)
 }
@@ -139,11 +135,7 @@ fun startAddGoogleAccountIntent(context: AppCompatActivity, requestCode: Int) {
 fun startSharePlainTextIntent(fragment: Fragment, chooserTitle: String?, text: String, subject: String? = null, requestCode: Int? = null) {
     val share = Intent(Intent.ACTION_SEND)
     share.type = "text/plain"
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        share.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT)
-    } else {
-        share.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
-    }
+    share.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT)
     // Add data to the intent, the receiving app will decide what to do with it.
     share.putExtra(Intent.EXTRA_SUBJECT, subject)
     share.putExtra(Intent.EXTRA_TEXT, text)
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/TemporaryStore.kt b/vector/src/main/java/im/vector/app/core/utils/TemporaryStore.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/utils/TemporaryStore.kt
rename to vector/src/main/java/im/vector/app/core/utils/TemporaryStore.kt
index 8484162bc8..32b995c004 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/TemporaryStore.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/TemporaryStore.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import java.util.Timer
 import java.util.TimerTask
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt b/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt
rename to vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
index 9519eb1f9d..84dd793172 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.content.Context
 import android.os.Build
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/UrlUtils.kt b/vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/core/utils/UrlUtils.kt
rename to vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt
index c26cd85dc7..095e01fa56 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/UrlUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import java.net.URL
 
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/UserColor.kt b/vector/src/main/java/im/vector/app/core/utils/UserColor.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/core/utils/UserColor.kt
rename to vector/src/main/java/im/vector/app/core/utils/UserColor.kt
index 1f8308cd5c..af006a35bb 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/UserColor.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/UserColor.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import androidx.annotation.ColorRes
-import im.vector.riotx.R
+import im.vector.app.R
 import kotlin.math.abs
 
 @ColorRes
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/ViewUtils.kt b/vector/src/main/java/im/vector/app/core/utils/ViewUtils.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/core/utils/ViewUtils.kt
rename to vector/src/main/java/im/vector/app/core/utils/ViewUtils.kt
index 335b9112ef..0e10a35981 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/ViewUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ViewUtils.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import android.text.Editable
 import android.view.ViewGroup
 import androidx.core.view.children
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotx.core.platform.SimpleTextWatcher
+import im.vector.app.core.platform.SimpleTextWatcher
 
 /**
  * Find all TextInputLayout in a ViewGroup and in all its descendants
diff --git a/vector/src/main/java/im/vector/riotx/core/utils/WeakReferenceDelegate.kt b/vector/src/main/java/im/vector/app/core/utils/WeakReferenceDelegate.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/core/utils/WeakReferenceDelegate.kt
rename to vector/src/main/java/im/vector/app/core/utils/WeakReferenceDelegate.kt
index 7e4715590f..849431eb6e 100644
--- a/vector/src/main/java/im/vector/riotx/core/utils/WeakReferenceDelegate.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/WeakReferenceDelegate.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import java.lang.ref.WeakReference
 import kotlin.reflect.KProperty
diff --git a/vector/src/main/java/im/vector/riotx/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/MainActivity.kt
rename to vector/src/main/java/im/vector/app/features/MainActivity.kt
index a5fa8fc4e4..ce81ba12f1 100644
--- a/vector/src/main/java/im/vector/riotx/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features
+package im.vector.app.features
 
 import android.app.Activity
 import android.content.Intent
@@ -22,23 +22,26 @@ import android.os.Bundle
 import android.os.Parcelable
 import androidx.appcompat.app.AlertDialog
 import com.bumptech.glide.Glide
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.failure.GlobalError
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.extensions.startSyncing
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.utils.deleteAllFiles
-import im.vector.riotx.features.home.HomeActivity
-import im.vector.riotx.features.home.ShortcutsHandler
-import im.vector.riotx.features.login.LoginActivity
-import im.vector.riotx.features.notifications.NotificationDrawerManager
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.signout.hard.SignedOutActivity
-import im.vector.riotx.features.signout.soft.SoftLogoutActivity
-import im.vector.riotx.features.ui.UiStateRepository
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.failure.GlobalError
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.startSyncing
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.deleteAllFiles
+import im.vector.app.features.home.HomeActivity
+import im.vector.app.features.home.ShortcutsHandler
+import im.vector.app.features.login.LoginActivity
+import im.vector.app.features.notifications.NotificationDrawerManager
+import im.vector.app.features.pin.PinCodeStore
+import im.vector.app.features.pin.PinLocker
+import im.vector.app.features.pin.UnlockedActivity
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.signout.hard.SignedOutActivity
+import im.vector.app.features.signout.soft.SoftLogoutActivity
+import im.vector.app.features.ui.UiStateRepository
 import kotlinx.android.parcel.Parcelize
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -61,7 +64,7 @@ data class MainActivityArgs(
  * This Activity, when started with argument, is also doing some cleanup when user disconnects,
  * clears cache, is logged out, or is soft logged out
  */
-class MainActivity : VectorBaseActivity() {
+class MainActivity : VectorBaseActivity(), UnlockedActivity {
 
     companion object {
         private const val EXTRA_ARGS = "EXTRA_ARGS"
@@ -84,6 +87,8 @@ class MainActivity : VectorBaseActivity() {
     @Inject lateinit var vectorPreferences: VectorPreferences
     @Inject lateinit var uiStateRepository: UiStateRepository
     @Inject lateinit var shortcutsHandler: ShortcutsHandler
+    @Inject lateinit var pinCodeStore: PinCodeStore
+    @Inject lateinit var pinLocker: PinLocker
 
     override fun injectWith(injector: ScreenComponent) {
         injector.inject(this)
@@ -181,6 +186,8 @@ class MainActivity : VectorBaseActivity() {
             if (clearPreferences) {
                 vectorPreferences.clearPreferences()
                 uiStateRepository.reset()
+                pinLocker.unlock()
+                pinCodeStore.deleteEncodedPin()
             }
             withContext(Dispatchers.IO) {
                 // On BG thread
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/attachments/AttachmentTypeSelectorView.kt
rename to vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
index 0c2d958564..1d6ea7339d 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentTypeSelectorView.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.attachments
+package im.vector.app.features.attachments
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
-import android.annotation.TargetApi
 import android.content.Context
 import android.graphics.drawable.BitmapDrawable
-import android.os.Build
 import android.util.Pair
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -39,13 +37,13 @@ import android.widget.PopupWindow
 import androidx.core.view.doOnNextLayout
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.getMeasurements
-import im.vector.riotx.core.utils.PERMISSIONS_EMPTY
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_PICKING_CONTACT
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_WRITING_FILES
-import im.vector.riotx.features.attachments.AttachmentTypeSelectorView.Callback
+import im.vector.app.R
+import im.vector.app.core.extensions.getMeasurements
+import im.vector.app.core.utils.PERMISSIONS_EMPTY
+import im.vector.app.core.utils.PERMISSIONS_FOR_PICKING_CONTACT
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES
+import im.vector.app.features.attachments.AttachmentTypeSelectorView.Callback
 import kotlin.math.max
 
 private const val ANIMATION_DURATION = 250
@@ -109,25 +107,19 @@ class AttachmentTypeSelectorView(context: Context,
             showAtLocation(anchor, Gravity.NO_GRAVITY, 0, anchorCoordinates[1] - contentViewHeight)
         }
         contentView.doOnNextLayout {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                animateWindowInCircular(anchor, contentView)
-            } else {
-                animateWindowInTranslate(contentView)
-            }
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            animateButtonIn(galleryButton, ANIMATION_DURATION / 2)
-            animateButtonIn(cameraButton, ANIMATION_DURATION / 2)
-            animateButtonIn(fileButton, ANIMATION_DURATION / 4)
-            animateButtonIn(audioButton, ANIMATION_DURATION / 2)
-            animateButtonIn(contactButton, ANIMATION_DURATION / 4)
-            animateButtonIn(stickersButton, 0)
+            animateWindowInCircular(anchor, contentView)
         }
+        animateButtonIn(galleryButton, ANIMATION_DURATION / 2)
+        animateButtonIn(cameraButton, ANIMATION_DURATION / 2)
+        animateButtonIn(fileButton, ANIMATION_DURATION / 4)
+        animateButtonIn(audioButton, ANIMATION_DURATION / 2)
+        animateButtonIn(contactButton, ANIMATION_DURATION / 4)
+        animateButtonIn(stickersButton, 0)
     }
 
     override fun dismiss() {
         val capturedAnchor = anchor
-        if (capturedAnchor != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (capturedAnchor != null) {
             animateWindowOutCircular(capturedAnchor, contentView)
         } else {
             animateWindowOutTranslate(contentView)
@@ -144,7 +136,6 @@ class AttachmentTypeSelectorView(context: Context,
         button.startAnimation(animation)
     }
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private fun animateWindowInCircular(anchor: View, contentView: View) {
         val coordinates = getClickCoordinates(anchor, contentView)
         val animator = ViewAnimationUtils.createCircularReveal(contentView,
@@ -162,7 +153,6 @@ class AttachmentTypeSelectorView(context: Context,
         getContentView().startAnimation(animation)
     }
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private fun animateWindowOutCircular(anchor: View, contentView: View) {
         val coordinates = getClickCoordinates(anchor, contentView)
         val animator = ViewAnimationUtils.createCircularReveal(getContentView(),
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsHelper.kt
rename to vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
index daea538e12..1d7c67b046 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.attachments
+package im.vector.app.features.attachments
 
 import android.app.Activity
 import android.content.Context
@@ -21,10 +21,10 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import im.vector.matrix.android.BuildConfig
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.riotx.core.platform.Restorable
-import im.vector.riotx.multipicker.MultiPicker
+import im.vector.app.core.platform.Restorable
+import im.vector.lib.multipicker.MultiPicker
+import org.matrix.android.sdk.BuildConfig
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import timber.log.Timber
 
 private const val CAPTURE_PATH_KEY = "CAPTURE_PATH_KEY"
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt
rename to vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt
index 02b712b8a7..9c9d8f8017 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.attachments
+package im.vector.app.features.attachments
 
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.riotx.multipicker.entity.MultiPickerAudioType
-import im.vector.riotx.multipicker.entity.MultiPickerBaseType
-import im.vector.riotx.multipicker.entity.MultiPickerContactType
-import im.vector.riotx.multipicker.entity.MultiPickerFileType
-import im.vector.riotx.multipicker.entity.MultiPickerImageType
-import im.vector.riotx.multipicker.entity.MultiPickerVideoType
+import im.vector.lib.multipicker.entity.MultiPickerAudioType
+import im.vector.lib.multipicker.entity.MultiPickerBaseType
+import im.vector.lib.multipicker.entity.MultiPickerContactType
+import im.vector.lib.multipicker.entity.MultiPickerFileType
+import im.vector.lib.multipicker.entity.MultiPickerImageType
+import im.vector.lib.multipicker.entity.MultiPickerVideoType
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import timber.log.Timber
 
 fun MultiPickerContactType.toContactAttachment(): ContactAttachment {
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/ContactAttachment.kt b/vector/src/main/java/im/vector/app/features/attachments/ContactAttachment.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/attachments/ContactAttachment.kt
rename to vector/src/main/java/im/vector/app/features/attachments/ContactAttachment.kt
index 80acefdcf2..0459bd5c37 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/ContactAttachment.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/ContactAttachment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.attachments
+package im.vector.app.features.attachments
 
 /**
  * Data class holding values of a picked contact
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/ContentAttachmentData.kt b/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/attachments/ContentAttachmentData.kt
rename to vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
index 8fb717f96e..b2e46b1abf 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/ContentAttachmentData.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.attachments
+package im.vector.app.features.attachments
 
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 
 fun ContentAttachmentData.isPreviewable(): Boolean {
     return type == ContentAttachmentData.Type.IMAGE || type == ContentAttachmentData.Type.VIDEO
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewControllers.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewControllers.kt
rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt
index 60ee722116..e20188c80f 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewControllers.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.attachments.preview
+package im.vector.app.features.attachments.preview
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import javax.inject.Inject
 
 class AttachmentBigPreviewController @Inject constructor() : TypedEpoxyController<AttachmentsPreviewViewState>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewItems.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewItems.kt
rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt
index 7a3d022cf3..066f69b555 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewItems.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.attachments.preview
+package im.vector.app.features.attachments.preview
 
 import android.view.View
 import android.widget.ImageView
@@ -22,11 +22,11 @@ import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.platform.CheckableImageView
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.platform.CheckableImageView
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 
 abstract class AttachmentPreviewItem<H : AttachmentPreviewItem.Holder> : VectorEpoxyModel<H>() {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewAction.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewAction.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewAction.kt
rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewAction.kt
index aef724331f..16f6fe2b97 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewAction.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewAction.kt
@@ -15,10 +15,10 @@
  *
  */
 
-package im.vector.riotx.features.attachments.preview
+package im.vector.app.features.attachments.preview
 
 import android.net.Uri
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class AttachmentsPreviewAction : VectorViewModelAction {
     object RemoveCurrentAttachment : AttachmentsPreviewAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewActivity.kt
rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
index 21febd81a9..bfa44a7a70 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
@@ -15,17 +15,17 @@
  *
  */
 
-package im.vector.riotx.features.attachments.preview
+package im.vector.app.features.attachments.preview
 
 import android.content.Context
 import android.content.Intent
 import androidx.appcompat.widget.Toolbar
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.themes.ActivityOtherThemes
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.themes.ActivityOtherThemes
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 
 class AttachmentsPreviewActivity : VectorBaseActivity(), ToolbarConfigurable {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt
rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
index 59629743b5..a822c49e9b 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.features.attachments.preview
+package im.vector.app.features.attachments.preview
 
 import android.app.Activity.RESULT_CANCELED
 import android.app.Activity.RESULT_OK
@@ -37,20 +37,20 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.yalantis.ucrop.UCrop
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.OnSnapPositionChangeListener
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_WRITING_FILES
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_PREVIEW_FRAGMENT
-import im.vector.riotx.core.utils.SnapOnScrollListener
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.attachSnapHelperWithListener
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.features.media.createUCropWithDefaultSettings
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.OnSnapPositionChangeListener
+import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_PREVIEW_FRAGMENT
+import im.vector.app.core.utils.SnapOnScrollListener
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.attachSnapHelperWithListener
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.features.media.createUCropWithDefaultSettings
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_attachments_preview.*
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewEvents.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewEvents.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewEvents.kt
index 12a9d9aa24..0f2a82bdf6 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewEvents.kt
@@ -15,8 +15,8 @@
  *
  */
 
-package im.vector.riotx.features.attachments.preview
+package im.vector.app.features.attachments.preview
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class AttachmentsPreviewViewEvents : VectorViewEvents
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewModel.kt
rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt
index d1e44fa963..59a0937d89 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt
@@ -15,15 +15,15 @@
  *
  */
 
-package im.vector.riotx.features.attachments.preview
+package im.vector.app.features.attachments.preview
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
 
 class AttachmentsPreviewViewModel @AssistedInject constructor(@Assisted initialState: AttachmentsPreviewViewState)
     : VectorViewModel<AttachmentsPreviewViewState, AttachmentsPreviewAction, AttachmentsPreviewViewEvents>(initialState) {
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewState.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewState.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewState.kt
rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewState.kt
index 50214fd9d7..cee2a7ddd7 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewState.kt
@@ -15,10 +15,10 @@
  *
  */
 
-package im.vector.riotx.features.attachments.preview
+package im.vector.app.features.attachments.preview
 
 import com.airbnb.mvrx.MvRxState
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 
 data class AttachmentsPreviewViewState(
         val attachments: List<ContentAttachmentData>,
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/Extensions.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/Extensions.kt
rename to vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt
index 40fcc0aa92..bd06f8cf0b 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/Extensions.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.attachments.preview
+package im.vector.app.features.attachments.preview
 
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 
 /**
  * All images are editable, expect Gif
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt b/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteClickListener.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteClickListener.kt
index 96216d5e5e..50896c5f34 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteClickListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete
+package im.vector.app.features.autocomplete
 
 /**
  * Simple generic listener interface
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteMatrixItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteMatrixItem.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteMatrixItem.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteMatrixItem.kt
index fbfffc7652..28ea5234a7 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteMatrixItem.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteMatrixItem.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete
+package im.vector.app.features.autocomplete
 
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_autocomplete_matrix_item)
 abstract class AutocompleteMatrixItem : VectorEpoxyModel<AutocompleteMatrixItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/RecyclerViewPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/RecyclerViewPresenter.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt
index 1e24a904d9..e7ece3bb9e 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/RecyclerViewPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.autocomplete
+package im.vector.app.features.autocomplete
 
 import android.content.Context
 import android.database.DataSetObserver
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt
index a6e861d9f6..a5eecf24ba 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.command
+package im.vector.app.features.autocomplete.command
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.autocomplete.AutocompleteClickListener
-import im.vector.riotx.features.command.Command
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.command.Command
 import javax.inject.Inject
 
 class AutocompleteCommandController @Inject constructor(private val stringProvider: StringProvider) : TypedEpoxyController<List<Command>>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandItem.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandItem.kt
index eaac9c6c5c..257a2abd6c 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.command
+package im.vector.app.features.autocomplete.command
 
 import android.view.View
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass(layout = R.layout.item_autocomplete_command)
 abstract class AutocompleteCommandItem : VectorEpoxyModel<AutocompleteCommandItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
index caadb3cc91..d121c68557 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.command
+package im.vector.app.features.autocomplete.command
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.riotx.features.autocomplete.AutocompleteClickListener
-import im.vector.riotx.features.autocomplete.RecyclerViewPresenter
-import im.vector.riotx.features.command.Command
+import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.autocomplete.RecyclerViewPresenter
+import im.vector.app.features.command.Command
 import javax.inject.Inject
 
 class AutocompleteCommandPresenter @Inject constructor(context: Context,
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/CommandAutocompletePolicy.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/command/CommandAutocompletePolicy.kt
index 656bcd4beb..8112fa7866 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/CommandAutocompletePolicy.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.command
+package im.vector.app.features.autocomplete.command
 
 import android.text.Spannable
 import com.otaliastudios.autocomplete.AutocompletePolicy
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiController.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt
index 6d498de2d2..2f99a64221 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiController.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.emoji
+package im.vector.app.features.autocomplete.emoji
 
 import android.graphics.Typeface
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.riotx.EmojiCompatFontProvider
-import im.vector.riotx.features.autocomplete.AutocompleteClickListener
-import im.vector.riotx.features.reactions.ReactionClickListener
-import im.vector.riotx.features.reactions.data.EmojiItem
+import im.vector.app.EmojiCompatFontProvider
+import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.reactions.ReactionClickListener
+import im.vector.app.features.reactions.data.EmojiItem
 import javax.inject.Inject
 
 class AutocompleteEmojiController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiItem.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiItem.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiItem.kt
index 76573929cc..5a6e73da6a 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiItem.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiItem.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.emoji
+package im.vector.app.features.autocomplete.emoji
 
 import android.graphics.Typeface
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.reactions.ReactionClickListener
-import im.vector.riotx.features.reactions.data.EmojiItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.reactions.ReactionClickListener
+import im.vector.app.features.reactions.data.EmojiItem
 
 @EpoxyModelClass(layout = R.layout.item_autocomplete_emoji)
 abstract class AutocompleteEmojiItem : VectorEpoxyModel<AutocompleteEmojiItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
index 5f7622a4f3..bf180746de 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.emoji
+package im.vector.app.features.autocomplete.emoji
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.riotx.features.autocomplete.AutocompleteClickListener
-import im.vector.riotx.features.autocomplete.RecyclerViewPresenter
-import im.vector.riotx.features.reactions.data.EmojiDataSource
+import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.autocomplete.RecyclerViewPresenter
+import im.vector.app.features.reactions.data.EmojiDataSource
 import javax.inject.Inject
 
 class AutocompleteEmojiPresenter @Inject constructor(context: Context,
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteMoreResultItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteMoreResultItem.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteMoreResultItem.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteMoreResultItem.kt
index 844cc96035..6925b15c9a 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteMoreResultItem.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteMoreResultItem.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.emoji
+package im.vector.app.features.autocomplete.emoji
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass(layout = R.layout.item_autocomplete_more_result)
 abstract class AutocompleteMoreResultItem : VectorEpoxyModel<AutocompleteMoreResultItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt
similarity index 79%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupController.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt
index 5d0d43d9ea..ee0473cd3d 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupController.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.group
+package im.vector.app.features.autocomplete.group
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.features.autocomplete.AutocompleteClickListener
-import im.vector.riotx.features.autocomplete.autocompleteMatrixItem
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.autocomplete.autocompleteMatrixItem
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class AutocompleteGroupController @Inject constructor() : TypedEpoxyController<List<GroupSummary>>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt
similarity index 80%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupPresenter.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt
index 3c63dc65d4..a3c276c977 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.group
+package im.vector.app.features.autocomplete.group
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.group.groupSummaryQueryParams
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.riotx.features.autocomplete.AutocompleteClickListener
-import im.vector.riotx.features.autocomplete.RecyclerViewPresenter
+import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.autocomplete.RecyclerViewPresenter
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.group.groupSummaryQueryParams
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import javax.inject.Inject
 
 class AutocompleteGroupPresenter @Inject constructor(context: Context,
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt
similarity index 78%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberController.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt
index 8102a5a45f..9a90506141 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberController.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.member
+package im.vector.app.features.autocomplete.member
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.features.autocomplete.AutocompleteClickListener
-import im.vector.riotx.features.autocomplete.autocompleteMatrixItem
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.autocomplete.autocompleteMatrixItem
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class AutocompleteMemberController @Inject constructor() : TypedEpoxyController<List<RoomMemberSummary>>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberPresenter.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
index 77333b3d48..de8003b28b 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.member
+package im.vector.app.features.autocomplete.member
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.members.roomMemberQueryParams
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.riotx.features.autocomplete.AutocompleteClickListener
-import im.vector.riotx.features.autocomplete.RecyclerViewPresenter
+import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.autocomplete.RecyclerViewPresenter
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 
 class AutocompleteMemberPresenter @AssistedInject constructor(context: Context,
                                                               @Assisted val roomId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt
similarity index 79%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomController.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt
index aae95502d9..324fb01e57 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomController.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.room
+package im.vector.app.features.autocomplete.room
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.features.autocomplete.AutocompleteClickListener
-import im.vector.riotx.features.autocomplete.autocompleteMatrixItem
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.autocomplete.autocompleteMatrixItem
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class AutocompleteRoomController @Inject constructor(private val avatarRenderer: AvatarRenderer) : TypedEpoxyController<List<RoomSummary>>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomPresenter.kt
rename to vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt
index c845decdf9..99f0af7184 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.autocomplete.room
+package im.vector.app.features.autocomplete.room
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.roomSummaryQueryParams
-import im.vector.riotx.features.autocomplete.AutocompleteClickListener
-import im.vector.riotx.features.autocomplete.RecyclerViewPresenter
+import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.autocomplete.RecyclerViewPresenter
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import javax.inject.Inject
 
 class AutocompleteRoomPresenter @Inject constructor(context: Context,
diff --git a/vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt b/vector/src/main/java/im/vector/app/features/badge/BadgeProxy.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt
rename to vector/src/main/java/im/vector/app/features/badge/BadgeProxy.kt
index 2da90b9c6d..96e09f6063 100644
--- a/vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt
+++ b/vector/src/main/java/im/vector/app/features/badge/BadgeProxy.kt
@@ -16,11 +16,11 @@
 
 @file:Suppress("UNUSED_PARAMETER")
 
-package im.vector.riotx.features.badge
+package im.vector.app.features.badge
 
 import android.content.Context
 import android.os.Build
-import im.vector.matrix.android.api.session.Session
+import org.matrix.android.sdk.api.session.Session
 import me.leolin.shortcutbadger.ShortcutBadger
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/call/CallAudioManager.kt b/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/call/CallAudioManager.kt
rename to vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt
index b25a11b5b3..fde562ee63 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/CallAudioManager.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothManager
@@ -22,8 +22,9 @@ import android.bluetooth.BluetoothProfile
 import android.content.Context
 import android.content.pm.PackageManager
 import android.media.AudioManager
-import im.vector.matrix.android.api.session.call.MxCall
-import im.vector.riotx.core.services.WiredHeadsetStateReceiver
+import androidx.core.content.getSystemService
+import im.vector.app.core.services.WiredHeadsetStateReceiver
+import org.matrix.android.sdk.api.session.call.MxCall
 import timber.log.Timber
 import java.util.concurrent.Executors
 
@@ -55,9 +56,9 @@ class CallAudioManager(
 
     init {
         executor.execute {
-            audioManager = applicationContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+            audioManager = applicationContext.getSystemService()
         }
-        val bm = applicationContext.getSystemService(Context.BLUETOOTH_SERVICE) as? BluetoothManager
+        val bm = applicationContext.getSystemService<BluetoothManager>()
         val adapter = bm?.adapter
         Timber.d("## VOIP Bluetooth adapter $adapter")
         bluetoothAdapter = adapter
diff --git a/vector/src/main/java/im/vector/riotx/features/call/CallControlsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/call/CallControlsBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt
index cf506a031f..b1a2c65ecf 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/CallControlsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 import android.os.Bundle
 import android.view.View
@@ -22,8 +22,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.activityViewModel
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import kotlinx.android.synthetic.main.bottom_sheet_call_controls.*
 import me.gujun.android.span.span
 
diff --git a/vector/src/main/java/im/vector/riotx/features/call/CallControlsView.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/call/CallControlsView.kt
rename to vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
index e3b9f12f67..27b3310923 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/CallControlsView.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 import android.content.Context
 import android.util.AttributeSet
@@ -26,8 +26,8 @@ import androidx.core.view.isVisible
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
-import im.vector.matrix.android.api.session.call.CallState
-import im.vector.riotx.R
+import im.vector.app.R
+import org.matrix.android.sdk.api.session.call.CallState
 import kotlinx.android.synthetic.main.view_call_controls.view.*
 import org.webrtc.PeerConnection
 
diff --git a/vector/src/main/java/im/vector/riotx/features/call/CameraEventsHandlerAdapter.kt b/vector/src/main/java/im/vector/app/features/call/CameraEventsHandlerAdapter.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/call/CameraEventsHandlerAdapter.kt
rename to vector/src/main/java/im/vector/app/features/call/CameraEventsHandlerAdapter.kt
index 48f4b9b27b..5307ca6a1d 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/CameraEventsHandlerAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CameraEventsHandlerAdapter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 import org.webrtc.CameraVideoCapturer
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/features/call/Cameras.kt b/vector/src/main/java/im/vector/app/features/call/Cameras.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/call/Cameras.kt
rename to vector/src/main/java/im/vector/app/features/call/Cameras.kt
index 07d563ca9c..a778ba4dfe 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/Cameras.kt
+++ b/vector/src/main/java/im/vector/app/features/call/Cameras.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 enum class CameraType {
     FRONT,
diff --git a/vector/src/main/java/im/vector/riotx/features/call/PeerConnectionObserverAdapter.kt b/vector/src/main/java/im/vector/app/features/call/PeerConnectionObserverAdapter.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/features/call/PeerConnectionObserverAdapter.kt
rename to vector/src/main/java/im/vector/app/features/call/PeerConnectionObserverAdapter.kt
index ffc90d47fa..32e30c5345 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/PeerConnectionObserverAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/call/PeerConnectionObserverAdapter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 import org.webrtc.DataChannel
 import org.webrtc.IceCandidate
diff --git a/vector/src/main/java/im/vector/riotx/features/call/SdpObserverAdapter.kt b/vector/src/main/java/im/vector/app/features/call/SdpObserverAdapter.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/call/SdpObserverAdapter.kt
rename to vector/src/main/java/im/vector/app/features/call/SdpObserverAdapter.kt
index 4c9964a4c4..f6ce430366 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/SdpObserverAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/call/SdpObserverAdapter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 import org.webrtc.SdpObserver
 import org.webrtc.SessionDescription
diff --git a/vector/src/main/java/im/vector/riotx/features/call/SharedActiveCallViewModel.kt b/vector/src/main/java/im/vector/app/features/call/SharedActiveCallViewModel.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/call/SharedActiveCallViewModel.kt
rename to vector/src/main/java/im/vector/app/features/call/SharedActiveCallViewModel.kt
index 71f5ad3877..f2414f0a22 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/SharedActiveCallViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/SharedActiveCallViewModel.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import im.vector.matrix.android.api.session.call.MxCall
+import org.matrix.android.sdk.api.session.call.MxCall
 import javax.inject.Inject
 
 class SharedActiveCallViewModel @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/call/VectorCallActivity.kt
rename to vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
index bbfd8b20fc..4d6c4e3add 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/VectorCallActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 import android.app.KeyguardManager
 import android.content.Context
@@ -23,11 +23,11 @@ import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
-import android.view.KeyEvent
 import android.view.View
 import android.view.Window
 import android.view.WindowManager
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.getSystemService
 import androidx.core.view.ViewCompat
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
@@ -37,21 +37,21 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
 import com.jakewharton.rxbinding3.view.clicks
-import im.vector.matrix.android.api.session.call.CallState
-import im.vector.matrix.android.api.session.call.EglUtils
-import im.vector.matrix.android.api.session.call.MxCallDetail
-import im.vector.matrix.android.api.session.call.TurnServerResponse
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.services.CallService
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.RoomDetailActivity
-import im.vector.riotx.features.home.room.detail.RoomDetailArgs
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.services.CallService
+import im.vector.app.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL
+import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.RoomDetailActivity
+import im.vector.app.features.home.room.detail.RoomDetailArgs
+import org.matrix.android.sdk.api.session.call.CallState
+import org.matrix.android.sdk.api.session.call.EglUtils
+import org.matrix.android.sdk.api.session.call.MxCallDetail
+import org.matrix.android.sdk.api.session.call.TurnServerResponse
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.activity_call.*
@@ -333,20 +333,6 @@ class VectorCallActivity : VectorBaseActivity(), CallControlsView.InteractionLis
         surfaceRenderersAreInitialized = true
     }
 
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            // for newer version, it will be passed automatically to active media session
-            // in call service
-            when (keyCode) {
-                KeyEvent.KEYCODE_HEADSETHOOK -> {
-                    callViewModel.handle(VectorCallViewActions.HeadSetButtonPressed)
-                    return true
-                }
-            }
-        }
-        return super.onKeyDown(keyCode, event)
-    }
-
     private fun handleViewEvents(event: VectorCallViewEvents?) {
         Timber.v("## VOIP handleViewEvents $event")
         when (event) {
@@ -458,7 +444,7 @@ class VectorCallActivity : VectorBaseActivity(), CallControlsView.InteractionLis
             )
         }
 
-        with(getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager) {
+        with(getSystemService<KeyguardManager>()!!) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 requestDismissKeyguard(this@VectorCallActivity, null)
             }
diff --git a/vector/src/main/java/im/vector/riotx/features/call/VectorCallViewModel.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/call/VectorCallViewModel.kt
rename to vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
index 595aa41292..8ad1b1a267 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/VectorCallViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
@@ -26,17 +26,17 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.call.CallState
-import im.vector.matrix.android.api.session.call.MxCall
-import im.vector.matrix.android.api.session.call.TurnServerResponse
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.call.CallState
+import org.matrix.android.sdk.api.session.call.MxCall
+import org.matrix.android.sdk.api.session.call.TurnServerResponse
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
 import org.webrtc.PeerConnection
 import java.util.Timer
 import java.util.TimerTask
diff --git a/vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt b/vector/src/main/java/im/vector/app/features/call/WebRtcPeerConnectionManager.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt
rename to vector/src/main/java/im/vector/app/features/call/WebRtcPeerConnectionManager.kt
index 070375d201..bb6312a8ce 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt
+++ b/vector/src/main/java/im/vector/app/features/call/WebRtcPeerConnectionManager.kt
@@ -14,28 +14,27 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call
+package im.vector.app.features.call
 
 import android.content.Context
 import android.hardware.camera2.CameraManager
-import android.os.Build
-import androidx.annotation.RequiresApi
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.call.CallState
-import im.vector.matrix.android.api.session.call.CallsListener
-import im.vector.matrix.android.api.session.call.EglUtils
-import im.vector.matrix.android.api.session.call.MxCall
-import im.vector.matrix.android.api.session.call.TurnServerResponse
-import im.vector.matrix.android.api.session.room.model.call.CallAnswerContent
-import im.vector.matrix.android.api.session.room.model.call.CallCandidatesContent
-import im.vector.matrix.android.api.session.room.model.call.CallHangupContent
-import im.vector.matrix.android.api.session.room.model.call.CallInviteContent
-import im.vector.riotx.ActiveSessionDataSource
-import im.vector.riotx.core.services.BluetoothHeadsetReceiver
-import im.vector.riotx.core.services.CallService
-import im.vector.riotx.core.services.WiredHeadsetStateReceiver
+import androidx.core.content.getSystemService
+import im.vector.app.ActiveSessionDataSource
+import im.vector.app.core.services.BluetoothHeadsetReceiver
+import im.vector.app.core.services.CallService
+import im.vector.app.core.services.WiredHeadsetStateReceiver
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.call.CallState
+import org.matrix.android.sdk.api.session.call.CallsListener
+import org.matrix.android.sdk.api.session.call.EglUtils
+import org.matrix.android.sdk.api.session.call.MxCall
+import org.matrix.android.sdk.api.session.call.TurnServerResponse
+import org.matrix.android.sdk.api.session.room.model.call.CallAnswerContent
+import org.matrix.android.sdk.api.session.room.model.call.CallCandidatesContent
+import org.matrix.android.sdk.api.session.room.model.call.CallHangupContent
+import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
 import io.reactivex.disposables.Disposable
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.ReplaySubject
@@ -362,11 +361,6 @@ class WebRtcPeerConnectionManager @Inject constructor(
                     }
                 }
                 else                                -> {
-                    // Fallback for old android, try to restart capture when attached
-                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP && capturerIsInError && call.mxCall.isVideoCall) {
-                        // try to restart capture?
-                        videoCapturer?.startCapture(currentCaptureMode.width, currentCaptureMode.height, currentCaptureMode.fps)
-                    }
                     // sink existing tracks (configuration change, e.g screen rotation)
                     attachViewRenderersInternal()
                 }
@@ -477,12 +471,10 @@ class WebRtcPeerConnectionManager @Inject constructor(
                         // We then register in order to restart capture as soon as the camera is available again
                         Timber.v("## VOIP onCameraClosed")
                         this@WebRtcPeerConnectionManager.capturerIsInError = true
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                            val restarter = CameraRestarter(cameraInUse?.name ?: "", callContext.mxCall.callId)
-                            callContext.cameraAvailabilityCallback = restarter
-                            val cameraManager = context.getSystemService(Context.CAMERA_SERVICE) as CameraManager
-                            cameraManager.registerAvailabilityCallback(restarter, null)
-                        }
+                        val restarter = CameraRestarter(cameraInUse?.name ?: "", callContext.mxCall.callId)
+                        callContext.cameraAvailabilityCallback = restarter
+                        val cameraManager = context.getSystemService<CameraManager>()!!
+                        cameraManager.registerAvailabilityCallback(restarter, null)
                     }
                 })
 
@@ -791,10 +783,8 @@ class WebRtcPeerConnectionManager @Inject constructor(
         currentCall?.localVideoTrack?.setEnabled(false)
 
         currentCall?.cameraAvailabilityCallback?.let { cameraAvailabilityCallback ->
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                val cameraManager = context.getSystemService(Context.CAMERA_SERVICE) as CameraManager
-                cameraManager.unregisterAvailabilityCallback(cameraAvailabilityCallback)
-            }
+            val cameraManager = context.getSystemService<CameraManager>()!!
+            cameraManager.unregisterAvailabilityCallback(cameraAvailabilityCallback)
         }
 
         if (originatedByMe) {
@@ -1040,7 +1030,6 @@ class WebRtcPeerConnectionManager @Inject constructor(
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     inner class CameraRestarter(val cameraId: String, val callId: String) : CameraManager.AvailabilityCallback() {
 
         override fun onCameraAvailable(cameraId: String) {
@@ -1048,8 +1037,7 @@ class WebRtcPeerConnectionManager @Inject constructor(
                 // re-start the capture
                 // TODO notify that video is enabled
                 videoCapturer?.startCapture(currentCaptureMode.width, currentCaptureMode.height, currentCaptureMode.fps)
-                (context.getSystemService(Context.CAMERA_SERVICE) as? CameraManager)
-                        ?.unregisterAvailabilityCallback(this)
+                context.getSystemService<CameraManager>()?.unregisterAvailabilityCallback(this)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt
new file mode 100644
index 0000000000..6554e50d63
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.call.conference
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class JitsiCallViewActions : VectorViewModelAction
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt
new file mode 100644
index 0000000000..319322daba
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.call.conference
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class JitsiCallViewEvents : VectorViewEvents
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
new file mode 100644
index 0000000000..cf4d1417e3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.call.conference
+
+import android.net.Uri
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.ViewModelContext
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import org.jitsi.meet.sdk.JitsiMeetUserInfo
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.rx.asObservable
+import java.net.URL
+
+class JitsiCallViewModel @AssistedInject constructor(
+        @Assisted initialState: JitsiCallViewState,
+        @Assisted val args: VectorJitsiActivity.Args,
+        private val session: Session,
+        private val stringProvider: StringProvider
+) : VectorViewModel<JitsiCallViewState, JitsiCallViewActions, JitsiCallViewEvents>(initialState) {
+
+    @AssistedInject.Factory
+    interface Factory {
+        fun create(initialState: JitsiCallViewState, args: VectorJitsiActivity.Args): JitsiCallViewModel
+    }
+
+    init {
+        val me = session.getUser(session.myUserId)?.toMatrixItem()
+        val userInfo = JitsiMeetUserInfo().apply {
+            displayName = me?.getBestName()
+            avatar = me?.avatarUrl?.let { session.contentUrlResolver().resolveFullSize(it) }?.let { URL(it) }
+        }
+        val roomName = session.getRoomSummary(args.roomId)?.displayName
+
+        setState {
+            copy(userInfo = userInfo)
+        }
+
+        session.widgetService().getRoomWidgetsLive(args.roomId, QueryStringValue.Equals(args.widgetId), WidgetType.Jitsi.values())
+                .asObservable()
+                .distinctUntilChanged()
+                .subscribe {
+                    val jitsiWidget = it.firstOrNull()
+                    if (jitsiWidget != null) {
+                        val uri = Uri.parse(jitsiWidget.computedUrl)
+                        val confId = uri.getQueryParameter("confId")
+                        val ppt = jitsiWidget.computedUrl?.let { url -> JitsiWidgetProperties(url, stringProvider) }
+                        setState {
+                            copy(
+                                    widget = Success(jitsiWidget),
+                                    jitsiUrl = "https://${ppt?.domain}",
+                                    confId = confId ?: "",
+                                    subject = roomName ?: ""
+                            )
+                        }
+                    } else {
+                        setState {
+                            copy(
+                                    widget = Fail(IllegalArgumentException("Widget not found"))
+                            )
+                        }
+                    }
+                }
+                .disposeOnClear()
+    }
+
+    override fun handle(action: JitsiCallViewActions) {
+    }
+
+    companion object : MvRxViewModelFactory<JitsiCallViewModel, JitsiCallViewState> {
+
+        const val ENABLE_VIDEO_OPTION = "ENABLE_VIDEO_OPTION"
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: JitsiCallViewState): JitsiCallViewModel? {
+            val callActivity: VectorJitsiActivity = viewModelContext.activity()
+            val callArgs: VectorJitsiActivity.Args = viewModelContext.args()
+            return callActivity.viewModelFactory.create(state, callArgs)
+        }
+
+        override fun initialState(viewModelContext: ViewModelContext): JitsiCallViewState? {
+            val args: VectorJitsiActivity.Args = viewModelContext.args()
+
+            return JitsiCallViewState(
+                    roomId = args.roomId,
+                    widgetId = args.widgetId,
+                    enableVideo = args.enableVideo
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt
new file mode 100644
index 0000000000..72b87e7f1b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.call.conference
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.jitsi.meet.sdk.JitsiMeetUserInfo
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+
+data class JitsiCallViewState(
+        val roomId: String = "",
+        val widgetId: String = "",
+        val enableVideo: Boolean = true,
+        val jitsiUrl: String = "",
+        val subject: String = "",
+        val confId: String = "",
+        val userInfo: JitsiMeetUserInfo = JitsiMeetUserInfo(),
+        val widget: Async<Widget> = Uninitialized
+) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt
new file mode 100644
index 0000000000..e4bc0ab63d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.call.conference
+
+import android.net.Uri
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+
+class JitsiWidgetProperties(private val uriString: String, val stringProvider: StringProvider) {
+    val domain: String by lazy { configs["conferenceDomain"] ?: stringProvider.getString(R.string.preferred_jitsi_domain) }
+    val displayName: String? by lazy { configs["displayName"] }
+    val avatarUrl: String? by lazy { configs["avatarUrl"] }
+
+    private val configString: String? by lazy { Uri.parse(uriString).fragment }
+
+    private val configs: Map<String, String?> by lazy {
+        configString?.split("&")
+                ?.map { it.split("=") }
+                ?.map { (key, value) -> key to value }
+                ?.toMap()
+                ?: mapOf()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
new file mode 100644
index 0000000000..e26cb23ac7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.call.conference
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.View
+import android.widget.FrameLayout
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.MvRx
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.viewModel
+import com.facebook.react.modules.core.PermissionListener
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.platform.VectorBaseActivity
+import kotlinx.android.parcel.Parcelize
+import kotlinx.android.synthetic.main.activity_jitsi.*
+import org.jitsi.meet.sdk.JitsiMeetActivityDelegate
+import org.jitsi.meet.sdk.JitsiMeetActivityInterface
+import org.jitsi.meet.sdk.JitsiMeetConferenceOptions
+import org.jitsi.meet.sdk.JitsiMeetView
+import org.jitsi.meet.sdk.JitsiMeetViewListener
+import org.matrix.android.sdk.api.extensions.tryThis
+import java.net.URL
+import javax.inject.Inject
+
+class VectorJitsiActivity : VectorBaseActivity(), JitsiMeetActivityInterface, JitsiMeetViewListener {
+
+    @Parcelize
+    data class Args(
+            val roomId: String,
+            val widgetId: String,
+            val enableVideo: Boolean
+    ) : Parcelable
+
+    override fun getLayoutRes() = R.layout.activity_jitsi
+
+    @Inject lateinit var viewModelFactory: JitsiCallViewModel.Factory
+
+    private var jitsiMeetView: JitsiMeetView? = null
+
+    private val jitsiViewModel: JitsiCallViewModel by viewModel()
+
+    override fun injectWith(injector: ScreenComponent) {
+        super.injectWith(injector)
+        injector.inject(this)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        jitsiViewModel.subscribe(this) {
+            renderState(it)
+        }
+    }
+
+    override fun initUiAndData() {
+        super.initUiAndData()
+        jitsiMeetView = JitsiMeetView(this)
+        val params = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
+        jitsi_layout.addView(jitsiMeetView, params)
+        jitsiMeetView?.listener = this
+    }
+
+    private fun renderState(viewState: JitsiCallViewState) {
+        when (viewState.widget) {
+            is Fail    -> finish()
+            is Success -> {
+                findViewById<View>(R.id.jitsi_progress_layout).isVisible = false
+                jitsiMeetView?.isVisible = true
+                configureJitsiView(viewState)
+            }
+            else       -> {
+                jitsiMeetView?.isVisible = false
+                findViewById<View>(R.id.jitsi_progress_layout).isVisible = true
+            }
+        }
+    }
+
+    private fun configureJitsiView(viewState: JitsiCallViewState) {
+        val jitsiMeetConferenceOptions = JitsiMeetConferenceOptions.Builder()
+                .setVideoMuted(!viewState.enableVideo)
+                .setUserInfo(viewState.userInfo)
+                .apply {
+                    tryThis { URL(viewState.jitsiUrl) }?.let {
+                        setServerURL(it)
+                    }
+                }
+                // https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/flags/constants.js
+                .setFeatureFlag("chat.enabled", false)
+                .setFeatureFlag("invite.enabled", false)
+                .setFeatureFlag("add-people.enabled", false)
+                .setFeatureFlag("video-share.enabled", false)
+                .setRoom(viewState.confId)
+                .setSubject(viewState.subject)
+                .build()
+        jitsiMeetView?.join(jitsiMeetConferenceOptions)
+    }
+
+    override fun onPause() {
+        JitsiMeetActivityDelegate.onHostPause(this)
+        super.onPause()
+    }
+
+    override fun onResume() {
+        JitsiMeetActivityDelegate.onHostResume(this)
+        super.onResume()
+    }
+
+    override fun onBackPressed() {
+        JitsiMeetActivityDelegate.onBackPressed()
+        super.onBackPressed()
+    }
+
+    override fun onDestroy() {
+        JitsiMeetActivityDelegate.onHostDestroy(this)
+        super.onDestroy()
+    }
+
+//    override fun onUserLeaveHint() {
+//        super.onUserLeaveHint()
+//        jitsiMeetView?.enterPictureInPicture()
+//    }
+
+    override fun onNewIntent(intent: Intent?) {
+        JitsiMeetActivityDelegate.onNewIntent(intent)
+        super.onNewIntent(intent)
+    }
+
+    override fun requestPermissions(permissions: Array<out String>?, requestCode: Int, listener: PermissionListener?) {
+        JitsiMeetActivityDelegate.requestPermissions(this, permissions, requestCode, listener)
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults)
+    }
+
+    override fun onConferenceTerminated(p0: MutableMap<String, Any>?) {
+        finish()
+    }
+
+    override fun onConferenceJoined(p0: MutableMap<String, Any>?) {
+    }
+
+    override fun onConferenceWillJoin(p0: MutableMap<String, Any>?) {
+    }
+
+    companion object {
+        fun newIntent(context: Context, roomId: String, widgetId: String, enableVideo: Boolean): Intent {
+            return Intent(context, VectorJitsiActivity::class.java).apply {
+                putExtra(MvRx.KEY_ARG, Args(roomId, widgetId, enableVideo))
+                addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/riotx/features/call/service/CallHeadsUpActionReceiver.kt b/vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/call/service/CallHeadsUpActionReceiver.kt
rename to vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt
index 199dcd3b14..179ba288eb 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/service/CallHeadsUpActionReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call.service
+package im.vector.app.features.call.service
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import im.vector.riotx.core.di.HasVectorInjector
-import im.vector.riotx.features.call.WebRtcPeerConnectionManager
-import im.vector.riotx.features.notifications.NotificationUtils
-import im.vector.riotx.features.settings.VectorLocale.context
+import im.vector.app.core.di.HasVectorInjector
+import im.vector.app.features.call.WebRtcPeerConnectionManager
+import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.features.settings.VectorLocale.context
 import timber.log.Timber
 
 class CallHeadsUpActionReceiver : BroadcastReceiver() {
diff --git a/vector/src/main/java/im/vector/riotx/features/call/telecom/CallConnection.kt b/vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/call/telecom/CallConnection.kt
rename to vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt
index 6273abddfd..6f69b4b0d0 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/telecom/CallConnection.kt
+++ b/vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call.telecom
+package im.vector.app.features.call.telecom
 
 import android.content.Context
 import android.os.Build
 import android.telecom.Connection
 import android.telecom.DisconnectCause
 import androidx.annotation.RequiresApi
-import im.vector.riotx.features.call.VectorCallViewModel
-import im.vector.riotx.features.call.WebRtcPeerConnectionManager
+import im.vector.app.features.call.VectorCallViewModel
+import im.vector.app.features.call.WebRtcPeerConnectionManager
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/call/telecom/TelecomUtils.kt b/vector/src/main/java/im/vector/app/features/call/telecom/TelecomUtils.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/call/telecom/TelecomUtils.kt
rename to vector/src/main/java/im/vector/app/features/call/telecom/TelecomUtils.kt
index 61bb8980bf..819a1f6c0a 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/telecom/TelecomUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/call/telecom/TelecomUtils.kt
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call.telecom
+package im.vector.app.features.call.telecom
 
 import android.content.Context
 import android.telephony.TelephonyManager
+import androidx.core.content.getSystemService
 
 object TelecomUtils {
 
     fun isLineBusy(context: Context): Boolean {
-        val telephonyManager = context.getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager
+        val telephonyManager = context.getSystemService<TelephonyManager>()
                 ?: return false
         return telephonyManager.callState != TelephonyManager.CALL_STATE_IDLE
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/call/telecom/VectorConnectionService.kt b/vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/call/telecom/VectorConnectionService.kt
rename to vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt
index 85f215d24c..410a4621e8 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/telecom/VectorConnectionService.kt
+++ b/vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.call.telecom
+package im.vector.app.features.call.telecom
 
 import android.content.ComponentName
 import android.content.Intent
@@ -29,7 +29,7 @@ import android.telecom.PhoneAccountHandle
 import android.telecom.StatusHints
 import android.telecom.TelecomManager
 import androidx.annotation.RequiresApi
-import im.vector.riotx.core.services.CallService
+import im.vector.app.core.services.CallService
 
 /**
  * No active calls in other apps
diff --git a/vector/src/main/java/im/vector/riotx/features/command/Command.kt b/vector/src/main/java/im/vector/app/features/command/Command.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/command/Command.kt
rename to vector/src/main/java/im/vector/app/features/command/Command.kt
index d98ebcfa73..db429f9e58 100644
--- a/vector/src/main/java/im/vector/riotx/features/command/Command.kt
+++ b/vector/src/main/java/im/vector/app/features/command/Command.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.command
+package im.vector.app.features.command
 
 import androidx.annotation.StringRes
-import im.vector.riotx.R
+import im.vector.app.R
 
 /**
  * Defines the command line operations
@@ -44,9 +44,7 @@ enum class Command(val command: String, val parameters: String, @StringRes val d
     POLL("/poll", "Question | Option 1 | Option 2 ...", R.string.command_description_poll),
     SHRUG("/shrug", "<message>", R.string.command_description_shrug),
     PLAIN("/plain", "<message>", R.string.command_description_plain),
-    DISCARD_SESSION("/discardsession", "", R.string.command_description_discard_session),
-    // TODO temporary command
-    VERIFY_USER("/verify", "<user-id>", R.string.command_description_verify);
+    DISCARD_SESSION("/discardsession", "", R.string.command_description_discard_session);
 
     val length
         get() = command.length + 1
diff --git a/vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt
rename to vector/src/main/java/im/vector/app/features/command/CommandParser.kt
index 2b38a1ac25..94de6bf265 100644
--- a/vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt
+++ b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.command
+package im.vector.app.features.command
 
-import im.vector.matrix.android.api.MatrixPatterns
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.riotx.core.extensions.isEmail
-import im.vector.riotx.core.extensions.isMsisdn
+import im.vector.app.core.extensions.isEmail
+import im.vector.app.core.extensions.isMsisdn
+import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.session.identity.ThreePid
 import timber.log.Timber
 
 object CommandParser {
@@ -279,11 +279,6 @@ object CommandParser {
 
                     ParsedCommand.SendShrug(message)
                 }
-                Command.VERIFY_USER.command            -> {
-                    val message = textMessage.substring(Command.VERIFY_USER.command.length).trim()
-
-                    ParsedCommand.VerifyUser(message)
-                }
                 Command.POLL.command                   -> {
                     val rawCommand = textMessage.substring(Command.POLL.command.length).trim()
                     val split = rawCommand.split("|").map { it.trim() }
diff --git a/vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt
rename to vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
index 041da3dcac..bdfa7779fb 100644
--- a/vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt
+++ b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.command
+package im.vector.app.features.command
 
-import im.vector.matrix.android.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.ThreePid
 
 /**
  * Represent a parsed command
@@ -53,7 +53,6 @@ sealed class ParsedCommand {
     object ClearScalarToken : ParsedCommand()
     class SendSpoiler(val message: String) : ParsedCommand()
     class SendShrug(val message: CharSequence) : ParsedCommand()
-    class VerifyUser(val userId: String) : ParsedCommand()
     class SendPoll(val question: String, val options: List<String>) : ParsedCommand()
     object DiscardSession: ParsedCommand()
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt b/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt
rename to vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
index 2ef69890ed..5567a138de 100644
--- a/vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt
+++ b/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.configuration
+package im.vector.app.features.configuration
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Build
-import im.vector.riotx.features.settings.FontScale
-import im.vector.riotx.features.settings.VectorLocale
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.features.settings.FontScale
+import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.themes.ThemeUtils
 import timber.log.Timber
 import java.util.Locale
 import javax.inject.Inject
@@ -82,9 +82,7 @@ class VectorConfiguration @Inject constructor(private val context: Context) {
             } else {
                 @Suppress("DEPRECATION")
                 configuration.locale = locale
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                    configuration.setLayoutDirection(locale)
-                }
+                configuration.setLayoutDirection(locale)
                 @Suppress("DEPRECATION")
                 resources.updateConfiguration(configuration, resources.displayMetrics)
                 return context
diff --git a/vector/src/main/java/im/vector/riotx/features/consent/ConsentNotGivenHelper.kt b/vector/src/main/java/im/vector/app/features/consent/ConsentNotGivenHelper.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/consent/ConsentNotGivenHelper.kt
rename to vector/src/main/java/im/vector/app/features/consent/ConsentNotGivenHelper.kt
index 14abce7bfa..dbcc2c1820 100644
--- a/vector/src/main/java/im/vector/riotx/features/consent/ConsentNotGivenHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/consent/ConsentNotGivenHelper.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.consent
+package im.vector.app.features.consent
 
 import android.app.Activity
 import androidx.appcompat.app.AlertDialog
-import im.vector.riotx.R
-import im.vector.riotx.core.dialogs.DialogLocker
-import im.vector.riotx.core.platform.Restorable
-import im.vector.riotx.features.webview.VectorWebViewActivity
-import im.vector.riotx.features.webview.WebViewMode
+import im.vector.app.R
+import im.vector.app.core.dialogs.DialogLocker
+import im.vector.app.core.platform.Restorable
+import im.vector.app.features.webview.VectorWebViewActivity
+import im.vector.app.features.webview.WebViewMode
 
 class ConsentNotGivenHelper(private val activity: Activity,
                             private val dialogLocker: DialogLocker) :
diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactDetailItem.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactDetailItem.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactDetailItem.kt
rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactDetailItem.kt
index 8615838571..aba530b2fb 100644
--- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactDetailItem.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactDetailItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.contactsbook
+package im.vector.app.features.contactsbook
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.ClickListener
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.epoxy.onClick
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_contact_detail)
 abstract class ContactDetailItem : VectorEpoxyModel<ContactDetailItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactItem.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactItem.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactItem.kt
rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactItem.kt
index 9a6bf8f144..fd112f0948 100644
--- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactItem.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.contactsbook
+package im.vector.app.features.contactsbook
 
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.contacts.MappedContact
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.contacts.MappedContact
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_contact_main)
 abstract class ContactItem : VectorEpoxyModel<ContactItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookAction.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookAction.kt
rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt
index 001630d398..8eb5bc733b 100644
--- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookAction.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.contactsbook
+package im.vector.app.features.contactsbook
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class ContactsBookAction : VectorViewModelAction {
     data class FilterWith(val filter: String) : ContactsBookAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookController.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookController.kt
rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt
index 796ed0d80c..9eca2afa60 100644
--- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookController.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.contactsbook
+package im.vector.app.features.contactsbook
 
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.riotx.R
-import im.vector.riotx.core.contacts.MappedContact
-import im.vector.riotx.core.epoxy.errorWithRetryItem
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.epoxy.noResultItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.contacts.MappedContact
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.identity.ThreePid
 import javax.inject.Inject
 
 class ContactsBookController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookFragment.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookFragment.kt
rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
index 2a2fd9fb5d..dd449de989 100644
--- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.contactsbook
+package im.vector.app.features.contactsbook
 
 import android.os.Bundle
 import android.view.View
@@ -23,18 +23,18 @@ import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.checkedChanges
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.userdirectory.PendingInvitee
-import im.vector.riotx.features.userdirectory.UserDirectoryAction
-import im.vector.riotx.features.userdirectory.UserDirectorySharedAction
-import im.vector.riotx.features.userdirectory.UserDirectorySharedActionViewModel
-import im.vector.riotx.features.userdirectory.UserDirectoryViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.userdirectory.PendingInvitee
+import im.vector.app.features.userdirectory.UserDirectoryAction
+import im.vector.app.features.userdirectory.UserDirectorySharedAction
+import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel
+import im.vector.app.features.userdirectory.UserDirectoryViewModel
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.user.model.User
 import kotlinx.android.synthetic.main.fragment_contacts_book.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewModel.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewModel.kt
rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
index 3eb6b165b8..d9b136691e 100644
--- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.contactsbook
+package im.vector.app.features.contactsbook
 
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.viewModelScope
@@ -26,17 +26,17 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.identity.FoundThreePid
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.riotx.core.contacts.ContactsDataSource
-import im.vector.riotx.core.contacts.MappedContact
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.createdirect.CreateDirectRoomActivity
-import im.vector.riotx.features.invite.InviteUsersToRoomActivity
+import im.vector.app.core.contacts.ContactsDataSource
+import im.vector.app.core.contacts.MappedContact
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.createdirect.CreateDirectRoomActivity
+import im.vector.app.features.invite.InviteUsersToRoomActivity
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.identity.FoundThreePid
+import org.matrix.android.sdk.api.session.identity.ThreePid
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewState.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewState.kt
rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt
index 8f59403d6a..3e4f4ddcb6 100644
--- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.contactsbook
+package im.vector.app.features.contactsbook
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxState
-import im.vector.riotx.core.contacts.MappedContact
+import im.vector.app.core.contacts.MappedContact
 
 data class ContactsBookViewState(
         // All the contacts on the phone
diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomAction.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomAction.kt
rename to vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt
index fad36cc281..f6fc3fed5b 100644
--- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomAction.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.createdirect
+package im.vector.app.features.createdirect
 
-import im.vector.riotx.core.platform.VectorViewModelAction
-import im.vector.riotx.features.userdirectory.PendingInvitee
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.features.userdirectory.PendingInvitee
 
 sealed class CreateDirectRoomAction : VectorViewModelAction {
     data class CreateRoomAndInviteSelectedUsers(val invitees: Set<PendingInvitee>) : CreateDirectRoomAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomActivity.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
similarity index 67%
rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomActivity.kt
rename to vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
index 72244d1c94..41260b06c8 100644
--- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
@@ -16,7 +16,7 @@
  *
  */
 
-package im.vector.riotx.features.createdirect
+package im.vector.app.features.createdirect
 
 import android.content.Context
 import android.content.Intent
@@ -28,29 +28,29 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.viewModel
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.room.failure.CreateRoomFailure
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.extensions.addFragmentToBackstack
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.SimpleFragmentActivity
-import im.vector.riotx.core.platform.WaitingViewData
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_MEMBERS_SEARCH
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_READ_CONTACTS
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.features.contactsbook.ContactsBookFragment
-import im.vector.riotx.features.contactsbook.ContactsBookViewModel
-import im.vector.riotx.features.userdirectory.KnownUsersFragment
-import im.vector.riotx.features.userdirectory.KnownUsersFragmentArgs
-import im.vector.riotx.features.userdirectory.UserDirectoryFragment
-import im.vector.riotx.features.userdirectory.UserDirectorySharedAction
-import im.vector.riotx.features.userdirectory.UserDirectorySharedActionViewModel
-import im.vector.riotx.features.userdirectory.UserDirectoryViewModel
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.extensions.addFragmentToBackstack
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.core.utils.PERMISSIONS_FOR_MEMBERS_SEARCH
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_READ_CONTACTS
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.features.contactsbook.ContactsBookFragment
+import im.vector.app.features.contactsbook.ContactsBookViewModel
+import im.vector.app.features.userdirectory.KnownUsersFragment
+import im.vector.app.features.userdirectory.KnownUsersFragmentArgs
+import im.vector.app.features.userdirectory.UserDirectoryFragment
+import im.vector.app.features.userdirectory.UserDirectorySharedAction
+import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel
+import im.vector.app.features.userdirectory.UserDirectoryViewModel
 import kotlinx.android.synthetic.main.activity.*
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
 import java.net.HttpURLConnection
 import javax.inject.Inject
 
@@ -138,19 +138,29 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
 
     private fun renderCreationFailure(error: Throwable) {
         hideWaitingView()
-        if (error is CreateRoomFailure.CreatedWithTimeout) {
-            finish()
-        } else {
-            val message = if (error is Failure.ServerError && error.httpCode == HttpURLConnection.HTTP_INTERNAL_ERROR /*500*/) {
-                // This error happen if the invited userId does not exist.
-                getString(R.string.create_room_dm_failure)
-            } else {
-                errorFormatter.toHumanReadable(error)
+        when (error) {
+            is CreateRoomFailure.CreatedWithTimeout -> {
+                finish()
+            }
+            is CreateRoomFailure.CreatedWithFederationFailure -> {
+                AlertDialog.Builder(this)
+                        .setMessage(getString(R.string.create_room_federation_error, error.matrixError.message))
+                        .setCancelable(false)
+                        .setPositiveButton(R.string.ok) { _, _ -> finish() }
+                        .show()
+            }
+            else                                              -> {
+                val message = if (error is Failure.ServerError && error.httpCode == HttpURLConnection.HTTP_INTERNAL_ERROR /*500*/) {
+                    // This error happen if the invited userId does not exist.
+                    getString(R.string.create_room_dm_failure)
+                } else {
+                    errorFormatter.toHumanReadable(error)
+                }
+                AlertDialog.Builder(this)
+                        .setMessage(message)
+                        .setPositiveButton(R.string.ok, null)
+                        .show()
             }
-            AlertDialog.Builder(this)
-                    .setMessage(message)
-                    .setPositiveButton(R.string.ok, null)
-                    .show()
         }
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewEvents.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewEvents.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewEvents.kt
index 5ea344115a..0c9804e9a4 100644
--- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewEvents.kt
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.createdirect
+package im.vector.app.features.createdirect
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class CreateDirectRoomViewEvents : VectorViewEvents
diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt
rename to vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
index b72a7db001..a122ed2527 100644
--- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.createdirect
+package im.vector.app.features.createdirect
 
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.userdirectory.PendingInvitee
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.userdirectory.PendingInvitee
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.rx.rx
 
 class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted
                                                             initialState: CreateDirectRoomViewState,
diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewState.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewState.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewState.kt
rename to vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewState.kt
index 8bb8c3ce58..953d415140 100644
--- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.createdirect
+package im.vector.app.features.createdirect
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
index 2467334f69..d35d031286 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.keys
+package im.vector.app.features.crypto.keys
 
 import android.content.Context
 import android.net.Uri
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.internal.extensions.foldToCallback
-import im.vector.matrix.android.internal.util.awaitCallback
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.extensions.foldToCallback
+import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
index 5f550c032a..d2227841b5 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.keys
+package im.vector.app.features.crypto.keys
 
 import android.content.Context
 import android.net.Uri
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.matrix.android.internal.extensions.foldToCallback
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.riotx.core.intent.getMimeTypeFromUri
-import im.vector.riotx.core.resources.openResource
+import im.vector.app.core.intent.getMimeTypeFromUri
+import im.vector.app.core.resources.openResource
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.internal.extensions.foldToCallback
+import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
index 2b4e372166..bef8788f75 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.restore
+package im.vector.app.features.crypto.keysbackup.restore
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.Observer
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.addFragmentToBackstack
-import im.vector.riotx.core.extensions.observeEvent
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.core.platform.SimpleFragmentActivity
-import im.vector.riotx.core.ui.views.KeysBackupBanner
-import im.vector.riotx.features.crypto.quads.SharedSecureStorageActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragmentToBackstack
+import im.vector.app.core.extensions.observeEvent
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.core.ui.views.KeysBackupBanner
+import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
 
 class KeysBackupRestoreActivity : SimpleFragmentActivity() {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
index 9a6e65a885..cc10256fc4 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.restore
+package im.vector.app.features.crypto.keysbackup.restore
 
 import android.app.Activity
 import android.content.Intent
@@ -26,9 +26,9 @@ import butterknife.BindView
 import butterknife.OnClick
 import butterknife.OnTextChanged
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.startImportTextFromFileIntent
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.startImportTextFromFileIntent
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
index 2faff3d112..ddbe86305c 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.restore
+package im.vector.app.features.crypto.keysbackup.restore
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.WaitingViewData
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.core.resources.StringProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
index b302b57433..7941d95add 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.restore
+package im.vector.app.features.crypto.keysbackup.restore
 
 import android.os.Bundle
 import android.text.Editable
@@ -30,9 +30,9 @@ import butterknife.BindView
 import butterknife.OnClick
 import butterknife.OnTextChanged
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.VectorBaseFragment
 import javax.inject.Inject
 
 class KeysBackupRestoreFromPassphraseFragment @Inject constructor() : VectorBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
index 9c9c12b824..d45a961dd7 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.restore
+package im.vector.app.features.crypto.keysbackup.restore
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
index 24aa37b95c..7d2d74db2f 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.restore
+package im.vector.app.features.crypto.keysbackup.restore
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.listeners.StepProgressListener
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
-import im.vector.matrix.android.api.session.securestorage.KeyInfoResult
-import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.matrix.android.internal.crypto.keysbackup.util.computeRecoveryKey
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.WaitingViewData
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.LiveEvent
+import im.vector.app.R
+import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.LiveEvent
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.listeners.StepProgressListener
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
+import org.matrix.android.sdk.api.session.securestorage.KeyInfoResult
+import org.matrix.android.sdk.internal.crypto.crosssigning.fromBase64
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.computeRecoveryKey
+import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
index def8e4bf65..fa571b86c1 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.restore
+package im.vector.app.features.crypto.keysbackup.restore
 
 import android.os.Bundle
 import android.widget.TextView
 import androidx.core.view.isVisible
 import butterknife.BindView
 import butterknife.OnClick
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.LiveEvent
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.LiveEvent
 import javax.inject.Inject
 
 class KeysBackupRestoreSuccessFragment @Inject constructor() : VectorBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt
index 723be80dfd..776c7bb521 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.keysbackup.settings
+package im.vector.app.features.crypto.keysbackup.settings
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class KeyBackupSettingsAction : VectorViewModelAction {
     object Init : KeyBackupSettingsAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
index 98e954c5b5..c4a4e06fcf 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.settings
+package im.vector.app.features.crypto.keysbackup.settings
 
 import android.content.Context
 import android.content.Intent
@@ -21,11 +21,11 @@ import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.viewModel
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.core.platform.SimpleFragmentActivity
-import im.vector.riotx.core.platform.WaitingViewData
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.core.platform.WaitingViewData
 import javax.inject.Inject
 
 class KeysBackupManageActivity : SimpleFragmentActivity() {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
index ca509a11f2..0489f18abe 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.keysbackup.settings
+package im.vector.app.features.crypto.keysbackup.settings
 
 import android.view.View
 import android.widget.Button
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_keys_backup_settings_button_footer)
 abstract class KeysBackupSettingFooterItem : VectorEpoxyModel<KeysBackupSettingFooterItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
similarity index 77%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
index 4800701ede..874e3765ca 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.keysbackup.settings
+package im.vector.app.features.crypto.keysbackup.settings
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.KeysBackupVersionTrust
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
 
 data class KeysBackupSettingViewState(val keysBackupVersionTrust: Async<KeysBackupVersionTrust> = Uninitialized,
                                       val keysBackupState: KeysBackupState? = null,
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
index f0997de372..36ee4d954f 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.settings
+package im.vector.app.features.crypto.keysbackup.settings
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreActivity
-import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreActivity
+import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity
 import kotlinx.android.synthetic.main.fragment_keys_backup_settings.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
index 20046fa115..bfdb297b23 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.settings
+package im.vector.app.features.crypto.keysbackup.settings
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
@@ -22,16 +22,16 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.errorWithRetryItem
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.GenericItem
-import im.vector.riotx.core.ui.list.genericItem
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.genericItem
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.KeysBackupVersionTrust
 import java.util.UUID
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
index d2e977c209..3666dbce8c 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.settings
+package im.vector.app.features.crypto.keysbackup.settings
 
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.Fail
@@ -24,15 +24,15 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
-import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.KeysBackupVersionTrust
 
 class KeysBackupSettingsViewModel @AssistedInject constructor(@Assisted initialState: KeysBackupSettingViewState,
                                                               session: Session
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
index f42fee0030..1bba2c3a39 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.setup
+package im.vector.app.features.crypto.keysbackup.setup
 
 import android.app.Activity
 import android.content.Context
@@ -22,15 +22,15 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Observer
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.riotx.R
-import im.vector.riotx.core.dialogs.ExportKeysDialog
-import im.vector.riotx.core.extensions.observeEvent
-import im.vector.riotx.core.extensions.queryExportKeys
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.core.platform.SimpleFragmentActivity
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.crypto.keys.KeysExporter
+import im.vector.app.R
+import im.vector.app.core.dialogs.ExportKeysDialog
+import im.vector.app.core.extensions.observeEvent
+import im.vector.app.core.extensions.queryExportKeys
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.core.utils.toast
+import im.vector.app.features.crypto.keys.KeysExporter
+import org.matrix.android.sdk.api.MatrixCallback
 
 class KeysBackupSetupActivity : SimpleFragmentActivity() {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
index 6381786e57..8a5264d404 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.keysbackup.setup
+package im.vector.app.features.crypto.keysbackup.setup
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.nulabinc.zxcvbn.Strength
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.WaitingViewData
-import im.vector.riotx.core.utils.LiveEvent
+import im.vector.app.R
+import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.core.utils.LiveEvent
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
index a9bfbd83b0..0a82edd150 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.keysbackup.setup
+package im.vector.app.features.crypto.keysbackup.setup
 
 import android.os.Bundle
 import android.view.View
@@ -23,9 +23,9 @@ import android.widget.TextView
 import androidx.lifecycle.Observer
 import butterknife.BindView
 import butterknife.OnClick
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.LiveEvent
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.LiveEvent
 import javax.inject.Inject
 
 class KeysBackupSetupStep1Fragment @Inject constructor() : VectorBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
index 95fe9b0ffa..0520098866 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.setup
+package im.vector.app.features.crypto.keysbackup.setup
 
 import android.os.Bundle
 import android.view.ViewGroup
@@ -28,11 +28,11 @@ import butterknife.OnClick
 import butterknife.OnTextChanged
 import com.google.android.material.textfield.TextInputLayout
 import com.nulabinc.zxcvbn.Zxcvbn
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.ui.views.PasswordStrengthBar
-import im.vector.riotx.features.settings.VectorLocale
+import im.vector.app.R
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.ui.views.PasswordStrengthBar
+import im.vector.app.features.settings.VectorLocale
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index 28711115c3..41b7cbddfe 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.keysbackup.setup
+package im.vector.app.features.crypto.keysbackup.setup
 
 import android.app.Activity
 import android.content.Intent
@@ -30,12 +30,12 @@ import arrow.core.Try
 import butterknife.BindView
 import butterknife.OnClick
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.LiveEvent
-import im.vector.riotx.core.utils.copyToClipboard
-import im.vector.riotx.core.utils.selectTxtFileToWrite
-import im.vector.riotx.core.utils.startSharePlainTextIntent
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.LiveEvent
+import im.vector.app.core.utils.copyToClipboard
+import im.vector.app.core.utils.selectTxtFileToWrite
+import im.vector.app.core.utils.startSharePlainTextIntent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
index 0159dc7c3a..961cca4b70 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
@@ -17,26 +17,26 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.keysrequest
+package im.vector.app.features.crypto.keysrequest
 
 import android.content.Context
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.keyshare.GossipingRequestListener
-import im.vector.matrix.android.api.session.crypto.verification.SasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.internal.crypto.IncomingRequestCancellation
-import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.IncomingSecretShareRequest
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.riotx.R
-import im.vector.riotx.features.popup.DefaultVectorAlert
-import im.vector.riotx.features.popup.PopupAlertManager
+import im.vector.app.R
+import im.vector.app.features.popup.DefaultVectorAlert
+import im.vector.app.features.popup.PopupAlertManager
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.keyshare.GossipingRequestListener
+import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.internal.crypto.IncomingRequestCancellation
+import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.IncomingSecretShareRequest
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import timber.log.Timber
 import java.text.DateFormat
 import java.text.SimpleDateFormat
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageAction.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageAction.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageAction.kt
rename to vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageAction.kt
index 876c758864..b47b7dc3a9 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageAction.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageAction.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.quads
+package im.vector.app.features.crypto.quads
 
-import im.vector.riotx.core.platform.VectorViewEvents
-import im.vector.riotx.core.platform.VectorViewModelAction
-import im.vector.riotx.core.platform.WaitingViewData
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.WaitingViewData
 
 sealed class SharedSecureStorageAction : VectorViewModelAction {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageActivity.kt
rename to vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
index 27ab860994..bca7a63470 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.quads
+package im.vector.app.features.crypto.quads
 
 import android.app.Activity
 import android.content.Context
@@ -26,11 +26,11 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.extensions.commitTransaction
-import im.vector.riotx.core.platform.SimpleFragmentActivity
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.platform.SimpleFragmentActivity
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.activity.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
index 9f1dfe1869..5bc87dfce7 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.quads
+package im.vector.app.features.crypto.quads
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Async
@@ -28,18 +28,18 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.securestorage.IntegrityResult
-import im.vector.matrix.android.api.session.securestorage.KeyInfoResult
-import im.vector.matrix.android.api.session.securestorage.RawBytesKeySpec
-import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.platform.WaitingViewData
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.securestorage.IntegrityResult
+import org.matrix.android.sdk.api.session.securestorage.KeyInfoResult
+import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
+import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
+import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
index 054c7a354a..f8b3f4d6a4 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.quads
+package im.vector.app.features.crypto.quads
 
 import android.app.Activity
 import android.content.Intent
@@ -24,10 +24,10 @@ import android.view.inputmethod.EditorInfo
 import com.airbnb.mvrx.activityViewModel
 import com.jakewharton.rxbinding3.widget.editorActionEvents
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.startImportTextFromFileIntent
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.startImportTextFromFileIntent
+import org.matrix.android.sdk.api.extensions.tryThis
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.fragment_ssss_access_from_key.*
 import java.util.concurrent.TimeUnit
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
index c14b452a60..09e67948d0 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.quads
+package im.vector.app.features.crypto.quads
 
 import android.os.Bundle
 import android.view.View
@@ -24,11 +24,11 @@ import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.editorActionEvents
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.colorizeMatchingText
+import im.vector.app.R
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.colorizeMatchingText
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.fragment_ssss_access_from_passphrase.*
 import java.util.concurrent.TimeUnit
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BackupToQuadSMigrationTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BackupToQuadSMigrationTask.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
index 02bdab6990..bbdd0fd5c5 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BackupToQuadSMigrationTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.listeners.ProgressListener
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.matrix.android.api.session.securestorage.EmptyKeySigner
-import im.vector.matrix.android.api.session.securestorage.RawBytesKeySpec
-import im.vector.matrix.android.api.session.securestorage.SharedSecretStorageService
-import im.vector.matrix.android.api.session.securestorage.SsssKeyCreationInfo
-import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding
-import im.vector.matrix.android.internal.crypto.keysbackup.deriveKey
-import im.vector.matrix.android.internal.crypto.keysbackup.util.computeRecoveryKey
-import im.vector.matrix.android.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.ViewModelTask
-import im.vector.riotx.core.platform.WaitingViewData
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.platform.ViewModelTask
+import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.securestorage.EmptyKeySigner
+import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
+import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
+import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
+import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
+import org.matrix.android.sdk.internal.crypto.keysbackup.deriveKey
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.computeRecoveryKey
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
+import org.matrix.android.sdk.internal.util.awaitCallback
 import timber.log.Timber
 import java.util.UUID
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapAccountPasswordFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapAccountPasswordFragment.kt
index dca8cd4227..ccf2d67701 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapAccountPasswordFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import android.os.Bundle
 import android.view.View
@@ -24,12 +24,12 @@ import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.editorActionEvents
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.colorizeMatchingText
+import im.vector.app.R
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.colorizeMatchingText
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.fragment_bootstrap_enter_account_password.*
 import kotlinx.android.synthetic.main.fragment_bootstrap_enter_passphrase.bootstrapDescriptionText
@@ -66,7 +66,7 @@ class BootstrapAccountPasswordFragment @Inject constructor(
                 .disposeOnDestroyView()
 
         bootstrapAccountPasswordEditText.textChanges()
-                .distinct()
+                .distinctUntilChanged()
                 .subscribe {
                     if (!it.isNullOrBlank()) {
                         bootstrapAccountPasswordTil.error = null
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapActions.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapActions.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt
index ae8dbdc9f4..0785290d2a 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapActions.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 import java.io.OutputStream
 
 sealed class BootstrapActions : VectorViewModelAction {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
index 945a8c2866..1b9beabe9c 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import android.app.Dialog
 import android.os.Bundle
@@ -31,11 +31,11 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.commitTransaction
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.bottom_sheet_bootstrap.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConclusionFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConclusionFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt
index fd7ba2dbb7..a50d9e6dff 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConclusionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.text.toSpannable
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.colorizeMatchingText
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.colorizeMatchingText
 import kotlinx.android.synthetic.main.fragment_bootstrap_conclusion.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
index bed3b96a5d..46e9315477 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import android.os.Bundle
 import android.view.View
@@ -24,10 +24,10 @@ import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.editorActionEvents
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.VectorBaseFragment
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.fragment_bootstrap_enter_passphrase.*
 import java.util.concurrent.TimeUnit
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapCrossSigningTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapCrossSigningTask.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
index 8781cbe570..5da788583e 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapCrossSigningTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
@@ -14,34 +14,33 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.api.failure.toRegistrationFlowResponse
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.securestorage.EmptyKeySigner
-import im.vector.matrix.android.api.session.securestorage.SharedSecretStorageService
-import im.vector.matrix.android.api.session.securestorage.SsssKeyCreationInfo
-import im.vector.matrix.android.api.session.securestorage.SsssKeySpec
-import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding
-import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.matrix.android.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.ViewModelTask
-import im.vector.riotx.core.platform.WaitingViewData
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.platform.ViewModelTask
+import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.securestorage.EmptyKeySigner
+import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
+import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
+import org.matrix.android.sdk.api.session.securestorage.SsssKeySpec
+import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersion
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.util.awaitCallback
 import timber.log.Timber
-import java.lang.IllegalArgumentException
 import java.util.UUID
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
index b7bd38a5eb..53c3ee4356 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import android.os.Bundle
 import android.view.View
@@ -23,10 +23,10 @@ import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.editorActionEvents
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.settings.VectorLocale
+import im.vector.app.R
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.settings.VectorLocale
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.fragment_bootstrap_enter_passphrase.*
 import java.util.concurrent.TimeUnit
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
index 053ffee1f4..e43e2f2493 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import android.app.Activity
 import android.content.Intent
@@ -30,15 +30,15 @@ import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.editorActionEvents
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.matrix.android.internal.crypto.keysbackup.util.isValidRecoveryKey
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.colorizeMatchingText
-import im.vector.riotx.core.utils.startImportTextFromFileIntent
+import im.vector.app.R
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.colorizeMatchingText
+import im.vector.app.core.utils.startImportTextFromFileIntent
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.isValidRecoveryKey
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.fragment_bootstrap_enter_passphrase.bootstrapDescriptionText
 import kotlinx.android.synthetic.main.fragment_bootstrap_migrate_backup.*
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
index 1808c99629..750dadbc9f 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import android.app.Activity.RESULT_OK
 import android.content.ActivityNotFoundException
@@ -24,11 +24,11 @@ import android.view.View
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.startSharePlainTextIntent
-import im.vector.riotx.core.utils.toast
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.startSharePlainTextIntent
+import im.vector.app.core.utils.toast
 import kotlinx.android.synthetic.main.fragment_bootstrap_save_key.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
index ea558145c0..ed68e3daac 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_bootstrap_setup_recovery.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSharedViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
index 8b247bd975..32b4771286 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Fail
@@ -27,20 +27,20 @@ import com.airbnb.mvrx.ViewModelContext
 import com.nulabinc.zxcvbn.Zxcvbn
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.securestorage.RawBytesKeySpec
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.matrix.android.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.riotx.R
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.platform.WaitingViewData
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.login.ReAuthHelper
+import im.vector.app.R
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.login.ReAuthHelper
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.io.OutputStream
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapStep.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapStep.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt
index 71b00016ab..222a5d78c6 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapStep.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 /**
  * TODO The schema is not up to date
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewEvents.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt
index 679eabd561..58bc64a9ad 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class BootstrapViewEvents : VectorViewEvents {
     object Dismiss : BootstrapViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewState.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewState.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewState.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewState.kt
index 4aa18eb7e7..4e94ddf0bf 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewState.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import com.nulabinc.zxcvbn.Strength
-import im.vector.matrix.android.api.session.securestorage.SsssKeyCreationInfo
-import im.vector.riotx.core.platform.WaitingViewData
+import im.vector.app.core.platform.WaitingViewData
+import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
 
 data class BootstrapViewState(
         val step: BootstrapStep = BootstrapStep.CheckingMigration,
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapWaitingFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapWaitingFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt
index 1c6c9e6d9b..0004420494 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapWaitingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_bootstrap_waiting.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/KeepItSafeDialog.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/KeepItSafeDialog.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt
index c8348ea7e9..31fb9d01e3 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/KeepItSafeDialog.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 import android.app.Activity
 import android.content.DialogInterface
@@ -22,7 +22,7 @@ import android.view.KeyEvent
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
-import im.vector.riotx.R
+import im.vector.app.R
 import me.gujun.android.span.image
 import me.gujun.android.span.span
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/RecoveryKeyExt.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/RecoveryKeyExt.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/RecoveryKeyExt.kt
rename to vector/src/main/java/im/vector/app/features/crypto/recover/RecoveryKeyExt.kt
index 29453af932..8fd7229c5d 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/RecoveryKeyExt.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/RecoveryKeyExt.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.recover
+package im.vector.app.features.crypto.recover
 
 fun String.formatRecoveryKey(): String {
     return this.replace(" ", "")
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/util/Extensions.kt b/vector/src/main/java/im/vector/app/features/crypto/util/Extensions.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/crypto/util/Extensions.kt
rename to vector/src/main/java/im/vector/app/features/crypto/util/Extensions.kt
index f4885498c3..c75bcb252b 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/util/Extensions.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/util/Extensions.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.util
+package im.vector.app.features.crypto.util
 
 import androidx.annotation.DrawableRes
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.exhaustive
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 
 @DrawableRes
 fun RoomEncryptionTrustLevel?.toImageRes(): Int {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index 2bd815b6df..fb8ef1f114 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification
+package im.vector.app.features.crypto.verification
 
 import android.content.Context
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.home.room.detail.RoomDetailActivity
-import im.vector.riotx.features.home.room.detail.RoomDetailArgs
-import im.vector.riotx.features.popup.PopupAlertManager
-import im.vector.riotx.features.popup.VerificationVectorAlert
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.home.room.detail.RoomDetailActivity
+import im.vector.app.features.home.room.detail.RoomDetailArgs
+import im.vector.app.features.popup.PopupAlertManager
+import im.vector.app.features.popup.VerificationVectorAlert
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.verification.PendingVerificationRequest
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/SupportedVerificationMethodsProvider.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/SupportedVerificationMethodsProvider.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt
index e7ed123de6..b59ea38970 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/SupportedVerificationMethodsProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification
+package im.vector.app.features.crypto.verification
 
-import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
-import im.vector.riotx.core.hardware.HardwareInfo
+import im.vector.app.core.hardware.HardwareInfo
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
index 79facb71d0..1c6ea413cb 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification
+package im.vector.app.features.crypto.verification
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 // TODO Remove otherUserId and transactionId when it's not necessary. Should be known by the ViewModel, no?
 sealed class VerificationAction : VectorViewModelAction {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index cd9fed108b..f979539f2e 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification
+package im.vector.app.features.crypto.verification
 
 import android.app.Activity
 import android.app.Dialog
@@ -31,30 +31,30 @@ import butterknife.BindView
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.commitTransaction
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.riotx.features.crypto.quads.SharedSecureStorageActivity
-import im.vector.riotx.features.crypto.verification.cancel.VerificationCancelFragment
-import im.vector.riotx.features.crypto.verification.cancel.VerificationNotMeFragment
-import im.vector.riotx.features.crypto.verification.choose.VerificationChooseMethodFragment
-import im.vector.riotx.features.crypto.verification.conclusion.VerificationConclusionFragment
-import im.vector.riotx.features.crypto.verification.emoji.VerificationEmojiCodeFragment
-import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment
-import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment
-import im.vector.riotx.features.crypto.verification.request.VerificationRequestFragment
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.settings.VectorSettingsActivity
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
+import im.vector.app.features.crypto.verification.cancel.VerificationCancelFragment
+import im.vector.app.features.crypto.verification.cancel.VerificationNotMeFragment
+import im.vector.app.features.crypto.verification.choose.VerificationChooseMethodFragment
+import im.vector.app.features.crypto.verification.conclusion.VerificationConclusionFragment
+import im.vector.app.features.crypto.verification.emoji.VerificationEmojiCodeFragment
+import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment
+import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment
+import im.vector.app.features.crypto.verification.request.VerificationRequestFragment
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.settings.VectorSettingsActivity
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
 import kotlinx.android.parcel.Parcelize
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewEvents.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewEvents.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewEvents.kt
index 7e3a5441de..ba47de18fc 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification
+package im.vector.app.features.crypto.verification
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for the verification bottom sheet
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index 53c9deb296..a4ce9bd38d 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification
+package im.vector.app.features.crypto.verification
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Async
@@ -27,35 +27,35 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.IncomingSasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest
-import im.vector.matrix.android.api.session.crypto.verification.QrCodeVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.SasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64
-import im.vector.matrix.android.internal.crypto.crosssigning.isVerified
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.matrix.android.internal.crypto.keysbackup.util.computeRecoveryKey
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.PendingVerificationRequest
+import org.matrix.android.sdk.api.session.crypto.verification.QrCodeVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.internal.crypto.crosssigning.fromBase64
+import org.matrix.android.sdk.internal.crypto.crosssigning.isVerified
+import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.computeRecoveryKey
+import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelController.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt
index 73f449a3c3..fc0d31af1a 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.cancel
+package im.vector.app.features.crypto.verification.cancel
 
 import androidx.core.text.toSpannable
 import com.airbnb.epoxy.EpoxyController
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.colorizeMatchingText
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewState
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.colorizeMatchingText
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewState
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
 import javax.inject.Inject
 
 class VerificationCancelController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt
index 0c5c070156..8e31cd2fab 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.cancel
+package im.vector.app.features.crypto.verification.cancel
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt
similarity index 80%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeController.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt
index 3978ab8ba5..a1c482f8d3 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.cancel
+package im.vector.app.features.crypto.verification.cancel
 
 import com.airbnb.epoxy.EpoxyController
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewState
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
-import im.vector.riotx.features.html.EventHtmlRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewState
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
+import im.vector.app.features.html.EventHtmlRenderer
 import javax.inject.Inject
 
 class VerificationNotMeController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt
index b764639078..5059c2a2c9 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.cancel
+package im.vector.app.features.crypto.verification.cancel
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodController.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt
index 919869500f..953b20cb0c 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.choose
+package im.vector.app.features.crypto.verification.choose
 
 import com.airbnb.epoxy.EpoxyController
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationQrCodeItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationQrCodeItem
 import javax.inject.Inject
 
 class VerificationChooseMethodController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
index eb32f5b0e3..fc715301f2 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification.choose
+package im.vector.app.features.crypto.verification.choose
 
 import android.app.Activity
 import android.content.Intent
@@ -22,17 +22,17 @@ import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.features.crypto.verification.VerificationAction
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel
-import im.vector.riotx.features.qrcode.QrCodeScannerActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.features.crypto.verification.VerificationAction
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
+import im.vector.app.features.qrcode.QrCodeScannerActivity
 import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.*
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
index 3c3009ed01..c2e367d8d5 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification.choose
+package im.vector.app.features.crypto.verification.choose
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxState
@@ -21,17 +21,17 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.verification.QrCodeVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheet
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.crypto.verification.VerificationBottomSheet
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.verification.PendingVerificationRequest
+import org.matrix.android.sdk.api.session.crypto.verification.QrCodeVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
 
 data class VerificationChooseMethodViewState(
         val otherUserId: String = "",
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionController.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
index bd40bec210..3c7c6d5745 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.conclusion
+package im.vector.app.features.crypto.verification.conclusion
 
 import com.airbnb.epoxy.EpoxyController
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
-import im.vector.riotx.features.html.EventHtmlRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
+import im.vector.app.features.html.EventHtmlRenderer
 import javax.inject.Inject
 
 class VerificationConclusionController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
index 7405722c04..885cc8f853 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification.conclusion
+package im.vector.app.features.crypto.verification.conclusion
 
 import android.os.Bundle
 import android.os.Parcelable
@@ -21,12 +21,12 @@ import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.crypto.verification.VerificationAction
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.crypto.verification.VerificationAction
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt
index 868e355150..50912af1c2 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification.conclusion
+package im.vector.app.features.crypto.verification.conclusion
 
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.safeValueOf
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.safeValueOf
 
 data class VerificationConclusionViewState(
         val conclusionState: ConclusionState = ConclusionState.CANCELLED,
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
index 12fffd3e11..851219c54c 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.emoji
+package im.vector.app.features.crypto.verification.emoji
 
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Success
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.epoxy.errorWithRetryItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationDecimalCodeItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationEmojisItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationDecimalCodeItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationEmojisItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem
 import javax.inject.Inject
 
 class VerificationEmojiCodeController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt
index 2cd20ca4fb..20d0d7de75 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification.emoji
+package im.vector.app.features.crypto.verification.emoji
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.crypto.verification.VerificationAction
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.crypto.verification.VerificationAction
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
index be5df38353..d511123f5e 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification.emoji
+package im.vector.app.features.crypto.verification.emoji
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
@@ -26,19 +26,19 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation
-import im.vector.matrix.android.api.session.crypto.verification.SasVerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheet
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.crypto.verification.VerificationBottomSheet
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
+import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
 
 data class VerificationEmojiCodeViewState(
         val transactionId: String?,
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt
index 6afc330f62..205dd6a10a 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.crypto.verification.epoxy
+package im.vector.app.features.crypto.verification.epoxy
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 /**
  * A action for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
index f07fce98b0..e87be702db 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.crypto.verification.epoxy
+package im.vector.app.features.crypto.verification.epoxy
 
 import android.content.res.ColorStateList
 import android.widget.ImageView
@@ -24,10 +24,10 @@ import androidx.core.view.isVisible
 import androidx.core.widget.ImageViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 /**
  * A action for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt
index c806778c3a..a7625688c0 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.crypto.verification.epoxy
+package im.vector.app.features.crypto.verification.epoxy
 
 import android.widget.ImageView
 import androidx.core.view.ViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 /**
  * A action for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt
index 1681bf0db8..053c6e3ff4 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.crypto.verification.epoxy
+package im.vector.app.features.crypto.verification.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 /**
  * A action for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
index 112c26e69a..77fa9cb775 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.crypto.verification.epoxy
+package im.vector.app.features.crypto.verification.epoxy
 
 import android.content.Context
 import android.view.ViewGroup
@@ -24,10 +24,10 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
 import me.gujun.android.span.Span
 import me.gujun.android.span.image
 import me.gujun.android.span.span
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt
index c21410b7eb..232cdd0f4a 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.crypto.verification.epoxy
+package im.vector.app.features.crypto.verification.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 /**
  * A action for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
index 024321b6dc..8d78c1c9d6 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.crypto.verification.epoxy
+package im.vector.app.features.crypto.verification.epoxy
 
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.ui.views.QrCodeImageView
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.ui.views.QrCodeImageView
 
 /**
  * An Epoxy item displaying a QR code
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt
index 32ad4e77c6..d8fc928471 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.crypto.verification.epoxy
+package im.vector.app.features.crypto.verification.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 /**
  * A action for bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt
similarity index 77%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt
index 2214774882..8cb5068b63 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.qrconfirmation
+package im.vector.app.features.crypto.verification.qrconfirmation
 
 import com.airbnb.epoxy.EpoxyController
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem
+import im.vector.app.R
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem
 import javax.inject.Inject
 
 class VerificationQRWaitingController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt
index 77de3997cb..c2d7536134 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.qrconfirmation
+package im.vector.app.features.crypto.verification.qrconfirmation
 
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.View
 import com.airbnb.mvrx.MvRx
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt
index dd1d3d0f90..cabce6410d 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.qrconfirmation
+package im.vector.app.features.crypto.verification.qrconfirmation
 
 import com.airbnb.epoxy.EpoxyController
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewState
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewState
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
 import javax.inject.Inject
 
 class VerificationQrScannedByOtherController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt
index a8a16f8006..7e9b19e491 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification.qrconfirmation
+package im.vector.app.features.crypto.verification.qrconfirmation
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.crypto.verification.VerificationAction
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.crypto.verification.VerificationAction
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestController.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
index 8ac2ce72cb..3f4c3120e7 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.crypto.verification.request
+package im.vector.app.features.crypto.verification.request
 
 import androidx.core.text.toSpannable
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.colorizeMatchingText
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewState
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetSelfWaitItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.colorizeMatchingText
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewState
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetSelfWaitItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem
 import javax.inject.Inject
 
 class VerificationRequestController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt
rename to vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt
index 967f2946c1..fc7dcaf15f 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.crypto.verification.request
+package im.vector.app.features.crypto.verification.request
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.crypto.verification.VerificationAction
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.crypto.verification.VerificationAction
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt b/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt
rename to vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
index 51c61c99a9..b9568e0b62 100644
--- a/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt
+++ b/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.disclaimer
+package im.vector.app.features.disclaimer
 
 import android.app.Activity
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.openUrlInChromeCustomTab
-import im.vector.riotx.features.settings.VectorSettingsUrls
+import im.vector.app.R
+import im.vector.app.core.utils.openUrlInChromeCustomTab
+import im.vector.app.features.settings.VectorSettingsUrls
 
 // Increase this value to show again the disclaimer dialog after an upgrade of the application
 private const val CURRENT_DISCLAIMER_VALUE = 2
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsAction.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsAction.kt
rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt
index 57b23d26d2..c66ae69e6a 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.identity.ThreePid
 
 sealed class DiscoverySettingsAction : VectorViewModelAction {
     object RetrieveBinding : DiscoverySettingsAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt
rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
index f92cb1a8bb..6e1b5a5f57 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
@@ -24,17 +24,17 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
 import com.google.i18n.phonenumbers.PhoneNumberUtil
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.identity.SharedState
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.attributes.ButtonStyle
-import im.vector.riotx.core.epoxy.attributes.ButtonType
-import im.vector.riotx.core.epoxy.attributes.IconMode
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.epoxy.attributes.ButtonStyle
+import im.vector.app.core.epoxy.attributes.ButtonType
+import im.vector.app.core.epoxy.attributes.IconMode
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.identity.SharedState
+import org.matrix.android.sdk.api.session.identity.ThreePid
 import timber.log.Timber
 import javax.inject.Inject
 import javax.net.ssl.HttpsURLConnection
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt
rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
index b772db7322..94221b8f4e 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import android.app.Activity
 import android.content.Intent
@@ -22,19 +22,19 @@ import android.view.View
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.identity.SharedState
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.observeEvent
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.ensureProtocol
-import im.vector.riotx.features.discovery.change.SetIdentityServerFragment
-import im.vector.riotx.features.terms.ReviewTermsActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.observeEvent
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.ensureProtocol
+import im.vector.app.features.discovery.change.SetIdentityServerFragment
+import im.vector.app.features.terms.ReviewTermsActivity
+import org.matrix.android.sdk.api.session.identity.SharedState
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.terms.TermsService
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsState.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsState.kt
rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt
index 5dc4b2354a..6b28c07e89 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsState.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewEvents.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewEvents.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewEvents.kt
index 6fd45394a2..c0edd5df6d 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class DiscoverySettingsViewEvents : VectorViewEvents {
     data class Failure(val throwable: Throwable) : DiscoverySettingsViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewModel.kt
rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
index 9693b6a4ad..7ec6082111 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Async
@@ -26,16 +26,16 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.api.session.identity.IdentityServiceListener
-import im.vector.matrix.android.api.session.identity.SharedState
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.api.session.identity.IdentityServiceListener
+import org.matrix.android.sdk.api.session.identity.SharedState
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.rx.rx
 
 class DiscoverySettingsViewModel @AssistedInject constructor(
         @Assisted initialState: DiscoverySettingsState,
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModel.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModel.kt
rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModel.kt
index cde326d824..e85e919e68 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModel.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import im.vector.riotx.core.extensions.postLiveEvent
-import im.vector.riotx.core.utils.LiveEvent
+import im.vector.app.core.extensions.postLiveEvent
+import im.vector.app.core.utils.LiveEvent
 import javax.inject.Inject
 
 class DiscoverySharedViewModel @Inject constructor() : ViewModel() {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModelAction.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModelAction.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModelAction.kt
rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModelAction.kt
index 5889ce4a63..8be9ac0b55 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModelAction.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModelAction.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 sealed class DiscoverySharedViewModelAction {
     data class ChangeIdentityServer(val newUrl: String) : DiscoverySharedViewModelAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/PidInfo.kt b/vector/src/main/java/im/vector/app/features/discovery/PidInfo.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/discovery/PidInfo.kt
rename to vector/src/main/java/im/vector/app/features/discovery/PidInfo.kt
index 67739c48ce..1e5be1b997 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/PidInfo.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/PidInfo.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.identity.SharedState
-import im.vector.matrix.android.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.SharedState
+import org.matrix.android.sdk.api.session.identity.ThreePid
 
 data class PidInfo(
         // Retrieved from the homeserver
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsButtonItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsButtonItem.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsButtonItem.kt
rename to vector/src/main/java/im/vector/app/features/discovery/SettingsButtonItem.kt
index 11a2737496..38f2343316 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsButtonItem.kt
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import android.widget.Button
 import androidx.annotation.StringRes
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.ClickListener
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.attributes.ButtonStyle
-import im.vector.riotx.core.epoxy.onClick
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.resources.ColorProvider
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.attributes.ButtonStyle
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.resources.ColorProvider
 
 @EpoxyModelClass(layout = R.layout.item_settings_button)
 abstract class SettingsButtonItem : EpoxyModelWithHolder<SettingsButtonItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsContinueCancelItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsContinueCancelItem.kt
rename to vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt
index 0e424de540..bb225f4ef4 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsContinueCancelItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import android.widget.Button
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
 
 @EpoxyModelClass(layout = R.layout.item_settings_continue_cancel)
 abstract class SettingsContinueCancelItem : EpoxyModelWithHolder<SettingsContinueCancelItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsEditTextItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsEditTextItem.kt
rename to vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
index aaa4435f3a..81d46373a2 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import android.view.KeyEvent
 import android.view.inputmethod.EditorInfo
@@ -24,9 +24,9 @@ import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_settings_edit_text)
 abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsInfoItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsInfoItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsInfoItem.kt
rename to vector/src/main/java/im/vector/app/features/discovery/SettingsInfoItem.kt
index c28b58340b..20eaae980d 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsInfoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsInfoItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import android.view.View
 import android.widget.TextView
@@ -22,9 +22,9 @@ import androidx.annotation.StringRes
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_settings_helper_info)
 abstract class SettingsInfoItem : EpoxyModelWithHolder<SettingsInfoItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsInformationItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsInformationItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsInformationItem.kt
rename to vector/src/main/java/im/vector/app/features/discovery/SettingsInformationItem.kt
index ad3c445ac3..5748df711e 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsInformationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsInformationItem.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import android.widget.TextView
 import androidx.annotation.ColorRes
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.resources.ColorProvider
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.resources.ColorProvider
 
 @EpoxyModelClass(layout = R.layout.item_settings_information)
 abstract class SettingsInformationItem : EpoxyModelWithHolder<SettingsInformationItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsItem.kt
rename to vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt
index e11ae68f18..53bf7e64d6 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import android.view.View
 import android.widget.Switch
@@ -23,9 +23,9 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_settings_simple_item)
 abstract class SettingsItem : EpoxyModelWithHolder<SettingsItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsProgressItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsProgressItem.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsProgressItem.kt
rename to vector/src/main/java/im/vector/app/features/discovery/SettingsProgressItem.kt
index b48fc3b7f1..8d62b37972 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsProgressItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsProgressItem.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
 
 @EpoxyModelClass(layout = R.layout.item_settings_progress)
 abstract class SettingsProgressItem : EpoxyModelWithHolder<SettingsProgressItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsSectionTitleItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsSectionTitleItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsSectionTitleItem.kt
rename to vector/src/main/java/im/vector/app/features/discovery/SettingsSectionTitleItem.kt
index d8b6eb7daa..fe97984c8b 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsSectionTitleItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsSectionTitleItem.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import android.widget.TextView
 import androidx.annotation.StringRes
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_settings_section_title)
 abstract class SettingsSectionTitleItem : EpoxyModelWithHolder<SettingsSectionTitleItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsTextButtonSingleLineItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsTextButtonSingleLineItem.kt
rename to vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt
index 90a1a9ef99..b7d9997d46 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsTextButtonSingleLineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery
+package im.vector.app.features.discovery
 
 import android.widget.Button
 import android.widget.CompoundButton
@@ -27,18 +27,18 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.ClickListener
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.attributes.ButtonStyle
-import im.vector.riotx.core.epoxy.attributes.ButtonType
-import im.vector.riotx.core.epoxy.attributes.IconMode
-import im.vector.riotx.core.epoxy.onClick
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.attributes.ButtonStyle
+import im.vector.app.core.epoxy.attributes.ButtonType
+import im.vector.app.core.epoxy.attributes.IconMode
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.themes.ThemeUtils
 
 @EpoxyModelClass(layout = R.layout.item_settings_button_single_line)
 abstract class SettingsTextButtonSingleLineItem : EpoxyModelWithHolder<SettingsTextButtonSingleLineItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerAction.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerAction.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerAction.kt
rename to vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerAction.kt
index 14f149c282..11e2e8671f 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerAction.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.discovery.change
+package im.vector.app.features.discovery.change
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class SetIdentityServerAction : VectorViewModelAction {
     object UseDefaultIdentityServer : SetIdentityServerAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt
rename to vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
index 701c187cef..863270b762 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery.change
+package im.vector.app.features.discovery.change
 
 import android.app.Activity
 import android.content.Intent
@@ -26,16 +26,16 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.toReducedUrl
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.colorizeMatchingText
-import im.vector.riotx.features.discovery.DiscoverySharedViewModel
-import im.vector.riotx.features.terms.ReviewTermsActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.toReducedUrl
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.colorizeMatchingText
+import im.vector.app.features.discovery.DiscoverySharedViewModel
+import im.vector.app.features.terms.ReviewTermsActivity
+import org.matrix.android.sdk.api.session.terms.TermsService
 import kotlinx.android.synthetic.main.fragment_set_identity_server.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerState.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerState.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerState.kt
rename to vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerState.kt
index 2b76d21ce5..4c2f437e07 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerState.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.discovery.change
+package im.vector.app.features.discovery.change
 
 import com.airbnb.mvrx.MvRxState
 
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewEvents.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewEvents.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewEvents.kt
index b840afac11..dc33a9fa3e 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewEvents.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.discovery.change
+package im.vector.app.features.discovery.change
 
 import androidx.annotation.StringRes
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class SetIdentityServerViewEvents : VectorViewEvents {
     data class Loading(val message: CharSequence? = null) : SetIdentityServerViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt
rename to vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
index 9bec24548e..e7faf79f9d 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.discovery.change
+package im.vector.app.features.discovery.change
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -21,18 +21,18 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.identity.IdentityServiceError
-import im.vector.matrix.android.api.session.terms.GetTermsResponse
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.riotx.R
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.ensureProtocol
+import im.vector.app.R
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.ensureProtocol
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.identity.IdentityServiceError
+import org.matrix.android.sdk.api.session.terms.GetTermsResponse
+import org.matrix.android.sdk.api.session.terms.TermsService
+import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlinx.coroutines.launch
 import java.net.UnknownHostException
 
diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt
rename to vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index d31d2cca7e..f0c43228c1 100644
--- a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.form
+package im.vector.app.features.form
 
 import android.text.Editable
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.platform.SimpleTextWatcher
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input)
 abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt
rename to vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
index 799f6abe00..eadae3ba0c 100644
--- a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.form
+package im.vector.app.features.form
 
 import android.text.Editable
 import android.view.View
@@ -23,10 +23,10 @@ import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.platform.SimpleTextWatcher
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input_with_button)
 abstract class FormEditTextWithButtonItem : VectorEpoxyModel<FormEditTextWithButtonItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt b/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt
rename to vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
index 9f2c04eec5..08d1332920 100644
--- a/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.form
+package im.vector.app.features.form
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.switchmaterial.SwitchMaterial
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_form_switch)
 abstract class FormSwitchItem : VectorEpoxyModel<FormSwitchItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListAction.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListAction.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupListAction.kt
rename to vector/src/main/java/im/vector/app/features/grouplist/GroupListAction.kt
index 3697989af7..4d974b8ce8 100644
--- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListAction.kt
@@ -15,10 +15,10 @@
  *
  */
 
-package im.vector.riotx.features.grouplist
+package im.vector.app.features.grouplist
 
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 
 sealed class GroupListAction : VectorViewModelAction {
     data class SelectGroup(val groupSummary: GroupSummary) : GroupListAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListFragment.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupListFragment.kt
rename to vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt
index 66c4a2325b..434ab7f1ec 100644
--- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.features.grouplist
+package im.vector.app.features.grouplist
 
 import android.os.Bundle
 import android.view.View
@@ -23,15 +23,15 @@ import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.StateView
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.home.HomeActivitySharedAction
-import im.vector.riotx.features.home.HomeSharedActionViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.StateView
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.home.HomeActivitySharedAction
+import im.vector.app.features.home.HomeSharedActionViewModel
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import kotlinx.android.synthetic.main.fragment_group_list.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewEvents.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewEvents.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/grouplist/GroupListViewEvents.kt
index 3638934473..7cd12b8364 100644
--- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.grouplist
+package im.vector.app.features.grouplist
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for group list screen
diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewModel.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewModel.kt
rename to vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
index 4c8e5c2333..51831e8fb9 100644
--- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.features.grouplist
+package im.vector.app.features.grouplist
 
 import arrow.core.Option
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -23,18 +23,18 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.group.groupSummaryQueryParams
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.rx.rx
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.group.groupSummaryQueryParams
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.session.room.model.Membership
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
+import org.matrix.android.sdk.rx.rx
 
 const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
 
diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewState.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewState.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewState.kt
rename to vector/src/main/java/im/vector/app/features/grouplist/GroupListViewState.kt
index ef8fd6ea6f..4abcff2f67 100644
--- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewState.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.grouplist
+package im.vector.app.features.grouplist
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 
 data class GroupListViewState(
         val asyncGroups: Async<List<GroupSummary>> = Uninitialized,
diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryController.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryController.kt
rename to vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryController.kt
index bc8e87b023..03272c2729 100644
--- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryController.kt
@@ -15,12 +15,12 @@
  *
  */
 
-package im.vector.riotx.features.grouplist
+package im.vector.app.features.grouplist
 
 import com.airbnb.epoxy.EpoxyController
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class GroupSummaryController @Inject constructor(private val avatarRenderer: AvatarRenderer) : EpoxyController() {
diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryItem.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryItem.kt
rename to vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryItem.kt
index 129e562581..b74b30a059 100644
--- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryItem.kt
@@ -15,18 +15,18 @@
  *
  */
 
-package im.vector.riotx.features.grouplist
+package im.vector.app.features.grouplist
 
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.platform.CheckableConstraintLayout
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_group)
 abstract class GroupSummaryItem : VectorEpoxyModel<GroupSummaryItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/SelectedGroupDataSource.kt b/vector/src/main/java/im/vector/app/features/grouplist/SelectedGroupDataSource.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/grouplist/SelectedGroupDataSource.kt
rename to vector/src/main/java/im/vector/app/features/grouplist/SelectedGroupDataSource.kt
index a8f6b62cab..5a172e2636 100644
--- a/vector/src/main/java/im/vector/riotx/features/grouplist/SelectedGroupDataSource.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/SelectedGroupDataSource.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.grouplist
+package im.vector.app.features.grouplist
 
 import arrow.core.Option
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.riotx.core.utils.BehaviorDataSource
+import im.vector.app.core.utils.BehaviorDataSource
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt
rename to vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
index 3bf2f13d48..f53fa77791 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -28,14 +28,14 @@ import com.amulyakhare.textdrawable.TextDrawable
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.DrawableImageViewTarget
 import com.bumptech.glide.request.target.Target
-import im.vector.matrix.android.api.session.content.ContentUrlResolver
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.core.contacts.MappedContact
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.glide.GlideApp
-import im.vector.riotx.core.glide.GlideRequest
-import im.vector.riotx.core.glide.GlideRequests
-import im.vector.riotx.core.utils.getColorFromUserId
+import im.vector.app.core.contacts.MappedContact
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.glide.GlideRequest
+import im.vector.app.core.glide.GlideRequests
+import im.vector.app.core.utils.getColorFromUserId
+import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.api.util.MatrixItem
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index ef9bece7e6..62ae0bfc2c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import android.content.Context
 import android.content.Intent
@@ -29,29 +29,29 @@ import androidx.core.view.isVisible
 import androidx.drawerlayout.widget.DrawerLayout
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
-import im.vector.matrix.android.api.session.InitialSyncProgressService
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.features.disclaimer.showDisclaimerDialog
-import im.vector.riotx.features.notifications.NotificationDrawerManager
-import im.vector.riotx.features.popup.DefaultVectorAlert
-import im.vector.riotx.features.popup.PopupAlertManager
-import im.vector.riotx.features.popup.VerificationVectorAlert
-import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.settings.VectorSettingsActivity
-import im.vector.riotx.features.themes.ThemeUtils
-import im.vector.riotx.features.workers.signout.ServerBackupStatusViewModel
-import im.vector.riotx.features.workers.signout.ServerBackupStatusViewState
-import im.vector.riotx.push.fcm.FcmHelper
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.features.disclaimer.showDisclaimerDialog
+import im.vector.app.features.notifications.NotificationDrawerManager
+import im.vector.app.features.popup.DefaultVectorAlert
+import im.vector.app.features.popup.PopupAlertManager
+import im.vector.app.features.popup.VerificationVectorAlert
+import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorSettingsActivity
+import im.vector.app.features.themes.ThemeUtils
+import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
+import im.vector.app.features.workers.signout.ServerBackupStatusViewState
+import im.vector.app.push.fcm.FcmHelper
+import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.util.MatrixItem
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.activity_home.*
 import kotlinx.android.synthetic.main.merge_overlay_waiting_view.*
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivitySharedAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivitySharedAction.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
index 49c8de4d8f..52b3c58785 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivitySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
-import im.vector.riotx.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedAction
 
 /**
  * Supported navigation actions for [HomeActivity]
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewActions.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewActions.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt
index 605e0916c7..9df45e4553 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewActions.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class HomeActivityViewActions : VectorViewModelAction {
     object PushPromptHasBeenReviewed : HomeActivityViewActions()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
index 03004d0b73..be62997e0c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.util.MatrixItem
 
 sealed class HomeActivityViewEvents : VectorViewEvents {
     data class AskPasswordToInitCrossSigning(val userItem: MatrixItem.UserItem?) : HomeActivityViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index ba95d1d43d..46ae65ec02 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.MvRx
@@ -22,22 +22,22 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.pushrules.RuleIds
-import im.vector.matrix.android.api.session.InitialSyncProgressService
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.roomSummaryQueryParams
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
-import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.rx.asObservable
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.login.ReAuthHelper
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.login.ReAuthHelper
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.rx.asObservable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewState.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
index 2b29305c71..0f80fa29ef 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import com.airbnb.mvrx.MvRxState
-import im.vector.matrix.android.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.session.InitialSyncProgressService
 
 data class HomeActivityViewState(
         val initialSyncProgressServiceStatus: InitialSyncProgressService.Status = InitialSyncProgressService.Status.Idle
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeDetailAction.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt
index 3309f987fd..447820ed7b 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class HomeDetailAction : VectorViewModelAction {
     data class SwitchDisplayMode(val displayMode: RoomListDisplayMode) : HomeDetailAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 65a599665e..7b8f1148c9 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import android.os.Bundle
 import android.view.View
@@ -24,31 +24,31 @@ import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.badge.BadgeDrawable
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.commitTransaction
-import im.vector.riotx.core.glide.GlideApp
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.ui.views.ActiveCallView
-import im.vector.riotx.core.ui.views.ActiveCallViewHolder
-import im.vector.riotx.core.ui.views.KeysBackupBanner
-import im.vector.riotx.features.call.SharedActiveCallViewModel
-import im.vector.riotx.features.call.VectorCallActivity
-import im.vector.riotx.features.call.WebRtcPeerConnectionManager
-import im.vector.riotx.features.home.room.list.RoomListFragment
-import im.vector.riotx.features.home.room.list.RoomListParams
-import im.vector.riotx.features.popup.PopupAlertManager
-import im.vector.riotx.features.popup.VerificationVectorAlert
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.settings.VectorSettingsActivity.Companion.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS
-import im.vector.riotx.features.themes.ThemeUtils
-import im.vector.riotx.features.workers.signout.BannerState
-import im.vector.riotx.features.workers.signout.ServerBackupStatusViewModel
-import im.vector.riotx.features.workers.signout.ServerBackupStatusViewState
+import im.vector.app.R
+import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.ui.views.ActiveCallView
+import im.vector.app.core.ui.views.ActiveCallViewHolder
+import im.vector.app.core.ui.views.KeysBackupBanner
+import im.vector.app.features.call.SharedActiveCallViewModel
+import im.vector.app.features.call.VectorCallActivity
+import im.vector.app.features.call.WebRtcPeerConnectionManager
+import im.vector.app.features.home.room.list.RoomListFragment
+import im.vector.app.features.home.room.list.RoomListParams
+import im.vector.app.features.popup.PopupAlertManager
+import im.vector.app.features.popup.VerificationVectorAlert
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorSettingsActivity.Companion.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS
+import im.vector.app.features.themes.ThemeUtils
+import im.vector.app.features.workers.signout.BannerState
+import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
+import im.vector.app.features.workers.signout.ServerBackupStatusViewState
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import kotlinx.android.synthetic.main.fragment_home_detail.*
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 98bd3a76ab..c381f998c7 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.grouplist.SelectedGroupDataSource
-import im.vector.riotx.features.ui.UiStateRepository
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.grouplist.SelectedGroupDataSource
+import im.vector.app.features.ui.UiStateRepository
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.Membership
 import io.reactivex.schedulers.Schedulers
+import org.matrix.android.sdk.rx.rx
 
 /**
  * View model used to update the home bottom bar notification counts, observe the sync state and
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
index a9a838195b..f5e4bc9fa3 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import arrow.core.Option
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.sync.SyncState
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.sync.SyncState
 
 data class HomeDetailViewState(
         val groupSummary: Option<GroupSummary> = Option.empty(),
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index 3439b1793c..3344989b0a 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import android.os.Bundle
 import android.view.View
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.observeK
-import im.vector.riotx.core.extensions.replaceChildFragment
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.grouplist.GroupListFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.observeK
+import im.vector.app.core.extensions.replaceChildFragment
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.grouplist.GroupListFragment
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.toMatrixItem
 import kotlinx.android.synthetic.main.fragment_home_drawer.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt b/vector/src/main/java/im/vector/app/features/home/HomeModule.kt
similarity index 80%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeModule.kt
index ba6949c2bf..5c34d0715d 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeModule.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import android.os.Handler
 import dagger.Module
 import dagger.Provides
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventControllerHandler
-import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineAsyncHelper
+import im.vector.app.features.home.room.detail.timeline.TimelineEventControllerHandler
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineAsyncHelper
 
 @Module
 object HomeModule {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListDataSource.kt b/vector/src/main/java/im/vector/app/features/home/HomeRoomListDataSource.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeRoomListDataSource.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeRoomListDataSource.kt
index c27a58d177..6bcd6f01eb 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListDataSource.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeRoomListDataSource.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.core.utils.BehaviorDataSource
+import im.vector.app.core.utils.BehaviorDataSource
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/HomeSharedActionViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt
index cd81448a0a..58747a4c18 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
-import im.vector.riotx.core.platform.VectorSharedActionViewModel
+import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 class HomeSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<HomeActivitySharedAction>()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt b/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt
rename to vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt
index e376514955..b3c80b3642 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import android.graphics.drawable.AnimationDrawable
 import android.os.Bundle
 import android.view.View
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_loading.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/RoomColor.kt b/vector/src/main/java/im/vector/app/features/home/RoomColor.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/RoomColor.kt
rename to vector/src/main/java/im/vector/app/features/home/RoomColor.kt
index 0b3fd5396f..88ec582c92 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/RoomColor.kt
+++ b/vector/src/main/java/im/vector/app/features/home/RoomColor.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import androidx.annotation.ColorRes
-import im.vector.riotx.R
+import im.vector.app.R
 
 @ColorRes
 fun getColorFromRoomId(roomId: String?): Int {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/RoomListDisplayMode.kt b/vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/RoomListDisplayMode.kt
rename to vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
index 365eda74a8..d52d4be6dd 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/RoomListDisplayMode.kt
+++ b/vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import androidx.annotation.StringRes
-import im.vector.riotx.R
+import im.vector.app.R
 
 enum class RoomListDisplayMode(@StringRes val titleRes: Int) {
         NOTIFICATIONS(R.string.bottom_action_notification),
diff --git a/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt
rename to vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
index 805014a81e..ad0209845f 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import android.content.Context
 import android.content.pm.ShortcutManager
 import android.graphics.Bitmap
 import android.os.Build
+import androidx.core.content.getSystemService
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.core.glide.GlideApp
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.features.home.room.detail.RoomDetailActivity
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.home.room.detail.RoomDetailActivity
+import org.matrix.android.sdk.api.util.toMatrixItem
 import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
@@ -60,7 +61,7 @@ class ShortcutsHandler @Inject constructor(
 
         return homeRoomListStore
                 .observe()
-                .distinct()
+                .distinctUntilChanged()
                 .observeOn(Schedulers.computation())
                 .subscribe { rooms ->
                     val shortcuts = rooms
@@ -96,7 +97,7 @@ class ShortcutsHandler @Inject constructor(
         // We can only disabled pinned shortcuts with the API, but at least it will prevent the crash
         if (ShortcutManagerCompat.isRequestPinShortcutSupported(context)) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-                context.getSystemService(ShortcutManager::class.java)
+                context.getSystemService<ShortcutManager>()
                         ?.let {
                             it.disableShortcuts(it.pinnedShortcuts.map { pinnedShortcut -> pinnedShortcut.id })
                         }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/UnknownDeviceDetectorSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/UnknownDeviceDetectorSharedViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
index a61d726ac7..eeb1639045 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/UnknownDeviceDetectorSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.Async
@@ -26,22 +26,22 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.android.internal.crypto.store.PrivateKeysInfo
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.platform.VectorViewModelAction
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
 import io.reactivex.Observable
 import io.reactivex.functions.Function3
+import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
@@ -100,7 +100,7 @@ class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(@Assisted
 
         Observable.combineLatest<List<CryptoDeviceInfo>, List<DeviceInfo>, Optional<PrivateKeysInfo>, List<DeviceDetectionInfo>>(
                 session.rx().liveUserCryptoDevices(session.myUserId),
-                session.rx().liveMyDeviceInfo(),
+                session.rx().liveMyDevicesInfo(),
                 session.rx().liveCrossSigningPrivateKeys(),
                 Function3 { cryptoList, infoList, pInfo ->
                     //                    Timber.v("## Detector trigger ${cryptoList.map { "${it.deviceId} ${it.trustLevel}" }}")
@@ -133,12 +133,13 @@ class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(@Assisted
                 }
 
         session.rx().liveUserCryptoDevices(session.myUserId)
-                .distinct()
+                .distinctUntilChanged()
                 .throttleLast(5_000, TimeUnit.MILLISECONDS)
                 .subscribe {
                     // If we have a new crypto device change, we might want to trigger refresh of device info
                     session.cryptoService().fetchDevicesList(NoOpMatrixCallback())
-                }.disposeOnClear()
+                }
+                .disposeOnClear()
 
         // trigger a refresh of lastSeen / last Ip
         session.cryptoService().fetchDevicesList(NoOpMatrixCallback())
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt
rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt
index 2e849dfe38..86494ffbed 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.breadcrumbs
+package im.vector.app.features.home.room.breadcrumbs
 
 import androidx.recyclerview.widget.DefaultItemAnimator
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsController.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsController.kt
rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt
index df0f0845b5..4e6bb124ad 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.breadcrumbs
+package im.vector.app.features.home.room.breadcrumbs
 
 import android.view.View
 import com.airbnb.epoxy.EpoxyController
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.core.epoxy.zeroItem
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.core.epoxy.zeroItem
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class BreadcrumbsController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsFragment.kt
rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt
index 6bae5b604f..c147985809 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.breadcrumbs
+package im.vector.app.features.home.room.breadcrumbs
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.home.room.detail.RoomDetailSharedAction
-import im.vector.riotx.features.home.room.detail.RoomDetailSharedActionViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.home.room.detail.RoomDetailSharedAction
+import im.vector.app.features.home.room.detail.RoomDetailSharedActionViewModel
 import kotlinx.android.synthetic.main.fragment_breadcrumbs.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
index 3e97c6103c..e1343f6f51 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.breadcrumbs
+package im.vector.app.features.home.room.breadcrumbs
 
 import android.view.View
 import android.view.ViewGroup
@@ -22,12 +22,12 @@ import android.widget.ImageView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_breadcrumbs)
 abstract class BreadcrumbsItem : VectorEpoxyModel<BreadcrumbsItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
index 2e847176ff..4ddc4bf972 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.breadcrumbs
+package im.vector.app.features.home.room.breadcrumbs
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.roomSummaryQueryParams
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import io.reactivex.schedulers.Schedulers
+import org.matrix.android.sdk.rx.rx
 
 class BreadcrumbsViewModel @AssistedInject constructor(@Assisted initialState: BreadcrumbsViewState,
                                                        private val session: Session)
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewState.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewState.kt
rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewState.kt
index 7cc634c8b0..f067591e83 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewState.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.breadcrumbs
+package im.vector.app.features.home.room.breadcrumbs
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 data class BreadcrumbsViewState(
         val asyncBreadcrumbs: Async<List<RoomSummary>> = Uninitialized
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/AutoCompleter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/AutoCompleter.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
index edc77bc83e..d560a675fe 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/AutoCompleter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
@@ -26,25 +26,25 @@ import com.otaliastudios.autocomplete.AutocompleteCallback
 import com.otaliastudios.autocomplete.CharPolicy
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.matrix.android.api.util.toRoomAliasMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.glide.GlideApp
-import im.vector.riotx.core.glide.GlideRequests
-import im.vector.riotx.features.autocomplete.command.AutocompleteCommandPresenter
-import im.vector.riotx.features.autocomplete.command.CommandAutocompletePolicy
-import im.vector.riotx.features.autocomplete.emoji.AutocompleteEmojiPresenter
-import im.vector.riotx.features.autocomplete.group.AutocompleteGroupPresenter
-import im.vector.riotx.features.autocomplete.member.AutocompleteMemberPresenter
-import im.vector.riotx.features.autocomplete.room.AutocompleteRoomPresenter
-import im.vector.riotx.features.command.Command
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.html.PillImageSpan
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.glide.GlideRequests
+import im.vector.app.features.autocomplete.command.AutocompleteCommandPresenter
+import im.vector.app.features.autocomplete.command.CommandAutocompletePolicy
+import im.vector.app.features.autocomplete.emoji.AutocompleteEmojiPresenter
+import im.vector.app.features.autocomplete.group.AutocompleteGroupPresenter
+import im.vector.app.features.autocomplete.member.AutocompleteMemberPresenter
+import im.vector.app.features.autocomplete.room.AutocompleteRoomPresenter
+import im.vector.app.features.command.Command
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.html.PillImageSpan
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.api.util.toRoomAliasMatrixItem
 
 class AutoCompleter @AssistedInject constructor(
         @Assisted val roomId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/JumpToBottomViewVisibilityManager.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
index 50a28b8a8b..d3f9b6eda5 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import im.vector.riotx.core.utils.Debouncer
+import im.vector.app.core.utils.Debouncer
 
 /**
  * Show or hide the jumpToBottomView, depending on the scrolling and if the timeline is displaying the more recent event
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
similarity index 80%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailAction.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index c664e7e62c..f287017b02 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.message.MessageStickerContent
-import im.vector.matrix.android.api.session.room.model.message.MessageWithAttachmentContent
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 
 sealed class RoomDetailAction : VectorViewModelAction {
     data class UserIsTyping(val isTyping: Boolean) : RoomDetailAction()
@@ -80,4 +81,10 @@ sealed class RoomDetailAction : VectorViewModelAction {
 
     object SelectStickerAttachment : RoomDetailAction()
     object OpenIntegrationManager: RoomDetailAction()
+    object ManageIntegrations: RoomDetailAction()
+    data class AddJitsiWidget(val withVideo: Boolean): RoomDetailAction()
+    data class RemoveWidget(val widgetId: String): RoomDetailAction()
+    data class EnsureNativeWidgetAllowed(val widget: Widget,
+                                         val userJustAccepted: Boolean,
+                                         val grantedEvents: RoomDetailViewEvents) : RoomDetailAction()
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
index cd36222d9a..aa608ef4ef 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
 import android.content.Context
 import android.content.Intent
@@ -24,17 +24,19 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import com.airbnb.mvrx.viewModel
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.home.room.breadcrumbs.BreadcrumbsFragment
-import im.vector.riotx.features.room.RequireActiveMembershipAction
-import im.vector.riotx.features.room.RequireActiveMembershipViewEvents
-import im.vector.riotx.features.room.RequireActiveMembershipViewModel
-import im.vector.riotx.features.room.RequireActiveMembershipViewState
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment
+import im.vector.app.features.room.RequireActiveMembershipAction
+import im.vector.app.features.room.RequireActiveMembershipViewEvents
+import im.vector.app.features.room.RequireActiveMembershipViewModel
+import im.vector.app.features.room.RequireActiveMembershipViewState
+import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewModel
+import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewState
 import kotlinx.android.synthetic.main.activity_room_detail.*
 import kotlinx.android.synthetic.main.merge_overlay_waiting_view.*
 import javax.inject.Inject
@@ -42,7 +44,8 @@ import javax.inject.Inject
 class RoomDetailActivity :
         VectorBaseActivity(),
         ToolbarConfigurable,
-        RequireActiveMembershipViewModel.Factory {
+        RequireActiveMembershipViewModel.Factory,
+        RoomWidgetPermissionViewModel.Factory {
 
     override fun getLayoutRes() = R.layout.activity_room_detail
 
@@ -57,6 +60,12 @@ class RoomDetailActivity :
         return requireActiveMembershipViewModelFactory.create(initialState.copy(roomId = currentRoomId ?: ""))
     }
 
+    @Inject
+    lateinit var permissionsViewModelFactory: RoomWidgetPermissionViewModel.Factory
+    override fun create(initialState: RoomWidgetPermissionViewState): RoomWidgetPermissionViewModel {
+        return permissionsViewModelFactory.create(initialState)
+    }
+
     override fun injectWith(injector: ScreenComponent) {
         super.injectWith(injector)
         injector.inject(this)
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
similarity index 80%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 3c65b6281f..040a5191e4 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
 import android.annotation.SuppressLint
 import android.app.Activity.RESULT_OK
@@ -29,8 +29,11 @@ import android.text.Spannable
 import android.view.HapticFeedbackConstants
 import android.view.LayoutInflater
 import android.view.Menu
+import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
@@ -61,120 +64,96 @@ import com.airbnb.mvrx.withState
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.TextInputEditText
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.permalinks.PermalinkFactory
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageFormat
-import im.vector.matrix.android.api.session.room.model.message.MessageImageInfoContent
-import im.vector.matrix.android.api.session.room.model.message.MessageStickerContent
-import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationRequestContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent
-import im.vector.matrix.android.api.session.room.model.message.MessageWithAttachmentContent
-import im.vector.matrix.android.api.session.room.model.message.getFileUrl
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent
-import im.vector.matrix.android.api.session.widgets.model.WidgetType
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode
-import im.vector.riotx.R
-import im.vector.riotx.core.dialogs.ConfirmationDialogBuilder
-import im.vector.riotx.core.dialogs.withColoredButton
-import im.vector.riotx.core.epoxy.LayoutManagerStateRestorer
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.extensions.showKeyboard
-import im.vector.riotx.core.extensions.trackItemsVisibilityChange
-import im.vector.riotx.core.glide.GlideApp
-import im.vector.riotx.core.intent.getMimeTypeFromUri
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.ui.views.ActiveCallView
-import im.vector.riotx.core.ui.views.ActiveCallViewHolder
-import im.vector.riotx.core.ui.views.JumpToReadMarkerView
-import im.vector.riotx.core.ui.views.NotificationAreaView
-import im.vector.riotx.core.utils.Debouncer
-import im.vector.riotx.core.utils.KeyboardStateUtils
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_WRITING_FILES
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_INCOMING_URI
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_PICK_ATTACHMENT
-import im.vector.riotx.core.utils.TextUtils
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.core.utils.colorizeMatchingText
-import im.vector.riotx.core.utils.copyToClipboard
-import im.vector.riotx.core.utils.createJSonViewerStyleProvider
-import im.vector.riotx.core.utils.createUIHandler
-import im.vector.riotx.core.utils.getColorFromUserId
-import im.vector.riotx.core.utils.isValidUrl
-import im.vector.riotx.core.utils.onPermissionResultAudioIpCall
-import im.vector.riotx.core.utils.onPermissionResultVideoIpCall
-import im.vector.riotx.core.utils.openUrlInExternalBrowser
-import im.vector.riotx.core.utils.saveMedia
-import im.vector.riotx.core.utils.shareMedia
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.attachments.AttachmentTypeSelectorView
-import im.vector.riotx.features.attachments.AttachmentsHelper
-import im.vector.riotx.features.attachments.ContactAttachment
-import im.vector.riotx.features.attachments.preview.AttachmentsPreviewActivity
-import im.vector.riotx.features.attachments.preview.AttachmentsPreviewArgs
-import im.vector.riotx.features.attachments.toGroupedContentAttachmentData
-import im.vector.riotx.features.call.SharedActiveCallViewModel
-import im.vector.riotx.features.call.VectorCallActivity
-import im.vector.riotx.features.call.WebRtcPeerConnectionManager
-import im.vector.riotx.features.command.Command
-import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreActivity
-import im.vector.riotx.features.crypto.util.toImageRes
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheet
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.composer.TextComposerView
-import im.vector.riotx.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.action.EventSharedAction
-import im.vector.riotx.features.home.room.detail.timeline.action.MessageActionsBottomSheet
-import im.vector.riotx.features.home.room.detail.timeline.action.MessageSharedActionViewModel
-import im.vector.riotx.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet
-import im.vector.riotx.features.home.room.detail.timeline.item.AbsMessageItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageFileItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageImageVideoItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageTextItem
-import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData
-import im.vector.riotx.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet
-import im.vector.riotx.features.home.room.detail.widget.RoomWidgetsBannerView
-import im.vector.riotx.features.home.room.detail.widget.RoomWidgetsBottomSheet
-import im.vector.riotx.features.home.room.detail.widget.WidgetRequestCodes
-import im.vector.riotx.features.html.EventHtmlRenderer
-import im.vector.riotx.features.html.PillImageSpan
-import im.vector.riotx.features.invite.VectorInviteView
-import im.vector.riotx.features.media.ImageContentRenderer
-import im.vector.riotx.features.media.VideoContentRenderer
-import im.vector.riotx.features.notifications.NotificationDrawerManager
-import im.vector.riotx.features.notifications.NotificationUtils
-import im.vector.riotx.features.permalink.NavigationInterceptor
-import im.vector.riotx.features.permalink.PermalinkHandler
-import im.vector.riotx.features.reactions.EmojiReactionPickerActivity
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.settings.VectorSettingsActivity
-import im.vector.riotx.features.share.SharedData
-import im.vector.riotx.features.themes.ThemeUtils
-import im.vector.riotx.features.widgets.WidgetActivity
+import im.vector.app.R
+import im.vector.app.core.dialogs.ConfirmationDialogBuilder
+import im.vector.app.core.dialogs.withColoredButton
+import im.vector.app.core.epoxy.LayoutManagerStateRestorer
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.extensions.showKeyboard
+import im.vector.app.core.extensions.trackItemsVisibilityChange
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.intent.getMimeTypeFromUri
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.ui.views.ActiveCallView
+import im.vector.app.core.ui.views.ActiveCallViewHolder
+import im.vector.app.core.ui.views.ActiveConferenceView
+import im.vector.app.core.ui.views.JumpToReadMarkerView
+import im.vector.app.core.ui.views.NotificationAreaView
+import im.vector.app.core.utils.Debouncer
+import im.vector.app.core.utils.KeyboardStateUtils
+import im.vector.app.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL
+import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL
+import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_INCOMING_URI
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_PICK_ATTACHMENT
+import im.vector.app.core.utils.TextUtils
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.core.utils.colorizeMatchingText
+import im.vector.app.core.utils.copyToClipboard
+import im.vector.app.core.utils.createJSonViewerStyleProvider
+import im.vector.app.core.utils.createUIHandler
+import im.vector.app.core.utils.getColorFromUserId
+import im.vector.app.core.utils.isValidUrl
+import im.vector.app.core.utils.onPermissionResultAudioIpCall
+import im.vector.app.core.utils.onPermissionResultVideoIpCall
+import im.vector.app.core.utils.openUrlInExternalBrowser
+import im.vector.app.core.utils.saveMedia
+import im.vector.app.core.utils.shareMedia
+import im.vector.app.core.utils.toast
+import im.vector.app.features.attachments.AttachmentTypeSelectorView
+import im.vector.app.features.attachments.AttachmentsHelper
+import im.vector.app.features.attachments.ContactAttachment
+import im.vector.app.features.attachments.preview.AttachmentsPreviewActivity
+import im.vector.app.features.attachments.preview.AttachmentsPreviewArgs
+import im.vector.app.features.attachments.toGroupedContentAttachmentData
+import im.vector.app.features.call.SharedActiveCallViewModel
+import im.vector.app.features.call.VectorCallActivity
+import im.vector.app.features.call.WebRtcPeerConnectionManager
+import im.vector.app.features.call.conference.JitsiCallViewModel
+import im.vector.app.features.command.Command
+import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreActivity
+import im.vector.app.features.crypto.util.toImageRes
+import im.vector.app.features.crypto.verification.VerificationBottomSheet
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.composer.TextComposerView
+import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.action.EventSharedAction
+import im.vector.app.features.home.room.detail.timeline.action.MessageActionsBottomSheet
+import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel
+import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet
+import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.features.home.room.detail.timeline.item.MessageTextItem
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
+import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet
+import im.vector.app.features.home.room.detail.widget.RoomWidgetsBottomSheet
+import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
+import im.vector.app.features.html.EventHtmlRenderer
+import im.vector.app.features.html.PillImageSpan
+import im.vector.app.features.invite.VectorInviteView
+import im.vector.app.features.media.ImageContentRenderer
+import im.vector.app.features.media.VideoContentRenderer
+import im.vector.app.features.notifications.NotificationDrawerManager
+import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.features.permalink.NavigationInterceptor
+import im.vector.app.features.permalink.PermalinkHandler
+import im.vector.app.features.reactions.EmojiReactionPickerActivity
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorSettingsActivity
+import im.vector.app.features.share.SharedData
+import im.vector.app.features.themes.ThemeUtils
+import im.vector.app.features.widgets.WidgetActivity
+import im.vector.app.features.widgets.WidgetArgs
+import im.vector.app.features.widgets.WidgetKind
+import im.vector.app.features.widgets.permissions.RoomWidgetPermissionBottomSheet
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.parcel.Parcelize
@@ -183,6 +162,34 @@ import kotlinx.android.synthetic.main.merge_composer_layout.view.*
 import kotlinx.android.synthetic.main.merge_overlay_waiting_view.*
 import org.billcarsonfr.jsonviewer.JSonViewerDialog
 import org.commonmark.parser.Parser
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
 import timber.log.Timber
 import java.io.File
 import java.net.URL
@@ -217,7 +224,7 @@ class RoomDetailFragment @Inject constructor(
         JumpToReadMarkerView.Callback,
         AttachmentTypeSelectorView.Callback,
         AttachmentsHelper.Callback,
-        RoomWidgetsBannerView.Callback,
+//        RoomWidgetsBannerView.Callback,
         ActiveCallView.Callback {
 
     companion object {
@@ -292,7 +299,7 @@ class RoomDetailFragment @Inject constructor(
         setupJumpToReadMarkerView()
         setupActiveCallView()
         setupJumpToBottomView()
-        setupWidgetsBannerView()
+        setupConfBannerView()
 
         roomToolbarContentView.debouncedClicks {
             navigator.openRoomProfile(requireActivity(), roomDetailArgs.roomId)
@@ -350,10 +357,44 @@ class RoomDetailFragment @Inject constructor(
                 is RoomDetailViewEvents.DisplayEnableIntegrationsWarning -> displayDisabledIntegrationDialog()
                 is RoomDetailViewEvents.OpenIntegrationManager           -> openIntegrationManager()
                 is RoomDetailViewEvents.OpenFile                         -> startOpenFileIntent(it)
+                RoomDetailViewEvents.OpenActiveWidgetBottomSheet         -> onViewWidgetsClicked()
+                is RoomDetailViewEvents.ShowInfoOkDialog                 -> showDialogWithMessage(it.message)
+                is RoomDetailViewEvents.JoinJitsiConference              -> joinJitsiRoom(it.widget, it.withVideo)
+                RoomDetailViewEvents.ShowWaitingView                     -> vectorBaseActivity.showWaitingView()
+                RoomDetailViewEvents.HideWaitingView                     -> vectorBaseActivity.hideWaitingView()
+                is RoomDetailViewEvents.RequestNativeWidgetPermission    -> requestNativeWidgetPermission(it)
             }.exhaustive
         }
     }
 
+    private fun requestNativeWidgetPermission(it: RoomDetailViewEvents.RequestNativeWidgetPermission) {
+        val tag = RoomWidgetPermissionBottomSheet::class.java.name
+        val dFrag = childFragmentManager.findFragmentByTag(tag) as? RoomWidgetPermissionBottomSheet
+        if (dFrag != null && dFrag.dialog?.isShowing == true && !dFrag.isRemoving) {
+            return
+        } else {
+            RoomWidgetPermissionBottomSheet.newInstance(
+                    WidgetArgs(
+                            baseUrl = it.domain,
+                            kind = WidgetKind.ROOM,
+                            roomId = roomDetailArgs.roomId,
+                            widgetId = it.widget.widgetId
+                    )
+            ).apply {
+                directListener = { granted ->
+                    if (granted) {
+                        roomDetailViewModel.handle(RoomDetailAction.EnsureNativeWidgetAllowed(
+                                widget = it.widget,
+                                userJustAccepted = true,
+                                grantedEvents = it.grantedEvents
+                        ))
+                    }
+                }
+            }
+                    .show(childFragmentManager, tag)
+        }
+    }
+
     private fun openIntegrationManager(screen: String? = null) {
         navigator.openIntegrationManager(
                 fragment = this,
@@ -363,8 +404,33 @@ class RoomDetailFragment @Inject constructor(
         )
     }
 
-    private fun setupWidgetsBannerView() {
-        roomWidgetsBannerView.callback = this
+    private fun setupConfBannerView() {
+        activeConferenceView.callback = object : ActiveConferenceView.Callback {
+            override fun onTapJoinAudio(jitsiWidget: Widget) {
+                // need to check if allowed first
+                roomDetailViewModel.handle(RoomDetailAction.EnsureNativeWidgetAllowed(
+                        widget = jitsiWidget,
+                        userJustAccepted = false,
+                        grantedEvents = RoomDetailViewEvents.JoinJitsiConference(jitsiWidget, false))
+                )
+            }
+
+            override fun onTapJoinVideo(jitsiWidget: Widget) {
+                roomDetailViewModel.handle(RoomDetailAction.EnsureNativeWidgetAllowed(
+                        widget = jitsiWidget,
+                        userJustAccepted = false,
+                        grantedEvents = RoomDetailViewEvents.JoinJitsiConference(jitsiWidget, true))
+                )
+            }
+
+            override fun onDelete(jitsiWidget: Widget) {
+                roomDetailViewModel.handle(RoomDetailAction.RemoveWidget(jitsiWidget.widgetId))
+            }
+        }
+    }
+
+    private fun joinJitsiRoom(jitsiWidget: Widget, enableVideo: Boolean) {
+        navigator.openRoomWidget(requireContext(), roomDetailArgs.roomId, jitsiWidget, mapOf(JitsiCallViewModel.ENABLE_VIDEO_OPTION to enableVideo))
     }
 
     private fun openStickerPicker(event: RoomDetailViewEvents.OpenStickerPicker) {
@@ -529,10 +595,40 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        // We use a custom layout for this menu item, so we need to set a ClickListener
+        menu.findItem(R.id.open_matrix_apps)?.let { menuItem ->
+            menuItem.actionView.setOnClickListener {
+                onOptionsItemSelected(menuItem)
+            }
+        }
+    }
+
     override fun onPrepareOptionsMenu(menu: Menu) {
         menu.forEach {
             it.isVisible = roomDetailViewModel.isMenuItemVisible(it.itemId)
         }
+        withState(roomDetailViewModel) { state ->
+            val matrixAppsMenuItem = menu.findItem(R.id.open_matrix_apps)
+            val widgetsCount = state.activeRoomWidgets.invoke()?.size ?: 0
+            if (widgetsCount > 0) {
+                val actionView = matrixAppsMenuItem.actionView
+                actionView
+                        .findViewById<ImageView>(R.id.action_view_icon_image)
+                        .setColorFilter(ContextCompat.getColor(requireContext(), R.color.riotx_accent))
+                actionView.findViewById<TextView>(R.id.cart_badge).setTextOrHide("$widgetsCount")
+                matrixAppsMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
+            } else {
+                // icon should be default color no badge
+                val actionView = matrixAppsMenuItem.actionView
+                actionView
+                        .findViewById<ImageView>(R.id.action_view_icon_image)
+                        .setColorFilter(ThemeUtils.getColor(requireContext(), R.attr.riotx_text_secondary))
+                actionView.findViewById<TextView>(R.id.cart_badge).isVisible = false
+                matrixAppsMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+            }
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -549,26 +645,12 @@ class RoomDetailFragment @Inject constructor(
                 true
             }
             R.id.open_matrix_apps    -> {
-                roomDetailViewModel.handle(RoomDetailAction.OpenIntegrationManager)
+                roomDetailViewModel.handle(RoomDetailAction.ManageIntegrations)
                 true
             }
             R.id.voice_call,
             R.id.video_call          -> {
-                val activeCall = sharedCallActionViewModel.activeCall.value
-                val isVideoCall = item.itemId == R.id.video_call
-                if (activeCall != null) {
-                    // resume existing if same room, if not prompt to kill and then restart new call?
-                    if (activeCall.roomId == roomDetailArgs.roomId) {
-                        onTapToReturnToCall()
-                    }
-//                        else {
-                    // TODO might not work well, and should prompt
-//                            webRtcPeerConnectionManager.endCall()
-//                            safeStartCall(it, isVideoCall)
-//                        }
-                } else {
-                    safeStartCall(isVideoCall)
-                }
+                handleCallRequest(item)
                 true
             }
             R.id.hangup_call         -> {
@@ -579,6 +661,62 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
+    private fun handleCallRequest(item: MenuItem) = withState(roomDetailViewModel) { state ->
+        val roomSummary = state.asyncRoomSummary.invoke() ?: return@withState
+        val isVideoCall = item.itemId == R.id.video_call
+        when (roomSummary.joinedMembersCount) {
+            1    -> {
+                val pendingInvite = roomSummary.invitedMembersCount ?: 0 > 0
+                if (pendingInvite) {
+                    // wait for other to join
+                    showDialogWithMessage(getString(R.string.cannot_call_yourself_with_invite))
+                } else {
+                    // You cannot place a call with yourself.
+                    showDialogWithMessage(getString(R.string.cannot_call_yourself))
+                }
+            }
+            2    -> {
+                val activeCall = sharedCallActionViewModel.activeCall.value
+                if (activeCall != null) {
+                    // resume existing if same room, if not prompt to kill and then restart new call?
+                    if (activeCall.roomId == roomDetailArgs.roomId) {
+                        onTapToReturnToCall()
+                    }
+                    //                        else {
+                    // TODO might not work well, and should prompt
+                    //                            webRtcPeerConnectionManager.endCall()
+                    //                            safeStartCall(it, isVideoCall)
+                    //                        }
+                } else {
+                    safeStartCall(isVideoCall)
+                }
+            }
+            else -> {
+                // it's jitsi call
+                // can you add widgets??
+                if (!state.isAllowedToManageWidgets) {
+                    // You do not have permission to start a conference call in this room
+                    showDialogWithMessage(getString(R.string.no_permissions_to_start_conf_call))
+                } else {
+                    if (state.activeRoomWidgets()?.filter { it.type == WidgetType.Jitsi }?.any() == true) {
+                        // A conference is already in progress!
+                        showDialogWithMessage(getString(R.string.conference_call_in_progress))
+                    } else {
+                        AlertDialog.Builder(requireContext())
+                                .setTitle(if (isVideoCall) R.string.video_meeting else R.string.audio_meeting)
+                                .setMessage(R.string.audio_video_meeting_description)
+                                .setPositiveButton(getString(R.string.create)) { _, _ ->
+                                    // create the widget, then navigate to it..
+                                    roomDetailViewModel.handle(RoomDetailAction.AddJitsiWidget(isVideoCall))
+                                }
+                                .setNegativeButton(getString(R.string.cancel), null)
+                                .show()
+                    }
+                }
+            }
+        }
+    }
+
     private fun displayDisabledIntegrationDialog() {
         AlertDialog.Builder(requireActivity())
                 .setTitle(R.string.disabled_integration_dialog_title)
@@ -591,6 +729,20 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun safeStartCall(isVideoCall: Boolean) {
+        if (vectorPreferences.preventAccidentalCall()) {
+            AlertDialog.Builder(requireActivity())
+                    .setMessage(if (isVideoCall) R.string.start_video_call_prompt_msg else R.string.start_voice_call_prompt_msg)
+                    .setPositiveButton(if (isVideoCall) R.string.start_video_call else R.string.start_voice_call) { _, _ ->
+                        safeStartCall2(isVideoCall)
+                    }
+                    .setNegativeButton(R.string.cancel, null)
+                    .show()
+        } else {
+            safeStartCall2(isVideoCall)
+        }
+    }
+
+    private fun safeStartCall2(isVideoCall: Boolean) {
         val startCallAction = RoomDetailAction.StartCall(isVideoCall)
         roomDetailViewModel.pendingAction = startCallAction
         if (isVideoCall) {
@@ -857,9 +1009,9 @@ class RoomDetailFragment @Inject constructor(
         invalidateOptionsMenu()
         val summary = state.asyncRoomSummary()
         renderToolbar(summary, state.typingMessage)
+        activeConferenceView.render(state)
         val inviter = state.asyncInviter()
         if (summary?.membership == Membership.JOIN) {
-            roomWidgetsBannerView.render(state.activeRoomWidgets())
             jumpToBottomView.count = summary.notificationCount
             jumpToBottomView.drawBadge = summary.hasUnreadMessages
             scrollOnHighlightedEventCallback.timeline = roomDetailViewModel.timeline
@@ -1097,7 +1249,7 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
-    // TimelineEventController.Callback ************************************************************
+// TimelineEventController.Callback ************************************************************
 
     override fun onUrlClicked(url: String, title: String): Boolean {
         permalinkHandler
@@ -1455,7 +1607,7 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.EnterReplyMode(action.eventId, composerLayout.text.toString()))
             }
             is EventSharedAction.CopyPermalink              -> {
-                val permalink = PermalinkFactory.createPermalink(roomDetailArgs.roomId, action.eventId)
+                val permalink = session.permalinkService().createPermalink(roomDetailArgs.roomId, action.eventId)
                 copyToClipboard(requireContext(), permalink, false)
                 showSnackWithMessage(getString(R.string.copied_to_clipboard), Snackbar.LENGTH_SHORT)
             }
@@ -1477,7 +1629,7 @@ class RoomDetailFragment @Inject constructor(
                 promptReasonToReportContent(action)
             }
             is EventSharedAction.IgnoreUser                 -> {
-                roomDetailViewModel.handle(RoomDetailAction.IgnoreUser(action.senderId))
+                action.senderId?.let { askConfirmationToIgnoreUser(it) }
             }
             is EventSharedAction.OnUrlClicked               -> {
                 onUrlClicked(action.url, action.title)
@@ -1493,12 +1645,21 @@ class RoomDetailFragment @Inject constructor(
                     startActivity(KeysBackupRestoreActivity.intent(it))
                 }
             }
-            else                                            -> {
-                Toast.makeText(context, "Action $action is not implemented yet", Toast.LENGTH_LONG).show()
-            }
         }
     }
 
+    private fun askConfirmationToIgnoreUser(senderId: String) {
+        AlertDialog.Builder(requireContext())
+                .setTitle(R.string.room_participants_action_ignore_title)
+                .setMessage(R.string.room_participants_action_ignore_prompt_msg)
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.room_participants_action_ignore) { _, _ ->
+                    roomDetailViewModel.handle(RoomDetailAction.IgnoreUser(senderId))
+                }
+                .show()
+                .withColoredButton(DialogInterface.BUTTON_POSITIVE)
+    }
+
     /**
      * Insert a user displayName in the message editor.
      *
@@ -1560,7 +1721,14 @@ class RoomDetailFragment @Inject constructor(
         Snackbar.make(requireView(), message, duration).show()
     }
 
-    // VectorInviteView.Callback
+    private fun showDialogWithMessage(message: String) {
+        AlertDialog.Builder(requireContext())
+                .setMessage(message)
+                .setPositiveButton(getString(R.string.ok), null)
+                .show()
+    }
+
+// VectorInviteView.Callback
 
     override fun onAcceptInvite() {
         notificationDrawerManager.clearMemberShipNotificationForRoom(roomDetailArgs.roomId)
@@ -1572,7 +1740,7 @@ class RoomDetailFragment @Inject constructor(
         roomDetailViewModel.handle(RoomDetailAction.RejectInvite)
     }
 
-    // JumpToReadMarkerView.Callback
+// JumpToReadMarkerView.Callback
 
     override fun onJumpToReadMarkerClicked() = withState(roomDetailViewModel) {
         jumpToReadMarkerView.isVisible = false
@@ -1588,7 +1756,7 @@ class RoomDetailFragment @Inject constructor(
         roomDetailViewModel.handle(RoomDetailAction.MarkAllAsRead)
     }
 
-    // AttachmentTypeSelectorView.Callback
+// AttachmentTypeSelectorView.Callback
 
     override fun onTypeSelected(type: AttachmentTypeSelectorView.Type) {
         if (checkPermissions(type.permissionsBit, this, PERMISSION_REQUEST_CODE_PICK_ATTACHMENT)) {
@@ -1609,7 +1777,7 @@ class RoomDetailFragment @Inject constructor(
         }.exhaustive
     }
 
-    // AttachmentsHelper.Callback
+// AttachmentsHelper.Callback
 
     override fun onContentAttachmentsReady(attachments: List<ContentAttachmentData>) {
         if (roomDetailViewModel.preventAttachmentPreview) {
@@ -1639,7 +1807,7 @@ class RoomDetailFragment @Inject constructor(
         roomDetailViewModel.handle(RoomDetailAction.SendMessage(formattedContact, false))
     }
 
-    override fun onViewWidgetsClicked() {
+    private fun onViewWidgetsClicked() {
         RoomWidgetsBottomSheet.newInstance()
                 .show(childFragmentManager, "ROOM_WIDGETS_BOTTOM_SHEET")
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedAction.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedAction.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedAction.kt
index 95dd34ebb8..1b4435bf57 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
-import im.vector.riotx.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedAction
 
 /**
  * Supported navigation actions for [RoomDetailActivity]
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedActionViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedActionViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedActionViewModel.kt
index 6f2162bebc..065be461f3 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedActionViewModel.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
-import im.vector.riotx.core.platform.VectorSharedActionViewModel
+import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
similarity index 76%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
index b4c1f751bc..29ed43f17d 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
 import android.net.Uri
 import androidx.annotation.StringRes
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode
-import im.vector.riotx.core.platform.VectorViewEvents
-import im.vector.riotx.features.command.Command
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.features.command.Command
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
 import java.io.File
 
 /**
@@ -35,9 +35,14 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
     data class ActionFailure(val action: RoomDetailAction, val throwable: Throwable) : RoomDetailViewEvents()
 
     data class ShowMessage(val message: String) : RoomDetailViewEvents()
+    data class ShowInfoOkDialog(val message: String) : RoomDetailViewEvents()
     data class ShowE2EErrorMessage(val withHeldCode: WithHeldCode?) : RoomDetailViewEvents()
 
     data class NavigateToEvent(val eventId: String) : RoomDetailViewEvents()
+    data class JoinJitsiConference(val widget: Widget, val withVideo: Boolean) : RoomDetailViewEvents()
+
+    object ShowWaitingView: RoomDetailViewEvents()
+    object HideWaitingView: RoomDetailViewEvents()
 
     data class FileTooBigError(
             val filename: String,
@@ -66,6 +71,10 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
     data class OpenStickerPicker(val widget: Widget): RoomDetailViewEvents()
 
     object OpenIntegrationManager: RoomDetailViewEvents()
+    object OpenActiveWidgetBottomSheet: RoomDetailViewEvents()
+    data class RequestNativeWidgetPermission(val widget: Widget,
+                                             val domain: String,
+                                             val grantedEvents: RoomDetailViewEvents) : RoomDetailViewEvents()
 
     object MessageSent : SendMessageResult()
     data class JoinRoomCommandSuccess(val roomId: String) : SendMessageResult()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 2bec8017f0..4bad9c6ed0 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
 import android.net.Uri
 import androidx.annotation.IdRes
@@ -27,61 +27,24 @@ import com.jakewharton.rxrelay2.BehaviorRelay
 import com.jakewharton.rxrelay2.PublishRelay
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.MatrixPatterns
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.isImageMessage
-import im.vector.matrix.android.api.session.events.model.isTextMessage
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.members.roomMemberQueryParams
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.message.OptionItem
-import im.vector.matrix.android.api.session.room.model.message.getFileName
-import im.vector.matrix.android.api.session.room.model.message.getFileUrl
-import im.vector.matrix.android.api.session.room.model.tombstone.RoomTombstoneContent
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.android.api.session.room.read.ReadService
-import im.vector.matrix.android.api.session.room.send.UserDraft
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.TimelineSettings
-import im.vector.matrix.android.api.session.room.timeline.getTextEditableContent
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.resources.UserPreferencesProvider
-import im.vector.riotx.core.utils.subscribeLogError
-import im.vector.riotx.features.call.WebRtcPeerConnectionManager
-import im.vector.riotx.features.command.CommandParser
-import im.vector.riotx.features.command.ParsedCommand
-import im.vector.riotx.features.crypto.verification.SupportedVerificationMethodsProvider
-import im.vector.riotx.features.home.room.detail.composer.rainbow.RainbowGenerator
-import im.vector.riotx.features.home.room.detail.sticker.StickerPickerActionHandler
-import im.vector.riotx.features.home.room.detail.timeline.helper.RoomSummaryHolder
-import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineDisplayableEvents
-import im.vector.riotx.features.home.room.typing.TypingHelper
-import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.core.utils.subscribeLogError
+import im.vector.app.features.call.WebRtcPeerConnectionManager
+import im.vector.app.features.command.CommandParser
+import im.vector.app.features.command.ParsedCommand
+import im.vector.app.features.crypto.verification.SupportedVerificationMethodsProvider
+import im.vector.app.features.home.room.detail.composer.rainbow.RainbowGenerator
+import im.vector.app.features.home.room.detail.sticker.StickerPickerActionHandler
+import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineDisplayableEvents
+import im.vector.app.features.home.room.typing.TypingHelper
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorPreferences
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import io.reactivex.rxkotlin.subscribeBy
@@ -91,8 +54,50 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.isImageMessage
+import org.matrix.android.sdk.api.session.events.model.isTextMessage
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.OptionItem
+import org.matrix.android.sdk.api.session.room.model.message.getFileName
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.model.tombstone.RoomTombstoneContent
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.room.read.ReadService
+import org.matrix.android.sdk.api.session.room.send.UserDraft
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.api.session.room.timeline.getTextEditableContent
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
+import org.matrix.android.sdk.internal.util.awaitCallback
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
 import timber.log.Timber
 import java.io.File
+import java.util.UUID
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -188,8 +193,12 @@ class RoomDetailViewModel @AssistedInject constructor(
         PowerLevelsObservableFactory(room).createObservable()
                 .subscribe {
                     val canSendMessage = PowerLevelsHelper(it).isUserAllowedToSend(session.myUserId, false, EventType.MESSAGE)
+                    val isAllowedToManageWidgets = session.widgetService().hasPermissionsToHandleWidgets(room.roomId)
                     setState {
-                        copy(canSendMessage = canSendMessage)
+                        copy(
+                                canSendMessage = canSendMessage,
+                                isAllowedToManageWidgets = isAllowedToManageWidgets
+                        )
                     }
                 }
                 .disposeOnClear()
@@ -269,6 +278,10 @@ class RoomDetailViewModel @AssistedInject constructor(
             is RoomDetailAction.OpenIntegrationManager           -> handleOpenIntegrationManager()
             is RoomDetailAction.StartCall                        -> handleStartCall(action)
             is RoomDetailAction.EndCall                          -> handleEndCall()
+            is RoomDetailAction.ManageIntegrations               -> handleManageIntegrations()
+            is RoomDetailAction.AddJitsiWidget                   -> handleAddJitsiConference(action)
+            is RoomDetailAction.RemoveWidget                     -> handleDeleteWidget(action.widgetId)
+            is RoomDetailAction.EnsureNativeWidgetAllowed        -> handleCheckWidgetAllowed(action)
         }.exhaustive
     }
 
@@ -306,6 +319,115 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleManageIntegrations() = withState { state ->
+        if (state.activeRoomWidgets().isNullOrEmpty()) {
+            // Directly open integration manager screen
+            handleOpenIntegrationManager()
+        } else {
+            // Display bottomsheet with widget list
+            _viewEvents.post(RoomDetailViewEvents.OpenActiveWidgetBottomSheet)
+        }
+    }
+
+    private fun handleAddJitsiConference(action: RoomDetailAction.AddJitsiWidget) {
+        _viewEvents.post(RoomDetailViewEvents.ShowWaitingView)
+        viewModelScope.launch(Dispatchers.IO) {
+            // Build data for a jitsi widget
+            val widgetId: String = WidgetType.Jitsi.preferred + "_" + session.myUserId + "_" + System.currentTimeMillis()
+
+            // Create a random enough jitsi conference id
+            // Note: the jitsi server automatically creates conference when the conference
+            // id does not exist yet
+            var widgetSessionId = UUID.randomUUID().toString()
+
+            if (widgetSessionId.length > 8) {
+                widgetSessionId = widgetSessionId.substring(0, 7)
+            }
+            val roomId: String = room.roomId
+            val confId = roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.toLowerCase(VectorLocale.applicationLocale)
+
+            val jitsiDomain = session.getHomeServerCapabilities().preferredJitsiDomain ?: stringProvider.getString(R.string.preferred_jitsi_domain)
+
+            // We use the default element wrapper for this widget
+            // https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md
+            val url = "https://app.element.io/jitsi.html" +
+                    "?confId=$confId" +
+                    "#conferenceDomain=\$domain" +
+                    "&conferenceId=\$conferenceId" +
+                    "&isAudioOnly=${!action.withVideo}" +
+                    "&displayName=\$matrix_display_name" +
+                    "&avatarUrl=\$matrix_avatar_url" +
+                    "&userId=\$matrix_user_id"
+
+            val widgetEventContent = mapOf(
+                    "url" to url,
+                    "type" to WidgetType.Jitsi.legacy,
+                    "data" to mapOf(
+                            "conferenceId" to confId,
+                            "domain" to jitsiDomain,
+                            "isAudioOnly" to !action.withVideo
+                    ),
+                    "creatorUserId" to session.myUserId,
+                    "id" to widgetId,
+                    "name" to "jitsi"
+            )
+
+            try {
+                val widget = awaitCallback<Widget> {
+                    session.widgetService().createRoomWidget(roomId, widgetId, widgetEventContent, it)
+                }
+                _viewEvents.post(RoomDetailViewEvents.JoinJitsiConference(widget, action.withVideo))
+            } catch (failure: Throwable) {
+                _viewEvents.post(RoomDetailViewEvents.ShowMessage(stringProvider.getString(R.string.failed_to_add_widget)))
+            } finally {
+                _viewEvents.post(RoomDetailViewEvents.HideWaitingView)
+            }
+        }
+    }
+
+    private fun handleDeleteWidget(widgetId: String) {
+        _viewEvents.post(RoomDetailViewEvents.ShowWaitingView)
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                awaitCallback<Unit> { session.widgetService().destroyRoomWidget(room.roomId, widgetId, it) }
+                // local echo
+                setState {
+                    copy(
+                            activeRoomWidgets = when (activeRoomWidgets) {
+                                is Success -> {
+                                    Success(activeRoomWidgets.invoke().filter { it.widgetId != widgetId })
+                                }
+                                else       -> activeRoomWidgets
+                            }
+                    )
+                }
+            } catch (failure: Throwable) {
+                _viewEvents.post(RoomDetailViewEvents.ShowMessage(stringProvider.getString(R.string.failed_to_remove_widget)))
+            } finally {
+                _viewEvents.post(RoomDetailViewEvents.HideWaitingView)
+            }
+        }
+    }
+
+    private fun handleCheckWidgetAllowed(action: RoomDetailAction.EnsureNativeWidgetAllowed) {
+        val widget = action.widget
+        val domain = action.widget.widgetContent.data["domain"] as? String ?: ""
+        val isAllowed = action.userJustAccepted || if (widget.type == WidgetType.Jitsi) {
+            widget.senderInfo?.userId == session.myUserId
+                    || session.integrationManagerService().isNativeWidgetDomainAllowed(
+                    action.widget.type.preferred,
+                    domain
+            )
+        } else false
+
+        if (isAllowed) {
+            _viewEvents.post(action.grantedEvents)
+        } else {
+            // we need to request permission
+            _viewEvents.post(RoomDetailViewEvents.RequestNativeWidgetPermission(widget, domain, action.grantedEvents))
+        }
+    }
+
     private fun startTrackingUnreadMessages() {
         trackUnreadMessages.set(true)
         setState { copy(canShowJumpToReadMarker = false) }
@@ -419,7 +541,7 @@ class RoomDetailViewModel @AssistedInject constructor(
             R.id.clear_all           -> state.asyncRoomSummary()?.hasFailedSending == true
             R.id.open_matrix_apps    -> true
             R.id.voice_call,
-            R.id.video_call          -> state.asyncRoomSummary()?.canStartCall == true  && webRtcPeerConnectionManager.currentCall == null
+            R.id.video_call          -> true // always show for discoverability
             R.id.hangup_call         -> webRtcPeerConnectionManager.currentCall != null
             else                     -> false
         }
@@ -534,14 +656,6 @@ class RoomDetailViewModel @AssistedInject constructor(
                             _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
                             popDraft()
                         }
-                        is ParsedCommand.VerifyUser               -> {
-                            session
-                                    .cryptoService()
-                                    .verificationService()
-                                    .requestKeyVerificationInDMs(supportedVerificationMethodsProvider.provide(), slashCommandResult.userId, room.roomId)
-                            _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
-                            popDraft()
-                        }
                         is ParsedCommand.SendPoll                 -> {
                             room.sendPoll(slashCommandResult.question, slashCommandResult.options.mapIndexed { index, s -> OptionItem(s, "$index. $s") })
                             _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
similarity index 73%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index 6800850c48..a031803fa6 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.sync.SyncState
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.sync.SyncState
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 
 /**
  * Describes the current send mode:
@@ -66,8 +66,14 @@ data class RoomDetailViewState(
         val unreadState: UnreadState = UnreadState.Unknown,
         val canShowJumpToReadMarker: Boolean = true,
         val changeMembershipState: ChangeMembershipState = ChangeMembershipState.Unknown,
-        val canSendMessage: Boolean = true
+        val canSendMessage: Boolean = true,
+        val isAllowedToManageWidgets: Boolean = false
 ) : MvRxState {
 
-    constructor(args: RoomDetailArgs) : this(roomId = args.roomId, eventId = args.eventId)
+    constructor(args: RoomDetailArgs) : this(
+            roomId = args.roomId,
+            eventId = args.eventId,
+            // Also highlight the target event, if any
+            highlightedEventId = args.eventId
+    )
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomMessageTouchHelperCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomMessageTouchHelperCallback.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
index 4616cb4b25..ef13865374 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomMessageTouchHelperCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
index f741023630..0eb02f5c75 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.riotx.core.platform.DefaultListUpdateCallback
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.core.platform.DefaultListUpdateCallback
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicReference
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
index a18ee31e2c..af56e2eb02 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail
+package im.vector.app.features.home.room.detail
 
 import androidx.recyclerview.widget.LinearLayoutManager
-import im.vector.riotx.core.platform.DefaultListUpdateCallback
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.item.BaseEventItem
+import im.vector.app.core.platform.DefaultListUpdateCallback
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.item.BaseEventItem
 import timber.log.Timber
 import java.util.concurrent.CopyOnWriteArrayList
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/ComposerEditText.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/ComposerEditText.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
index ab37431103..353ab783db 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/ComposerEditText.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.features.home.room.detail.composer
+package im.vector.app.features.home.room.detail.composer
 
 import android.content.Context
 import android.net.Uri
@@ -27,9 +27,9 @@ import android.view.inputmethod.InputConnection
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.view.inputmethod.EditorInfoCompat
 import androidx.core.view.inputmethod.InputConnectionCompat
-import im.vector.riotx.core.extensions.ooi
-import im.vector.riotx.core.platform.SimpleTextWatcher
-import im.vector.riotx.features.html.PillImageSpan
+import im.vector.app.core.extensions.ooi
+import im.vector.app.core.platform.SimpleTextWatcher
+import im.vector.app.features.html.PillImageSpan
 import timber.log.Timber
 
 class ComposerEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = android.R.attr.editTextStyle)
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
index 9e2a6c0f05..caa8841690 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.composer
+package im.vector.app.features.home.room.detail.composer
 
 import android.content.Context
 import android.net.Uri
@@ -33,8 +33,8 @@ import androidx.transition.Transition
 import androidx.transition.TransitionManager
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.riotx.R
+import im.vector.app.R
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 import kotlinx.android.synthetic.main.merge_composer_layout.view.*
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGenerator.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
index 3868be4e2e..7bed9f8e64 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.composer.rainbow
+package im.vector.app.features.home.room.detail.composer.rainbow
 
-import im.vector.riotx.core.utils.splitEmoji
+import im.vector.app.core.utils.splitEmoji
 import javax.inject.Inject
 import kotlin.math.abs
 import kotlin.math.roundToInt
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RgbColor.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RgbColor.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RgbColor.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RgbColor.kt
index bf2e808a36..4e8c1b8bc8 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RgbColor.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RgbColor.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.composer.rainbow
+package im.vector.app.features.home.room.detail.composer.rainbow
 
 data class RgbColor(
         val r: Int,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt
index 45e5fbfc6a..b95239df44 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.readreceipts
+package im.vector.app.features.home.room.detail.readreceipts
 
 import android.widget.ImageView
 import android.widget.TextView
@@ -22,10 +22,10 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_display_read_receipt)
 abstract class DisplayReadReceiptItem : EpoxyModelWithHolder<DisplayReadReceiptItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
index cb978d5fc0..7593118c9f 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.readreceipts
+package im.vector.app.features.home.room.detail.readreceipts
 
 import android.os.Bundle
 import android.os.Parcelable
@@ -22,14 +22,14 @@ import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.args
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.riotx.features.home.room.detail.timeline.action.EventSharedAction
-import im.vector.riotx.features.home.room.detail.timeline.action.MessageSharedActionViewModel
-import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.home.room.detail.timeline.action.EventSharedAction
+import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
index fe8ecb0f86..2094e7f8a9 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.readreceipts
+package im.vector.app.features.home.room.detail.readreceipts
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData
-import im.vector.riotx.features.home.room.detail.timeline.item.toMatrixItem
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
+import im.vector.app.features.home.room.detail.timeline.item.toMatrixItem
+import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/sticker/StickerPickerActionHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/sticker/StickerPickerActionHandler.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt
index ebae583d8c..9cdc9eeabc 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/sticker/StickerPickerActionHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.sticker
+package im.vector.app.features.home.room.detail.sticker
 
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.widgets.model.WidgetType
-import im.vector.riotx.features.home.room.detail.RoomDetailViewEvents
+import im.vector.app.features.home.room.detail.RoomDetailViewEvents
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/MessageColorProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/MessageColorProvider.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
index 96f7885e5d..66e2c745a4 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/MessageColorProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline
+package im.vector.app.features.home.room.detail.timeline
 
 import androidx.annotation.ColorInt
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.getColorFromUserId
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.getColorFromUserId
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.session.room.send.SendState
 import javax.inject.Inject
 
 class MessageColorProvider @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index d79972c59a..0bf2876288 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline
+package im.vector.app.features.home.room.detail.timeline
 
 import android.os.Handler
 import android.os.Looper
@@ -25,34 +25,34 @@ import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.VisibilityState
-import im.vector.matrix.android.api.session.room.model.message.MessageImageInfoContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent
-import im.vector.matrix.android.api.session.room.timeline.Timeline
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.core.epoxy.LoadingItem_
-import im.vector.riotx.core.extensions.localDateTime
-import im.vector.riotx.core.extensions.nextOrNull
-import im.vector.riotx.features.home.room.detail.RoomDetailAction
-import im.vector.riotx.features.home.room.detail.RoomDetailViewState
-import im.vector.riotx.features.home.room.detail.UnreadState
-import im.vector.riotx.features.home.room.detail.timeline.factory.MergedHeaderItemFactory
-import im.vector.riotx.features.home.room.detail.timeline.factory.TimelineItemFactory
-import im.vector.riotx.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
-import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
-import im.vector.riotx.features.home.room.detail.timeline.helper.ReadMarkerVisibilityStateChangedListener
-import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineEventDiffUtilCallback
-import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineEventVisibilityStateChangedListener
-import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
-import im.vector.riotx.features.home.room.detail.timeline.item.BaseEventItem
-import im.vector.riotx.features.home.room.detail.timeline.item.BasedMergedItem
-import im.vector.riotx.features.home.room.detail.timeline.item.DaySeparatorItem
-import im.vector.riotx.features.home.room.detail.timeline.item.DaySeparatorItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData
-import im.vector.riotx.features.home.room.detail.timeline.item.TimelineReadMarkerItem_
-import im.vector.riotx.features.media.ImageContentRenderer
-import im.vector.riotx.features.media.VideoContentRenderer
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.epoxy.LoadingItem_
+import im.vector.app.core.extensions.localDateTime
+import im.vector.app.core.extensions.nextOrNull
+import im.vector.app.features.home.room.detail.RoomDetailAction
+import im.vector.app.features.home.room.detail.RoomDetailViewState
+import im.vector.app.features.home.room.detail.UnreadState
+import im.vector.app.features.home.room.detail.timeline.factory.MergedHeaderItemFactory
+import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactory
+import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
+import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
+import im.vector.app.features.home.room.detail.timeline.helper.ReadMarkerVisibilityStateChangedListener
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventDiffUtilCallback
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityStateChangedListener
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
+import im.vector.app.features.home.room.detail.timeline.item.BaseEventItem
+import im.vector.app.features.home.room.detail.timeline.item.BasedMergedItem
+import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem
+import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem_
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
+import im.vector.app.features.home.room.detail.timeline.item.TimelineReadMarkerItem_
+import im.vector.app.features.media.ImageContentRenderer
+import im.vector.app.features.media.VideoContentRenderer
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.threeten.bp.LocalDateTime
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventControllerHandler.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventControllerHandler.kt
index 5af7df86c1..dbd59e5e3f 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventControllerHandler.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline
+package im.vector.app.features.home.room.detail.timeline
 
 import javax.inject.Qualifier
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/EventSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/EventSharedAction.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
index b141e9a8cd..cffd576057 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/EventSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.action
+package im.vector.app.features.home.room.detail.timeline.action
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import im.vector.matrix.android.api.session.room.model.message.MessageWithAttachmentContent
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorSharedAction
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.R
+import im.vector.app.core.platform.VectorSharedAction
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
 
 sealed class EventSharedAction(@StringRes val titleRes: Int,
                                @DrawableRes val iconResId: Int,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionState.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
index 4eeed1292e..b1c324e12b 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.action
+package im.vector.app.features.home.room.detail.timeline.action
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotx.core.extensions.canReact
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.core.extensions.canReact
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAction.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAction.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAction.kt
index fe8a10d364..f1b5bbe7d0 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.action
+package im.vector.app.features.home.room.detail.timeline.action
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class MessageActionsAction : VectorViewModelAction {
     object ToggleReportMenu : MessageActionsAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAnimator.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAnimator.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAnimator.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAnimator.kt
index fbe32e0e2b..5530abf839 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAnimator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAnimator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.action
+package im.vector.app.features.home.room.detail.timeline.action
 
 import androidx.recyclerview.widget.DefaultItemAnimator
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
index eeb090092c..9858d2a03c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.action
+package im.vector.app.features.home.room.detail.timeline.action
 
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index e063016be1..f4287eb3a4 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.action
+package im.vector.app.features.home.room.detail.timeline.action
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Success
-import im.vector.riotx.EmojiCompatFontProvider
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.bottomsheet.BottomSheetQuickReactionsItem
-import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetActionItem
-import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetMessagePreviewItem
-import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetQuickReactionsItem
-import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetSendStateItem
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.item.E2EDecoration
-import im.vector.riotx.features.home.room.detail.timeline.tools.createLinkMovementMethod
-import im.vector.riotx.features.home.room.detail.timeline.tools.linkify
+import im.vector.app.EmojiCompatFontProvider
+import im.vector.app.R
+import im.vector.app.core.epoxy.bottomsheet.BottomSheetQuickReactionsItem
+import im.vector.app.core.epoxy.bottomsheet.bottomSheetActionItem
+import im.vector.app.core.epoxy.bottomsheet.bottomSheetMessagePreviewItem
+import im.vector.app.core.epoxy.bottomsheet.bottomSheetQuickReactionsItem
+import im.vector.app.core.epoxy.bottomsheet.bottomSheetSendStateItem
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
+import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
+import im.vector.app.features.home.room.detail.timeline.tools.linkify
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index a50d748f93..b51f41d573 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.action
+package im.vector.app.features.home.room.detail.timeline.action
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
@@ -21,35 +21,35 @@ import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import dagger.Lazy
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.isTextMessage
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageFormat
-import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationRequestContent
-import im.vector.matrix.android.api.session.room.model.message.MessageWithAttachmentContent
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent
-import im.vector.matrix.android.api.session.room.timeline.hasBeenEdited
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.canReact
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter
-import im.vector.riotx.features.html.EventHtmlRenderer
-import im.vector.riotx.features.html.VectorHtmlCompressor
-import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory
-import im.vector.riotx.features.reactions.data.EmojiDataSource
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.extensions.canReact
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.room.detail.timeline.format.NoticeEventFormatter
+import im.vector.app.features.html.EventHtmlRenderer
+import im.vector.app.features.html.VectorHtmlCompressor
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import im.vector.app.features.reactions.data.EmojiDataSource
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.isTextMessage
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
+import org.matrix.android.sdk.api.session.room.timeline.hasBeenEdited
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
 
 /**
  * Information related to an event and used to display preview in contextual bottom sheet.
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt
index ec5c49f814..cff9a8c5e2 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.action
+package im.vector.app.features.home.room.detail.timeline.action
 
-import im.vector.riotx.core.platform.VectorSharedActionViewModel
+import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
index 2acfec8a89..fcfd6cdb8d 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.action
+package im.vector.app.features.home.room.detail.timeline.action
 
 import android.os.Parcelable
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt
index fc19438af5..7bb0a6090c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.animation
+package im.vector.app.features.home.room.detail.timeline.animation
 
 import androidx.recyclerview.widget.DefaultItemAnimator
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
index bf3816a030..93fdd253d8 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.edithistory
+package im.vector.app.features.home.room.detail.timeline.edithistory
 
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
@@ -21,14 +21,14 @@ import butterknife.BindView
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.riotx.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotx.features.html.EventHtmlRenderer
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.features.html.EventHtmlRenderer
 import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
index 329f66459b..deb9b64500 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.edithistory
+package im.vector.app.features.home.room.detail.timeline.edithistory
 
 import android.content.Context
 import android.text.Spannable
@@ -23,19 +23,19 @@ import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
-import im.vector.matrix.android.api.util.ContentUtils.extractUsefulTextFromReply
-import im.vector.matrix.android.internal.session.room.send.TextContent
-import im.vector.riotx.R
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.core.extensions.localDateTime
-import im.vector.riotx.core.ui.list.genericFooterItem
-import im.vector.riotx.core.ui.list.genericItem
-import im.vector.riotx.core.ui.list.genericItemHeader
-import im.vector.riotx.core.ui.list.genericLoaderItem
-import im.vector.riotx.features.html.EventHtmlRenderer
+import im.vector.app.R
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.extensions.localDateTime
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericItem
+import im.vector.app.core.ui.list.genericItemHeader
+import im.vector.app.core.ui.list.genericLoaderItem
+import im.vector.app.features.html.EventHtmlRenderer
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.api.util.ContentUtils.extractUsefulTextFromReply
+import org.matrix.android.sdk.internal.session.room.send.TextContent
 import me.gujun.android.span.span
 import name.fraser.neil.plaintext.diff_match_patch
 import java.util.Calendar
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
index 2180e18684..e4d124dd94 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.edithistory
+package im.vector.app.features.home.room.detail.timeline.edithistory
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
@@ -26,17 +26,17 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.isReply
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.isReply
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import timber.log.Timber
 import java.util.UUID
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
similarity index 76%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
index 89e21e04a2..2120576bee 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.factory
+package im.vector.app.features.home.room.detail.timeline.factory
 
 import android.view.View
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider
-import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory
-import im.vector.riotx.features.home.room.detail.timeline.item.DefaultItem
-import im.vector.riotx.features.home.room.detail.timeline.item.DefaultItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
+import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
+import im.vector.app.features.home.room.detail.timeline.item.DefaultItem
+import im.vector.app.features.home.room.detail.timeline.item.DefaultItem_
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
 class DefaultItemFactory @Inject constructor(private val avatarSizeProvider: AvatarSizeProvider,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
index 997c68cb52..42d5596300 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.factory
+package im.vector.app.features.home.room.detail.timeline.factory
 
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.DrawableProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider
-import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory
-import im.vector.riotx.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageTextItem_
-import im.vector.riotx.features.home.room.detail.timeline.tools.createLinkMovementMethod
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
+import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
+import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
+import im.vector.app.features.home.room.detail.timeline.item.MessageTextItem_
+import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
 import me.gujun.android.span.image
 import me.gujun.android.span.span
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
similarity index 75%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
index ff65b0e656..5374b4792a 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.factory
+package im.vector.app.features.home.room.detail.timeline.factory
 
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.model.event.EncryptionEventContent
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider
-import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory
-import im.vector.riotx.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
-import im.vector.riotx.features.home.room.detail.timeline.item.StatusTileTimelineItem
-import im.vector.riotx.features.home.room.detail.timeline.item.StatusTileTimelineItem_
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
+import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
+import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
+import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem
+import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem_
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptionEventContent
 import javax.inject.Inject
 
 class EncryptionItemFactory @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index d3b7edbde6..0ba3b4d47e 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -14,31 +14,31 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.factory
+package im.vector.app.features.home.room.detail.timeline.factory
 
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.create.RoomCreateContent
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.model.event.EncryptionEventContent
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.extensions.prevOrNull
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider
-import im.vector.riotx.features.home.room.detail.timeline.helper.MergedTimelineEventVisibilityStateChangedListener
-import im.vector.riotx.features.home.room.detail.timeline.helper.canBeMerged
-import im.vector.riotx.features.home.room.detail.timeline.helper.isRoomConfiguration
-import im.vector.riotx.features.home.room.detail.timeline.helper.prevSameTypeEvents
-import im.vector.riotx.features.home.room.detail.timeline.item.BasedMergedItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MergedMembershipEventsItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MergedMembershipEventsItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.MergedRoomCreationItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MergedRoomCreationItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.MergedUTDItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MergedUTDItem_
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.prevOrNull
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
+import im.vector.app.features.home.room.detail.timeline.helper.MergedTimelineEventVisibilityStateChangedListener
+import im.vector.app.features.home.room.detail.timeline.helper.canBeMerged
+import im.vector.app.features.home.room.detail.timeline.helper.isRoomConfiguration
+import im.vector.app.features.home.room.detail.timeline.helper.prevSameTypeEvents
+import im.vector.app.features.home.room.detail.timeline.item.BasedMergedItem
+import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEventsItem
+import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEventsItem_
+import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationItem
+import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationItem_
+import im.vector.app.features.home.room.detail.timeline.item.MergedUTDItem
+import im.vector.app.features.home.room.detail.timeline.item.MergedUTDItem_
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptionEventContent
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index 47a15327b6..cce3248551 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.factory
+package im.vector.app.features.home.room.detail.timeline.factory
 
 import android.text.SpannableStringBuilder
 import android.text.Spanned
@@ -24,67 +24,67 @@ import android.text.style.ClickableSpan
 import android.text.style.ForegroundColorSpan
 import android.view.View
 import dagger.Lazy
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageAudioContent
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageContentWithFormattedBody
-import im.vector.matrix.android.api.session.room.model.message.MessageEmoteContent
-import im.vector.matrix.android.api.session.room.model.message.MessageFileContent
-import im.vector.matrix.android.api.session.room.model.message.MessageImageInfoContent
-import im.vector.matrix.android.api.session.room.model.message.MessageNoticeContent
-import im.vector.matrix.android.api.session.room.model.message.MessageOptionsContent
-import im.vector.matrix.android.api.session.room.model.message.MessagePollResponseContent
-import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationRequestContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent
-import im.vector.matrix.android.api.session.room.model.message.OPTION_TYPE_BUTTONS
-import im.vector.matrix.android.api.session.room.model.message.OPTION_TYPE_POLL
-import im.vector.matrix.android.api.session.room.model.message.getFileUrl
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent
-import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.core.utils.containsOnlyEmojis
-import im.vector.riotx.core.utils.isLocalFile
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider
-import im.vector.riotx.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
-import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
-import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory
-import im.vector.riotx.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
-import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
-import im.vector.riotx.features.home.room.detail.timeline.item.AbsMessageItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageBlockCodeItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageBlockCodeItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageFileItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageFileItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageImageVideoItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageImageVideoItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageOptionsItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.MessagePollItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageTextItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageTextItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.RedactedMessageItem
-import im.vector.riotx.features.home.room.detail.timeline.item.RedactedMessageItem_
-import im.vector.riotx.features.home.room.detail.timeline.item.VerificationRequestItem
-import im.vector.riotx.features.home.room.detail.timeline.item.VerificationRequestItem_
-import im.vector.riotx.features.home.room.detail.timeline.tools.createLinkMovementMethod
-import im.vector.riotx.features.home.room.detail.timeline.tools.linkify
-import im.vector.riotx.features.html.CodeVisitor
-import im.vector.riotx.features.html.EventHtmlRenderer
-import im.vector.riotx.features.html.VectorHtmlCompressor
-import im.vector.riotx.features.media.ImageContentRenderer
-import im.vector.riotx.features.media.VideoContentRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.core.utils.containsOnlyEmojis
+import im.vector.app.core.utils.isLocalFile
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
+import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
+import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
+import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
+import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
+import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageBlockCodeItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageBlockCodeItem_
+import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem_
+import im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem_
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.features.home.room.detail.timeline.item.MessageOptionsItem_
+import im.vector.app.features.home.room.detail.timeline.item.MessagePollItem_
+import im.vector.app.features.home.room.detail.timeline.item.MessageTextItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageTextItem_
+import im.vector.app.features.home.room.detail.timeline.item.RedactedMessageItem
+import im.vector.app.features.home.room.detail.timeline.item.RedactedMessageItem_
+import im.vector.app.features.home.room.detail.timeline.item.VerificationRequestItem
+import im.vector.app.features.home.room.detail.timeline.item.VerificationRequestItem_
+import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
+import im.vector.app.features.home.room.detail.timeline.tools.linkify
+import im.vector.app.features.html.CodeVisitor
+import im.vector.app.features.html.EventHtmlRenderer
+import im.vector.app.features.html.VectorHtmlCompressor
+import im.vector.app.features.media.ImageContentRenderer
+import im.vector.app.features.media.VideoContentRenderer
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContentWithFormattedBody
+import org.matrix.android.sdk.api.session.room.model.message.MessageEmoteContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageFileContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageNoticeContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageOptionsContent
+import org.matrix.android.sdk.api.session.room.model.message.MessagePollResponseContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_BUTTONS
+import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_POLL
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
 import me.gujun.android.span.span
 import org.commonmark.node.Document
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
similarity index 74%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
index 85118e6a91..cd8c682f39 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.factory
+package im.vector.app.features.home.room.detail.timeline.factory
 
 import android.view.View
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter
-import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider
-import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory
-import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem
-import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem_
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.format.NoticeEventFormatter
+import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
+import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
+import im.vector.app.features.home.room.detail.timeline.item.NoticeItem
+import im.vector.app.features.home.room.detail.timeline.item.NoticeItem_
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
 class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEventFormatter,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
similarity index 70%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
index d5471d7f4f..31adbdb8a6 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
@@ -14,29 +14,30 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.factory
+package im.vector.app.features.home.room.detail.timeline.factory
 
-import im.vector.matrix.android.api.permalinks.PermalinkFactory
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.create.RoomCreateContent
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.resources.UserPreferencesProvider
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.item.RoomCreateItem_
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.item.RoomCreateItem_
 import me.gujun.android.span.span
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
 class RoomCreateItemFactory @Inject constructor(private val stringProvider: StringProvider,
                                                 private val userPreferencesProvider: UserPreferencesProvider,
+                                                private val session: Session,
                                                 private val noticeItemFactory: NoticeItemFactory) {
 
     fun create(event: TimelineEvent, callback: TimelineEventController.Callback?): VectorEpoxyModel<*>? {
         val createRoomContent = event.root.getClearContent().toModel<RoomCreateContent>() ?: return null
         val predecessorId = createRoomContent.predecessor?.roomId ?: return defaultRendering(event, callback)
-        val roomLink = PermalinkFactory.createPermalink(predecessorId) ?: return null
+        val roomLink = session.permalinkService().createRoomPermalink(predecessorId) ?: return null
         val text = span {
             +stringProvider.getString(R.string.room_tombstone_continuation_description)
             +"\n"
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 72da87415c..1f99efd08e 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.factory
+package im.vector.app.features.home.room.detail.timeline.factory
 
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotx.core.epoxy.EmptyItem_
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.resources.UserPreferencesProvider
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.core.epoxy.EmptyItem_
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
index 837d0ad571..0b623d78f1 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
@@ -13,29 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.factory
+package im.vector.app.features.home.room.detail.timeline.factory
 
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
-import im.vector.matrix.android.api.session.crypto.verification.safeValueOf
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.RelationType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageRelationContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationCancelContent
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.internal.session.room.VerificationState
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.resources.UserPreferencesProvider
-import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider
-import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory
-import im.vector.riotx.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
-import im.vector.riotx.features.home.room.detail.timeline.item.StatusTileTimelineItem
-import im.vector.riotx.features.home.room.detail.timeline.item.StatusTileTimelineItem_
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
+import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
+import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
+import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem
+import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem_
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.safeValueOf
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationCancelContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.internal.session.room.VerificationState
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
index 42a8dd2604..bf333b0417 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.format
+package im.vector.app.features.home.room.detail.timeline.format
 
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.relation.ReactionContent
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent
-import im.vector.matrix.android.api.session.room.timeline.getTextEditableContent
-import im.vector.matrix.android.api.session.room.timeline.isReply
-import im.vector.riotx.EmojiCompatWrapper
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.EmojiCompatWrapper
+import im.vector.app.R
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
+import org.matrix.android.sdk.api.session.room.timeline.getTextEditableContent
+import org.matrix.android.sdk.api.session.room.timeline.isReply
 import me.gujun.android.span.span
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 090e2dda3f..9a4729abee 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -14,36 +14,36 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.format
+package im.vector.app.features.home.room.detail.timeline.format
 
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.GuestAccess
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.session.room.model.RoomAliasesContent
-import im.vector.matrix.android.api.session.room.model.RoomAvatarContent
-import im.vector.matrix.android.api.session.room.model.RoomCanonicalAliasContent
-import im.vector.matrix.android.api.session.room.model.RoomGuestAccessContent
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibilityContent
-import im.vector.matrix.android.api.session.room.model.RoomJoinRules
-import im.vector.matrix.android.api.session.room.model.RoomJoinRulesContent
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.api.session.room.model.RoomNameContent
-import im.vector.matrix.android.api.session.room.model.RoomThirdPartyInviteContent
-import im.vector.matrix.android.api.session.room.model.RoomTopicContent
-import im.vector.matrix.android.api.session.room.model.call.CallInviteContent
-import im.vector.matrix.android.api.session.room.model.create.RoomCreateContent
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.widgets.model.WidgetContent
-import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import im.vector.matrix.android.internal.crypto.model.event.EncryptionEventContent
-import im.vector.riotx.ActiveSessionDataSource
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.ActiveSessionDataSource
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomAliasesContent
+import org.matrix.android.sdk.api.session.room.model.RoomAvatarContent
+import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
+import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.model.RoomNameContent
+import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
+import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
+import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.widgets.model.WidgetContent
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptionEventContent
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -327,6 +327,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val eventContent: RoomMemberContent? = event.getClearContent().toModel()
         val prevEventContent: RoomMemberContent? = event.resolvedPrevContent().toModel()
         val isMembershipEvent = prevEventContent?.membership != eventContent?.membership
+                || eventContent?.membership == Membership.LEAVE
         return if (isMembershipEvent) {
             buildMembershipNotice(event, senderName, eventContent, prevEventContent)
         } else {
@@ -569,6 +570,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                                     sp.getString(R.string.notice_room_withdraw_with_reason, senderDisplayName, targetDisplayName, reason)
                                 } ?: sp.getString(R.string.notice_room_withdraw, senderDisplayName, targetDisplayName)
                             }
+                        Membership.LEAVE,
                         Membership.JOIN   ->
                             if (event.isSentByCurrentUser()) {
                                 eventContent.safeReason?.let { reason ->
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
index c5de02f57f..4563e6a6ed 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.format
+package im.vector.app.features.home.room.detail.timeline.format
 
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import javax.inject.Inject
 
 class RoomHistoryVisibilityFormatter @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
index 51efdbb0c3..5fc5deb407 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
-import im.vector.riotx.core.utils.DimensionConverter
+import im.vector.app.core.utils.DimensionConverter
 import javax.inject.Inject
 
 class AvatarSizeProvider @Inject constructor(private val dimensionConverter: DimensionConverter) {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
index 5c63de3e8d..abaaaf2152 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
 import android.graphics.drawable.Drawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import im.vector.matrix.android.api.session.file.ContentDownloadStateTracker
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.ScreenScope
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageFileItem
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenScope
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
+import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem
+import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker
 import javax.inject.Inject
 
 @ScreenScope
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
index 4cf14fa83b..f149b440e0 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.core.view.isVisible
-import im.vector.matrix.android.api.session.content.ContentUploadStateTracker
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.ScreenScope
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.utils.TextUtils
-import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenScope
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.utils.TextUtils
+import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
+import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
+import org.matrix.android.sdk.api.session.room.send.SendState
 import javax.inject.Inject
 
 @ScreenScope
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 44644fb942..49ac3ccfa9 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -16,29 +16,29 @@
 
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.ReferencesAggregatedContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVerificationRequestContent
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent
-import im.vector.matrix.android.api.session.room.timeline.hasBeenEdited
-import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.android.internal.session.room.VerificationState
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.core.extensions.localDateTime
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.features.home.room.detail.timeline.item.E2EDecoration
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotx.features.home.room.detail.timeline.item.PollResponseData
-import im.vector.riotx.features.home.room.detail.timeline.item.ReactionInfoData
-import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData
-import im.vector.riotx.features.home.room.detail.timeline.item.ReferencesInfoData
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.extensions.localDateTime
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.features.home.room.detail.timeline.item.PollResponseData
+import im.vector.app.features.home.room.detail.timeline.item.ReactionInfoData
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
+import im.vector.app.features.home.room.detail.timeline.item.ReferencesInfoData
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
+import org.matrix.android.sdk.api.session.room.timeline.hasBeenEdited
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.session.room.VerificationState
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
similarity index 80%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
index 7646fd37a5..3297f14622 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
@@ -15,16 +15,16 @@
   * limitations under the License.
 
  */
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
 import android.view.View
-import im.vector.riotx.EmojiCompatFontProvider
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.item.AbsMessageItem
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.EmojiCompatFontProvider
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import javax.inject.Inject
 
 class MessageItemAttributesFactory @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt
index a5025c3082..d3ae091733 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.core.di.ScreenScope
+import im.vector.app.core.di.ScreenScope
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
 /*
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
index af549aa2ed..655d46194d 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
 import android.os.Handler
 import android.os.HandlerThread
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
index 62a835ee8e..b1b1109580 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotx.core.extensions.localDateTime
+import im.vector.app.core.extensions.localDateTime
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 object TimelineDisplayableEvents {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
index f9e69e4ce8..7aa43a4513 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
 import androidx.recyclerview.widget.DiffUtil
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 class TimelineEventDiffUtilCallback(private val oldList: List<TimelineEvent>,
                                     private val newList: List<TimelineEvent>) : DiffUtil.Callback() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
index fc3ae98f5c..52229151a0 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.riotx.core.di.ScreenScope
+import im.vector.app.core.di.ScreenScope
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
index 69b2b24899..33e81aeb9b 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.helper
+package im.vector.app.features.home.room.detail.timeline.helper
 
 import com.airbnb.epoxy.VisibilityState
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 class ReadMarkerVisibilityStateChangedListener(private val callback: TimelineEventController.Callback?)
     : VectorEpoxyModel.OnVisibilityStateChangedListener {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
index 0845b9059c..1aec2db9a4 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.view.ViewGroup
@@ -22,13 +22,13 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.IdRes
 import androidx.core.view.isVisible
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.reactions.widget.ReactionButton
+import im.vector.app.R
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.reactions.widget.ReactionButton
+import org.matrix.android.sdk.api.session.room.send.SendState
 
 /**
  * Base timeline item with reactions and read receipts.
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
index 4f7828ddaf..fa216c15a4 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.graphics.Typeface
 import android.view.View
@@ -22,11 +22,11 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.IdRes
 import com.airbnb.epoxy.EpoxyAttribute
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 
 /**
  * Base timeline item that adds an optional information bar with the sender avatar, name and time
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
index a8d465d8e0..e8fa23b924 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.view.ViewStub
@@ -22,12 +22,12 @@ import androidx.annotation.CallSuper
 import androidx.annotation.IdRes
 import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.platform.CheckableView
-import im.vector.riotx.core.ui.views.ReadReceiptsView
-import im.vector.riotx.core.utils.DimensionConverter
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.platform.CheckableView
+import im.vector.app.core.ui.views.ReadReceiptsView
+import im.vector.app.core.utils.DimensionConverter
 
 /**
  * Children must override getViewType()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BasedMergedItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BasedMergedItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
index adc9b1442f..d9dcc98ed1 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BasedMergedItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.widget.TextView
 import androidx.annotation.IdRes
 import androidx.core.view.isVisible
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import org.matrix.android.sdk.api.util.MatrixItem
 
 abstract class BasedMergedItem<H : BasedMergedItem.Holder> : BaseEventItem<H>() {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BlankItem.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BlankItem.kt
index 199634ee84..cf3e4a8328 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BlankItem.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_blank_stub)
 abstract class BlankItem : VectorEpoxyModel<BlankItem.BlankHolder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DaySeparatorItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DaySeparatorItem.kt
index 4b36478586..c63ec36205 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DaySeparatorItem.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_day_separator)
 abstract class DaySeparatorItem : EpoxyModelWithHolder<DaySeparatorItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
index 0ccc982c4c..e82c4191b9 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
 abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/EventItemAttributes.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/EventItemAttributes.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/EventItemAttributes.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/EventItemAttributes.kt
index db0dd3584e..0762c4952f 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/EventItemAttributes.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/EventItemAttributes.kt
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
index 8e3ba0bcff..ef4a6662b4 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.view.ViewGroup
@@ -24,9 +24,9 @@ import androidx.core.view.children
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
 abstract class MergedMembershipEventsItem : BasedMergedItem<MergedMembershipEventsItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
index cf044f8a37..dad5f99eeb 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.view.ViewGroup
@@ -27,9 +27,9 @@ import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
 abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedUTDItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedUTDItem.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedUTDItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedUTDItem.kt
index 1955ba16a3..9c72d53641 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedUTDItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedUTDItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.util.TypedValue
 import android.view.ViewGroup
@@ -24,9 +24,9 @@ import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
 abstract class MergedUTDItem : BasedMergedItem<MergedUTDItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
index 82a6a4db6f..e7501d98ce 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
 import me.saket.bettermovementmethod.BetterLinkMovementMethod
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
index 1d7f4c634b..b215fa5dd5 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.graphics.Paint
 import android.view.ViewGroup
@@ -25,9 +25,9 @@ import androidx.annotation.DrawableRes
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
-import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
+import im.vector.app.R
+import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
+import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
index 779b132f2d..e8a840918f 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.view.ViewGroup
@@ -23,10 +23,10 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.glide.GlideApp
-import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
-import im.vector.riotx.features.media.ImageContentRenderer
+import im.vector.app.R
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
+import im.vector.app.features.media.ImageContentRenderer
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
index 088577d03a..b26c9315d4 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.os.Parcelable
-import im.vector.matrix.android.api.session.room.send.SendState
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.internal.session.room.VerificationState
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.internal.session.room.VerificationState
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageOptionsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageOptionsItem.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageOptionsItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageOptionsItem.kt
index 080ff26992..46956dd77c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageOptionsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageOptionsItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -22,11 +22,11 @@ import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.button.MaterialButton
-import im.vector.matrix.android.api.session.room.model.message.MessageOptionsContent
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.home.room.detail.RoomDetailAction
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.home.room.detail.RoomDetailAction
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import org.matrix.android.sdk.api.session.room.model.message.MessageOptionsContent
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageOptionsItem : AbsMessageItem<MessageOptionsItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessagePollItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessagePollItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt
index 5c92c22935..8bc0e7d478 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessagePollItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.view.ViewGroup
@@ -23,12 +23,12 @@ import android.widget.TextView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.session.room.model.message.MessageOptionsContent
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.home.room.detail.RoomDetailAction
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.room.detail.RoomDetailAction
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import org.matrix.android.sdk.api.session.room.model.message.MessageOptionsContent
 import kotlin.math.roundToInt
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
index 44f656fd73..6648943ca8 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.text.method.MovementMethod
 import androidx.appcompat.widget.AppCompatTextView
@@ -22,8 +22,8 @@ import androidx.core.text.PrecomputedTextCompat
 import androidx.core.widget.TextViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.features.home.room.detail.timeline.tools.findPillsAndProcess
+import im.vector.app.R
+import im.vector.app.features.home.room.detail.timeline.tools.findPillsAndProcess
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
index a4d5d273e7..7205ea278b 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.widget.ImageView
@@ -22,12 +22,12 @@ import android.widget.TextView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.ClickListener
-import im.vector.riotx.core.epoxy.onClick
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
 abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/PollResultLineView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/PollResultLineView.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt
index bee3ca6c5b..83174792e2 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/PollResultLineView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.content.Context
 import android.graphics.Typeface
@@ -25,8 +25,8 @@ import android.widget.TextView
 import androidx.core.content.withStyledAttributes
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
 
 class PollResultLineView @JvmOverloads constructor(
         context: Context,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
index 88e2be2bc5..282550daec 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
+import im.vector.app.R
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class RedactedMessageItem : AbsMessageItem<RedactedMessageItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RoomCreateItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RoomCreateItem.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RoomCreateItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RoomCreateItem.kt
index 5f6c0aedfa..8ad3bb0cf0 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RoomCreateItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RoomCreateItem.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 import me.saket.bettermovementmethod.BetterLinkMovementMethod
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_create)
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
index f9ea2a71df..c9eb14db66 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.annotation.SuppressLint
 import android.graphics.Typeface
@@ -25,10 +25,10 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_state)
 abstract class StatusTileTimelineItem : AbsBaseMessageItem<StatusTileTimelineItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt
index 01cb3d6b57..106f178216 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass(layout = R.layout.item_timeline_read_marker)
 abstract class TimelineReadMarkerItem : VectorEpoxyModel<TimelineReadMarkerItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/VerificationRequestItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/VerificationRequestItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
index 12ef5c3577..c7a279979b 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/VerificationRequestItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.detail.timeline.item
+package im.vector.app.features.home.room.detail.timeline.item
 
 import android.annotation.SuppressLint
 import android.graphics.Typeface
@@ -28,15 +28,15 @@ import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.internal.session.room.VerificationState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.RoomDetailAction
-import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.RoomDetailAction
+import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.internal.session.room.VerificationState
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_state)
 abstract class VerificationRequestItem : AbsBaseMessageItem<VerificationRequestItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
index 3e1bbfb783..9fc5275a81 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.reactions
+package im.vector.app.features.home.room.detail.timeline.reactions
 
 import android.widget.TextView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
 
 /**
  * Item displaying an emoji reaction (single line with emoji, author, time)
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
index f7c9ff04e4..a5555e4ebb 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.reactions
+package im.vector.app.features.home.room.detail.timeline.reactions
 
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
@@ -22,15 +22,15 @@ import butterknife.BindView
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.riotx.features.home.room.detail.timeline.action.EventSharedAction
-import im.vector.riotx.features.home.room.detail.timeline.action.MessageSharedActionViewModel
-import im.vector.riotx.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.home.room.detail.timeline.action.EventSharedAction
+import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel
+import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
+import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
index 25a6a26a01..d0bf69da3b 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.reactions
+package im.vector.app.features.home.room.detail.timeline.reactions
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
-import im.vector.riotx.EmojiCompatWrapper
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericFooterItem
-import im.vector.riotx.core.ui.list.genericLoaderItem
+import im.vector.app.EmojiCompatWrapper
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericLoaderItem
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
index 3d8382ab98..0484481019 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.reactions
+package im.vector.app.features.home.room.detail.timeline.reactions
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -24,15 +24,15 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.ReactionAggregatedSummary
-import im.vector.matrix.rx.RxRoom
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.ReactionAggregatedSummary
+import org.matrix.android.sdk.rx.RxRoom
+import org.matrix.android.sdk.rx.unwrap
 import io.reactivex.Observable
 import io.reactivex.Single
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/tools/EventRenderingTools.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/tools/EventRenderingTools.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/tools/EventRenderingTools.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/tools/EventRenderingTools.kt
index d3d7260206..4abaa4fae4 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/tools/EventRenderingTools.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/tools/EventRenderingTools.kt
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.timeline.tools
+package im.vector.app.features.home.room.detail.timeline.tools
 
 import android.text.SpannableStringBuilder
 import android.text.style.ClickableSpan
 import android.view.MotionEvent
 import android.widget.TextView
 import androidx.core.text.toSpannable
-import im.vector.matrix.android.api.permalinks.MatrixLinkify
-import im.vector.matrix.android.api.permalinks.MatrixPermalinkSpan
-import im.vector.riotx.core.linkify.VectorLinkify
-import im.vector.riotx.core.utils.EvenBetterLinkMovementMethod
-import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.html.PillImageSpan
+import im.vector.app.core.linkify.VectorLinkify
+import im.vector.app.core.utils.EvenBetterLinkMovementMethod
+import im.vector.app.core.utils.isValidUrl
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.html.PillImageSpan
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import im.vector.riotx.core.utils.isValidUrl
+import org.matrix.android.sdk.api.session.permalinks.MatrixLinkify
+import org.matrix.android.sdk.api.session.permalinks.MatrixPermalinkSpan
 
 fun CharSequence.findPillsAndProcess(scope: CoroutineScope, processBlock: (PillImageSpan) -> Unit) {
     scope.launch(Dispatchers.Main) {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt
similarity index 57%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt
index 7cdc033157..a58b8291c7 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt
@@ -14,31 +14,47 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.widget
+package im.vector.app.features.home.room.detail.widget
 
+import android.widget.ImageView
 import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.ClickListener
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.onClick
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.onClick
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import java.net.URL
 
 @EpoxyModelClass(layout = R.layout.item_room_widget)
 abstract class RoomWidgetItem : EpoxyModelWithHolder<RoomWidgetItem.Holder>() {
 
     @EpoxyAttribute lateinit var widget: Widget
     @EpoxyAttribute var widgetClicked: ClickListener? = null
+    @DrawableRes
+    @EpoxyAttribute var iconRes: Int? = null
 
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.widgetName.text = widget.name
+        holder.widgetUrl.text = tryThis { URL(widget.computedUrl) }?.host ?: widget.computedUrl
+        if (iconRes != null) {
+            holder.iconImage.isVisible = true
+            holder.iconImage.setImageResource(iconRes!!)
+        } else {
+            holder.iconImage.isVisible = false
+        }
         holder.view.onClick(widgetClicked)
     }
 
     class Holder : VectorEpoxyHolder() {
         val widgetName by bind<TextView>(R.id.roomWidgetName)
+        val widgetUrl by bind<TextView>(R.id.roomWidgetUrl)
+        val iconImage by bind<ImageView>(R.id.roomWidgetAvatar)
     }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBannerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBannerView.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt
index 48a5c20558..19897a9300 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.widget
+package im.vector.app.features.home.room.detail.widget
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.RelativeLayout
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.riotx.R
+import im.vector.app.R
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 import kotlinx.android.synthetic.main.view_room_widgets_banner.view.*
 
 class RoomWidgetsBannerView @JvmOverloads constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
similarity index 73%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
index 832d4f836f..e87f5cdaa9 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
@@ -14,32 +14,33 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.widget
+package im.vector.app.features.home.room.detail.widget
 
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.features.home.room.detail.RoomDetailViewModel
-import im.vector.riotx.features.home.room.detail.RoomDetailViewState
-import im.vector.riotx.features.navigation.Navigator
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.features.home.room.detail.RoomDetailAction
+import im.vector.app.features.home.room.detail.RoomDetailViewModel
+import im.vector.app.features.home.room.detail.RoomDetailViewState
+import im.vector.app.features.navigation.Navigator
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.*
 import javax.inject.Inject
 
 /**
  * Bottom sheet displaying active widgets in a room
  */
-class RoomWidgetsBottomSheet : VectorBaseBottomSheetDialogFragment(), RoomWidgetController.Listener {
+class RoomWidgetsBottomSheet : VectorBaseBottomSheetDialogFragment(), RoomWidgetsController.Listener {
 
-    @Inject lateinit var epoxyController: RoomWidgetController
+    @Inject lateinit var epoxyController: RoomWidgetsController
     @Inject lateinit var colorProvider: ColorProvider
     @Inject lateinit var navigator: Navigator
 
@@ -77,6 +78,11 @@ class RoomWidgetsBottomSheet : VectorBaseBottomSheetDialogFragment(), RoomWidget
         dismiss()
     }
 
+    override fun didSelectManageWidgets() {
+        roomDetailViewModel.handle(RoomDetailAction.OpenIntegrationManager)
+        dismiss()
+    }
+
     companion object {
         fun newInstance(): RoomWidgetsBottomSheet {
             return RoomWidgetsBottomSheet()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt
new file mode 100644
index 0000000000..b6536fbd93
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.widget
+
+import android.view.View
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericButtonItem
+import im.vector.app.core.ui.list.genericFooterItem
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import javax.inject.Inject
+
+/**
+ * Epoxy controller for room widgets list
+ */
+class RoomWidgetsController @Inject constructor(
+        val stringProvider: StringProvider,
+        val colorProvider: ColorProvider)
+    : TypedEpoxyController<List<Widget>>() {
+
+    var listener: Listener? = null
+
+    override fun buildModels(widgets: List<Widget>) {
+        if (widgets.isEmpty()) {
+            genericFooterItem {
+                id("empty")
+                text(stringProvider.getString(R.string.room_no_active_widgets))
+            }
+        } else {
+            widgets.forEach {
+                roomWidgetItem {
+                    id(it.widgetId)
+                    widget(it)
+                    widgetClicked { listener?.didSelectWidget(it) }
+                }
+            }
+        }
+        genericButtonItem {
+            id("addIntegration")
+            text(stringProvider.getString(R.string.room_manage_integrations))
+            textColor(colorProvider.getColor(R.color.riotx_accent))
+            buttonClickAction(View.OnClickListener { listener?.didSelectManageWidgets() })
+        }
+    }
+
+    interface Listener {
+        fun didSelectWidget(widget: Widget)
+        fun didSelectManageWidgets()
+    }
+}
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/WidgetRequestCodes.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/WidgetRequestCodes.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/WidgetRequestCodes.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/widget/WidgetRequestCodes.kt
index 6fdfa598e4..5f0e6866db 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/WidgetRequestCodes.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/WidgetRequestCodes.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.widget
+package im.vector.app.features.home.room.detail.widget
 
 object WidgetRequestCodes {
     const val STICKER_PICKER_REQUEST_CODE = 16000
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomFooterItem.kt b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomFooterItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
index 60b672cef2..0884844777 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomFooterItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.filtered
+package im.vector.app.features.home.room.filtered
 
 import android.widget.Button
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.features.home.room.list.widget.FabMenuView
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.room.list.widget.FabMenuView
 
 @EpoxyModelClass(layout = R.layout.item_room_filter_footer)
 abstract class FilteredRoomFooterItem : VectorEpoxyModel<FilteredRoomFooterItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomsActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomsActivity.kt
rename to vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt
index 04e738cec8..ee33b4339c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.filtered
+package im.vector.app.features.home.room.filtered
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.widget.SearchView
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.home.RoomListDisplayMode
-import im.vector.riotx.features.home.room.list.RoomListFragment
-import im.vector.riotx.features.home.room.list.RoomListParams
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.features.home.room.list.RoomListFragment
+import im.vector.app.features.home.room.list.RoomListParams
 import kotlinx.android.synthetic.main.activity_filtered_rooms.*
 
 class FilteredRoomsActivity : VectorBaseActivity() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt b/vector/src/main/java/im/vector/app/features/home/room/list/AlphabeticalRoomComparator.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/AlphabeticalRoomComparator.kt
index 22984b18d8..03b4b24726 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/AlphabeticalRoomComparator.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
-import im.vector.matrix.android.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
 class AlphabeticalRoomComparator @Inject constructor() : Comparator<RoomSummary> {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/BreadcrumbsRoomComparator.kt b/vector/src/main/java/im/vector/app/features/home/room/list/BreadcrumbsRoomComparator.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/BreadcrumbsRoomComparator.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/BreadcrumbsRoomComparator.kt
index 3b858b39fb..3855410be0 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/BreadcrumbsRoomComparator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/BreadcrumbsRoomComparator.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
-import im.vector.matrix.android.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
 class BreadcrumbsRoomComparator @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt b/vector/src/main/java/im/vector/app/features/home/room/list/ChronologicalRoomComparator.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/ChronologicalRoomComparator.kt
index 618d6c901b..06616683bc 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/ChronologicalRoomComparator.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
-import im.vector.matrix.android.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
 class ChronologicalRoomComparator @Inject constructor() : Comparator<RoomSummary> {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
index c3b1dc27eb..9adddfd5d3 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import android.view.ViewGroup
 import android.widget.TextView
@@ -22,10 +22,10 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.themes.ThemeUtils
 
 @EpoxyModelClass(layout = R.layout.item_room_category)
 abstract class RoomCategoryItem : VectorEpoxyModel<RoomCategoryItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomInvitationItem.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomInvitationItem.kt
index 7338a46d8a..7327c5533e 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomInvitationItem.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.platform.ButtonStateView
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.invite.InviteButtonStateBinder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.ButtonStateView
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.invite.InviteButtonStateBinder
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_room_invitation)
 abstract class RoomInvitationItem : VectorEpoxyModel<RoomInvitationItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAction.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
index 44ae10c85d..1b05c3f2fd 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 
 sealed class RoomListAction : VectorViewModelAction {
     data class SelectRoom(val roomSummary: RoomSummary) : RoomListAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAnimator.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListAnimator.kt
index e6b920747d..ee6a15d5fd 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAnimator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import androidx.recyclerview.widget.DefaultItemAnimator
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
index dd75deb8ee..70e28caee8 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.features.home.RoomListDisplayMode
+import im.vector.app.features.home.RoomListDisplayMode
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import io.reactivex.functions.Predicate
 
 class RoomListDisplayModeFilter(private val displayMode: RoomListDisplayMode) : Predicate<RoomSummary> {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index 2858097e24..979f364888 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import android.os.Bundle
 import android.os.Parcelable
@@ -33,24 +33,24 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.LayoutManagerStateRestorer
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.OnBackPressed
-import im.vector.riotx.core.platform.StateView
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.home.RoomListDisplayMode
-import im.vector.riotx.features.home.room.list.actions.RoomListActionsArgs
-import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsBottomSheet
-import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedAction
-import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
-import im.vector.riotx.features.home.room.list.widget.FabMenuView
-import im.vector.riotx.features.notifications.NotificationDrawerManager
+import im.vector.app.R
+import im.vector.app.core.epoxy.LayoutManagerStateRestorer
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.StateView
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.features.home.room.list.actions.RoomListActionsArgs
+import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
+import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedAction
+import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
+import im.vector.app.features.home.room.list.widget.FabMenuView
+import im.vector.app.features.notifications.NotificationDrawerManager
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_room_list.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListModule.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListModule.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListModule.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListModule.kt
index 411db4d679..5dcef663e6 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListModule.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import dagger.Binds
 import dagger.Module
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListNameFilter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListNameFilter.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt
index 88956fbc05..4c4a9755d2 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListNameFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
-import im.vector.matrix.android.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import io.reactivex.functions.Predicate
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt
index ea7393b2fc..cb84d91373 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt
@@ -15,10 +15,10 @@
  *
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 /**
  * Transient events for RoomList
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index cfc76b61a8..dd59abbc8a 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.tag.RoomTag
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.utils.DataSource
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.utils.DataSource
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import io.reactivex.schedulers.Schedulers
+import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModelFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModelFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
index 5b823d6444..44ca8cefda 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModelFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.features.home.HomeRoomListDataSource
+import im.vector.app.features.home.HomeRoomListDataSource
+import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 import javax.inject.Provider
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
index 63f0cf2a1a..095262d74b 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import androidx.annotation.StringRes
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.R
-import im.vector.riotx.features.home.RoomListDisplayMode
+import im.vector.app.R
+import im.vector.app.features.home.RoomListDisplayMode
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 data class RoomListViewState(
         val displayMode: RoomListDisplayMode,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
index efa19d012b..d7cace9edb 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import androidx.annotation.StringRes
 import com.airbnb.epoxy.EpoxyController
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.helpFooterItem
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.resources.UserPreferencesProvider
-import im.vector.riotx.features.home.RoomListDisplayMode
-import im.vector.riotx.features.home.room.filtered.FilteredRoomFooterItem
-import im.vector.riotx.features.home.room.filtered.filteredRoomFooterItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.helpFooterItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.features.home.room.filtered.FilteredRoomFooterItem
+import im.vector.app.features.home.room.filtered.filteredRoomFooterItem
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
 class RoomSummaryController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryFormatter.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryFormatter.kt
index 4824aa461d..51fd6a7941 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryFormatter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 object RoomSummaryFormatter {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
index 0eebd12ff4..ce572ed96d 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import android.view.HapticFeedbackConstants
 import android.view.View
@@ -27,14 +27,14 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.amulyakhare.textdrawable.TextDrawable
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.crypto.util.toImageRes
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.crypto.util.toImageRes
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_room)
 abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index cd2bb2d7d0..da58748dea 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import android.view.View
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.localDateTime
-import im.vector.riotx.core.resources.DateProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.format.DisplayableEventFormatter
-import im.vector.riotx.features.home.room.typing.TypingHelper
+import im.vector.app.R
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.localDateTime
+import im.vector.app.core.resources.DateProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter
+import im.vector.app.features.home.room.typing.TypingHelper
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class RoomSummaryItemFactory @Inject constructor(private val displayableEventFormatter: DisplayableEventFormatter,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt b/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
index 490e05001a..cc7271b55f 100755
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.list
+package im.vector.app.features.home.room.list
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.appcompat.widget.AppCompatTextView
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
 
 class UnreadCounterBadgeView : AppCompatTextView {
 
@@ -38,7 +37,7 @@ class UnreadCounterBadgeView : AppCompatTextView {
             val bgRes = if (state.highlighted) {
                 R.drawable.bg_unread_highlight
             } else {
-                ThemeUtils.getResourceId(context, R.drawable.bg_unread_notification_light)
+                R.drawable.bg_unread_notification
             }
             setBackgroundResource(bgRes)
             text = RoomSummaryFormatter.formatUnreadMessagesCounter(state.count)
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
index 32dc038222..c33d964d22 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list.actions
+package im.vector.app.features.home.room.list.actions
 
 import android.os.Bundle
 import android.os.Parcelable
@@ -22,12 +22,12 @@ import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.riotx.features.navigation.Navigator
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.navigation.Navigator
 import kotlinx.android.parcel.Parcelize
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
index 66c8e87e2c..ed52dcfdad 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.list.actions
+package im.vector.app.features.home.room.list.actions
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetActionItem
-import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetRoomPreviewItem
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.core.epoxy.bottomsheet.bottomSheetActionItem
+import im.vector.app.core.epoxy.bottomsheet.bottomSheetRoomPreviewItem
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
index 5da15bf6a3..5ef705d5b0 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list.actions
+package im.vector.app.features.home.room.list.actions
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorSharedAction
+import im.vector.app.R
+import im.vector.app.core.platform.VectorSharedAction
 
 sealed class RoomListQuickActionsSharedAction(
         @StringRes val titleRes: Int,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt
index 2f7e8354bf..174e0fac5c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.home.room.list.actions
+package im.vector.app.features.home.room.list.actions
 
-import im.vector.riotx.core.platform.VectorSharedActionViewModel
+import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsState.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsState.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsState.kt
index 6e134871a7..2731620cec 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsState.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list.actions
+package im.vector.app.features.home.room.list.actions
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 
 data class RoomListQuickActionsState(
         val roomId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt
index e5c0e743b8..a062b2b034 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.home.room.list.actions
+package im.vector.app.features.home.room.list.actions
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
 
 class RoomListQuickActionsViewModel @AssistedInject constructor(@Assisted initialState: RoomListQuickActionsState,
                                                                 private val session: Session
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt b/vector/src/main/java/im/vector/app/features/home/room/list/widget/FabMenuView.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/widget/FabMenuView.kt
index 28686c0a02..f9058840d2 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/widget/FabMenuView.kt
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.list.widget
+package im.vector.app.features.home.room.list.widget
 
 import android.content.Context
 import android.util.AttributeSet
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.view.isVisible
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
 import kotlinx.android.synthetic.main.motion_fab_menu_merge.view.*
 
 class FabMenuView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null,
@@ -37,12 +36,6 @@ class FabMenuView @JvmOverloads constructor(context: Context, attrs: AttributeSe
     override fun onFinishInflate() {
         super.onFinishInflate()
 
-        // Tint label background
-        listOf(createRoomItemChatLabel, createRoomItemGroupLabel)
-                .forEach {
-                    it.setBackgroundResource(ThemeUtils.getResourceId(context, R.drawable.vector_label_background_light))
-                }
-
         listOf(createRoomItemChat, createRoomItemChatLabel)
                 .forEach {
                     it.setOnClickListener {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/typing/TypingHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/home/room/typing/TypingHelper.kt
rename to vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt
index b47a0a471e..5878f99468 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/typing/TypingHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.typing
+package im.vector.app.features.home.room.typing
 
-import im.vector.matrix.android.api.session.room.sender.SenderInfo
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 import javax.inject.Inject
 
 class TypingHelper @Inject constructor(private val stringProvider: StringProvider) {
diff --git a/vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewModel.kt b/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewModel.kt
rename to vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt
index 43c1eac172..672fa4c38e 100644
--- a/vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.homeserver
+package im.vector.app.features.homeserver
 
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 
 class HomeServerCapabilitiesViewModel(initialState: HomeServerCapabilitiesViewState)
     : VectorViewModel<HomeServerCapabilitiesViewState, EmptyAction, EmptyViewEvents>(initialState) {
diff --git a/vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewState.kt b/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewState.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewState.kt
rename to vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewState.kt
index 2b55569b10..98df020b6b 100644
--- a/vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewState.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.homeserver
+package im.vector.app.features.homeserver
 
 import com.airbnb.mvrx.MvRxState
-import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 
 data class HomeServerCapabilitiesViewState(
         val capabilities: HomeServerCapabilities = HomeServerCapabilities()
diff --git a/vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt b/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt
rename to vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
index f485226935..683dea43b0 100644
--- a/vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.homeserver
+package im.vector.app.features.homeserver
 
 import android.content.Context
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import im.vector.riotx.R
+import im.vector.app.R
 
 /**
  * Object to store and retrieve home and identity server urls
diff --git a/vector/src/main/java/im/vector/riotx/features/html/CodeVisitor.kt b/vector/src/main/java/im/vector/app/features/html/CodeVisitor.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/html/CodeVisitor.kt
rename to vector/src/main/java/im/vector/app/features/html/CodeVisitor.kt
index ed8db94fc3..f1612c3717 100644
--- a/vector/src/main/java/im/vector/riotx/features/html/CodeVisitor.kt
+++ b/vector/src/main/java/im/vector/app/features/html/CodeVisitor.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.html
+package im.vector.app.features.html
 
 import org.commonmark.node.AbstractVisitor
 import org.commonmark.node.Code
diff --git a/vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt
rename to vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
index 8253669380..fa644f41b6 100644
--- a/vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.html
+package im.vector.app.features.html
 
 import android.content.Context
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.glide.GlideApp
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.features.home.AvatarRenderer
 import io.noties.markwon.Markwon
 import io.noties.markwon.html.HtmlPlugin
 import io.noties.markwon.html.TagHandlerNoOp
diff --git a/vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt b/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt
rename to vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt
index e5733dd849..362c8279e1 100644
--- a/vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.html
+package im.vector.app.features.html
 
 import android.graphics.Color
 import android.text.style.ForegroundColorSpan
diff --git a/vector/src/main/java/im/vector/riotx/features/html/MxLinkTagHandler.kt b/vector/src/main/java/im/vector/app/features/html/MxLinkTagHandler.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/html/MxLinkTagHandler.kt
rename to vector/src/main/java/im/vector/app/features/html/MxLinkTagHandler.kt
index 76f7dfaabd..368fdd27ff 100644
--- a/vector/src/main/java/im/vector/riotx/features/html/MxLinkTagHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/html/MxLinkTagHandler.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.html
+package im.vector.app.features.html
 
 import android.content.Context
 import android.text.style.URLSpan
-import im.vector.matrix.android.api.permalinks.PermalinkData
-import im.vector.matrix.android.api.permalinks.PermalinkParser
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.glide.GlideRequests
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.glide.GlideRequests
+import im.vector.app.features.home.AvatarRenderer
 import io.noties.markwon.MarkwonVisitor
 import io.noties.markwon.SpannableBuilder
 import io.noties.markwon.html.HtmlTag
 import io.noties.markwon.html.MarkwonHtmlRenderer
 import io.noties.markwon.html.tag.LinkHandler
+import org.matrix.android.sdk.api.session.permalinks.PermalinkData
+import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.MatrixItem
 
 class MxLinkTagHandler(private val glideRequests: GlideRequests,
                        private val context: Context,
diff --git a/vector/src/main/java/im/vector/riotx/features/html/MxReplyTagHandler.kt b/vector/src/main/java/im/vector/app/features/html/MxReplyTagHandler.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/html/MxReplyTagHandler.kt
rename to vector/src/main/java/im/vector/app/features/html/MxReplyTagHandler.kt
index f999e253c7..391c5f9477 100644
--- a/vector/src/main/java/im/vector/riotx/features/html/MxReplyTagHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/html/MxReplyTagHandler.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.html
+package im.vector.app.features.html
 
 import io.noties.markwon.MarkwonVisitor
 import io.noties.markwon.SpannableBuilder
diff --git a/vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt b/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt
rename to vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
index 3d3dcbea94..2602dfd6c7 100644
--- a/vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt
+++ b/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
@@ -16,7 +16,7 @@
 
 @file:Suppress("DEPRECATION")
 
-package im.vector.riotx.features.html
+package im.vector.app.features.html
 
 import android.content.Context
 import android.graphics.Canvas
@@ -28,11 +28,11 @@ import androidx.annotation.UiThread
 import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
 import com.google.android.material.chip.ChipDrawable
-import im.vector.matrix.android.api.session.room.send.MatrixItemSpan
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.glide.GlideRequests
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.glide.GlideRequests
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.send.MatrixItemSpan
+import org.matrix.android.sdk.api.util.MatrixItem
 import java.lang.ref.WeakReference
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/html/SpanHandler.kt b/vector/src/main/java/im/vector/app/features/html/SpanHandler.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/html/SpanHandler.kt
rename to vector/src/main/java/im/vector/app/features/html/SpanHandler.kt
index cb6e4dc325..584d6602ef 100644
--- a/vector/src/main/java/im/vector/riotx/features/html/SpanHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/html/SpanHandler.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.html
+package im.vector.app.features.html
 
-import im.vector.riotx.core.resources.ColorProvider
+import im.vector.app.core.resources.ColorProvider
 import io.noties.markwon.MarkwonVisitor
 import io.noties.markwon.SpannableBuilder
 import io.noties.markwon.html.HtmlTag
diff --git a/vector/src/main/java/im/vector/riotx/features/html/SpoilerSpan.kt b/vector/src/main/java/im/vector/app/features/html/SpoilerSpan.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/html/SpoilerSpan.kt
rename to vector/src/main/java/im/vector/app/features/html/SpoilerSpan.kt
index 5ba464cba4..86d8c7e94f 100644
--- a/vector/src/main/java/im/vector/riotx/features/html/SpoilerSpan.kt
+++ b/vector/src/main/java/im/vector/app/features/html/SpoilerSpan.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.html
+package im.vector.app.features.html
 
 import android.graphics.Color
 import android.text.TextPaint
 import android.text.style.ClickableSpan
 import android.view.View
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.ColorProvider
+import im.vector.app.R
+import im.vector.app.core.resources.ColorProvider
 
 class SpoilerSpan(private val colorProvider: ColorProvider) : ClickableSpan() {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/html/VectorHtmlCompressor.kt b/vector/src/main/java/im/vector/app/features/html/VectorHtmlCompressor.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/html/VectorHtmlCompressor.kt
rename to vector/src/main/java/im/vector/app/features/html/VectorHtmlCompressor.kt
index 9f3cf96a7e..6a8d928ef2 100644
--- a/vector/src/main/java/im/vector/riotx/features/html/VectorHtmlCompressor.kt
+++ b/vector/src/main/java/im/vector/app/features/html/VectorHtmlCompressor.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.html
+package im.vector.app.features.html
 
 import com.googlecode.htmlcompressor.compressor.Compressor
 import com.googlecode.htmlcompressor.compressor.HtmlCompressor
diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteButtonStateBinder.kt b/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/invite/InviteButtonStateBinder.kt
rename to vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt
index 88abf28888..2c8589eca1 100644
--- a/vector/src/main/java/im/vector/riotx/features/invite/InviteButtonStateBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.invite
+package im.vector.app.features.invite
 
 import androidx.core.view.isInvisible
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.riotx.core.platform.ButtonStateView
+import im.vector.app.core.platform.ButtonStateView
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 
 object InviteButtonStateBinder {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomAction.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomAction.kt
rename to vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt
index 6c059c917f..cd9df8dc96 100644
--- a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomAction.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.invite
+package im.vector.app.features.invite
 
-import im.vector.riotx.core.platform.VectorViewModelAction
-import im.vector.riotx.features.userdirectory.PendingInvitee
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.features.userdirectory.PendingInvitee
 
 sealed class InviteUsersToRoomAction : VectorViewModelAction {
     data class InviteSelectedUsers(val invitees: Set<PendingInvitee>) : InviteUsersToRoomAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomActivity.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomActivity.kt
rename to vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
index af78457d96..096579091f 100644
--- a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.invite
+package im.vector.app.features.invite
 
 import android.content.Context
 import android.content.Intent
@@ -24,28 +24,28 @@ import android.view.View
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.extensions.addFragmentToBackstack
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.SimpleFragmentActivity
-import im.vector.riotx.core.platform.WaitingViewData
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_MEMBERS_SEARCH
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_READ_CONTACTS
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.contactsbook.ContactsBookFragment
-import im.vector.riotx.features.contactsbook.ContactsBookViewModel
-import im.vector.riotx.features.userdirectory.KnownUsersFragment
-import im.vector.riotx.features.userdirectory.KnownUsersFragmentArgs
-import im.vector.riotx.features.userdirectory.UserDirectoryFragment
-import im.vector.riotx.features.userdirectory.UserDirectorySharedAction
-import im.vector.riotx.features.userdirectory.UserDirectorySharedActionViewModel
-import im.vector.riotx.features.userdirectory.UserDirectoryViewModel
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.extensions.addFragmentToBackstack
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.core.utils.PERMISSIONS_FOR_MEMBERS_SEARCH
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_READ_CONTACTS
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.core.utils.toast
+import im.vector.app.features.contactsbook.ContactsBookFragment
+import im.vector.app.features.contactsbook.ContactsBookViewModel
+import im.vector.app.features.userdirectory.KnownUsersFragment
+import im.vector.app.features.userdirectory.KnownUsersFragmentArgs
+import im.vector.app.features.userdirectory.UserDirectoryFragment
+import im.vector.app.features.userdirectory.UserDirectorySharedAction
+import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel
+import im.vector.app.features.userdirectory.UserDirectoryViewModel
+import org.matrix.android.sdk.api.failure.Failure
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.activity.*
 import java.net.HttpURLConnection
diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewEvents.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewEvents.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewEvents.kt
index a76d4a4077..786fab58c3 100644
--- a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.invite
+package im.vector.app.features.invite
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class InviteUsersToRoomViewEvents  : VectorViewEvents {
     object Loading : InviteUsersToRoomViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewModel.kt
rename to vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
index 2769dc56bb..23325a9c41 100644
--- a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.invite
+package im.vector.app.features.invite
 
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.rx.rx
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.userdirectory.PendingInvitee
+import im.vector.app.R
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.userdirectory.PendingInvitee
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.rx.rx
 import io.reactivex.Observable
 
 class InviteUsersToRoomViewModel @AssistedInject constructor(@Assisted
diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewState.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewState.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewState.kt
rename to vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewState.kt
index e0c3ec24a3..cd688f097b 100644
--- a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.invite
+package im.vector.app.features.invite
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt b/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt
rename to vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt
index 42f440fc30..2de587e52b 100644
--- a/vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.invite
+package im.vector.app.features.invite
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.updateLayoutParams
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.platform.ButtonStateView
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.platform.ButtonStateView
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.toMatrixItem
 import kotlinx.android.synthetic.main.vector_invite_view.view.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt b/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt
rename to vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt
index 668adc7edd..084dd6349a 100644
--- a/vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt
+++ b/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.lifecycle
+package im.vector.app.features.lifecycle
 
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
-import im.vector.riotx.features.popup.PopupAlertManager
+import im.vector.app.features.popup.PopupAlertManager
 
 class VectorActivityLifecycleCallbacks constructor(private val popupAlertManager: PopupAlertManager) : Application.ActivityLifecycleCallbacks {
     override fun onActivityPaused(activity: Activity) {
diff --git a/vector/src/main/java/im/vector/riotx/features/link/LinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/link/LinkHandlerActivity.kt
rename to vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
index f1782018a0..71a372f039 100644
--- a/vector/src/main/java/im/vector/riotx/features/link/LinkHandlerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.link
+package im.vector.app.features.link
 
 import android.content.Intent
 import android.net.Uri
 import androidx.appcompat.app.AlertDialog
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.login.LoginActivity
-import im.vector.riotx.features.login.LoginConfig
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.login.LoginActivity
+import im.vector.app.features.login.LoginConfig
+import org.matrix.android.sdk.api.MatrixCallback
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/login/AbstractLoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/login/AbstractLoginFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
index 90be21b6be..c6658925af 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/AbstractLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
-import android.os.Build
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.CallSuper
@@ -24,13 +23,13 @@ import androidx.appcompat.app.AlertDialog
 import androidx.transition.TransitionInflater
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.riotx.R
-import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.OnBackPressed
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseFragment
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
 import javax.net.ssl.HttpsURLConnection
 
 /**
@@ -48,9 +47,7 @@ abstract class AbstractLoginFragment : VectorBaseFragment(), OnBackPressed {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.move)
-        }
+        sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.move)
     }
 
     @CallSuper
diff --git a/vector/src/main/java/im/vector/riotx/features/login/Config.kt b/vector/src/main/java/im/vector/app/features/login/Config.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/login/Config.kt
rename to vector/src/main/java/im/vector/app/features/login/Config.kt
index 0f12947dcb..0789a3c421 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/Config.kt
+++ b/vector/src/main/java/im/vector/app/features/login/Config.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 const val EMS_LINK = "https://element.io/matrix-services" +
         "?utm_source=element-android" +
diff --git a/vector/src/main/java/im/vector/riotx/features/login/HomeServerConnectionConfigFactory.kt b/vector/src/main/java/im/vector/app/features/login/HomeServerConnectionConfigFactory.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/login/HomeServerConnectionConfigFactory.kt
rename to vector/src/main/java/im/vector/app/features/login/HomeServerConnectionConfigFactory.kt
index 9f116b99f7..955c3f7290 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/HomeServerConnectionConfigFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/login/HomeServerConnectionConfigFactory.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/login/JavascriptResponse.kt b/vector/src/main/java/im/vector/app/features/login/JavascriptResponse.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/login/JavascriptResponse.kt
rename to vector/src/main/java/im/vector/app/features/login/JavascriptResponse.kt
index 4d88cf6097..3e2d712210 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/JavascriptResponse.kt
+++ b/vector/src/main/java/im/vector/app/features/login/JavascriptResponse.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.Credentials
 
 @JsonClass(generateAdapter = true)
 data class JavascriptResponse(
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginAction.kt b/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginAction.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginAction.kt
index d083f6e9f7..9067984852 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginAction.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.api.auth.registration.RegisterThreePid
-import im.vector.matrix.android.internal.network.ssl.Fingerprint
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
+import org.matrix.android.sdk.internal.network.ssl.Fingerprint
 
 sealed class LoginAction : VectorViewModelAction {
     data class UpdateServerType(val serverType: ServerType) : LoginAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
index 7bb7e99c5f..74aca87bd1 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.content.Context
 import android.content.Intent
@@ -29,28 +29,29 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
 import com.airbnb.mvrx.viewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.auth.registration.FlowResult
-import im.vector.matrix.android.api.auth.registration.Stage
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.POP_BACK_STACK_EXCLUSIVE
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.extensions.addFragmentToBackstack
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.home.HomeActivity
-import im.vector.riotx.features.login.terms.LoginTermsFragment
-import im.vector.riotx.features.login.terms.LoginTermsFragmentArgument
-import im.vector.riotx.features.login.terms.toLocalizedLoginTerms
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.POP_BACK_STACK_EXCLUSIVE
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.extensions.addFragmentToBackstack
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.home.HomeActivity
+import im.vector.app.features.login.terms.LoginTermsFragment
+import im.vector.app.features.login.terms.LoginTermsFragmentArgument
+import im.vector.app.features.login.terms.toLocalizedLoginTerms
+import im.vector.app.features.pin.UnlockedActivity
+import org.matrix.android.sdk.api.auth.registration.FlowResult
+import org.matrix.android.sdk.api.auth.registration.Stage
+import org.matrix.android.sdk.api.extensions.tryThis
 import kotlinx.android.synthetic.main.activity_login.*
 import javax.inject.Inject
 
 /**
  * The LoginActivity manages the fragment navigation and also display the loading View
  */
-open class LoginActivity : VectorBaseActivity(), ToolbarConfigurable {
+open class LoginActivity : VectorBaseActivity(), ToolbarConfigurable, UnlockedActivity {
 
     private val loginViewModel: LoginViewModel by viewModel()
 
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginCaptchaFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginCaptchaFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt
index 9bd709d1bd..f84c4b7022 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginCaptchaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.annotation.SuppressLint
 import android.content.DialogInterface
@@ -31,9 +31,9 @@ import android.webkit.WebViewClient
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.args
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.AssetReader
+import im.vector.app.R
+import im.vector.app.core.utils.AssetReader
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_login_captcha.*
 import timber.log.Timber
@@ -77,6 +77,10 @@ class LoginCaptchaFragment @Inject constructor(
             override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
                 super.onPageStarted(view, url, favicon)
 
+                if (!isAdded) {
+                    return
+                }
+
                 // Show loader
                 loginCaptchaProgress.isVisible = true
             }
@@ -84,6 +88,10 @@ class LoginCaptchaFragment @Inject constructor(
             override fun onPageFinished(view: WebView, url: String) {
                 super.onPageFinished(view, url)
 
+                if (!isAdded) {
+                    return
+                }
+
                 // Hide loader
                 loginCaptchaProgress.isVisible = false
             }
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginConfig.kt b/vector/src/main/java/im/vector/app/features/login/LoginConfig.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginConfig.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginConfig.kt
index 1613d1b041..701335af6b 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginConfig.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginConfig.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.net.Uri
 import android.os.Parcelable
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
index 6f032120b7..a2c458dd67 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.os.Build
 import android.os.Bundle
@@ -28,14 +28,14 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.MatrixError
-import im.vector.matrix.android.api.failure.isInvalidPassword
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.extensions.toReducedUrl
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.extensions.toReducedUrl
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.failure.isInvalidPassword
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import io.reactivex.rxkotlin.subscribeBy
@@ -116,7 +116,7 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
         }
 
         if (error == 0) {
-            loginViewModel.handle(LoginAction.LoginOrRegister(login, password, getString(R.string.login_mobile_device_riotx)))
+            loginViewModel.handle(LoginAction.LoginOrRegister(login, password, getString(R.string.login_default_session_public_name)))
         }
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginGenericTextInputFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginGenericTextInputFormFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
index 5203e60b26..1b5502eb34 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginGenericTextInputFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.os.Build
 import android.os.Bundle
@@ -28,13 +28,13 @@ import com.airbnb.mvrx.args
 import com.google.i18n.phonenumbers.NumberParseException
 import com.google.i18n.phonenumbers.PhoneNumberUtil
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.matrix.android.api.auth.registration.RegisterThreePid
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.failure.is401
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.isEmail
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.isEmail
+import im.vector.app.core.extensions.setTextOrHide
+import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.is401
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_login_generic_text_input_form.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginMode.kt b/vector/src/main/java/im/vector/app/features/login/LoginMode.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginMode.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginMode.kt
index ee39ac564b..9a930dcd86 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginMode.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginMode.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 enum class LoginMode {
     Unknown,
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
index ba3c8e1123..9ca266c417 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.os.Bundle
 import android.view.View
@@ -24,11 +24,11 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.isEmail
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.extensions.toReducedUrl
+import im.vector.app.R
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.isEmail
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.extensions.toReducedUrl
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import io.reactivex.rxkotlin.subscribeBy
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordMailConfirmationFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordMailConfirmationFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
index f340fb8f9f..c12f10e191 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordMailConfirmationFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import androidx.appcompat.app.AlertDialog
 import butterknife.OnClick
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Success
-import im.vector.matrix.android.api.failure.is401
-import im.vector.riotx.R
+import im.vector.app.R
+import org.matrix.android.sdk.api.failure.is401
 import kotlinx.android.synthetic.main.fragment_login_reset_password_mail_confirmation.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordSuccessFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt
index fd3c5e6377..93c987f2db 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import butterknife.OnClick
-import im.vector.riotx.R
+import im.vector.app.R
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
index 5eef820e39..f4595de634 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.os.Bundle
 import android.view.View
 import butterknife.OnClick
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.openUrlInChromeCustomTab
+import im.vector.app.R
+import im.vector.app.core.utils.openUrlInChromeCustomTab
 import kotlinx.android.synthetic.main.fragment_login_server_selection.*
 import me.gujun.android.span.span
 import javax.inject.Inject
@@ -43,13 +43,13 @@ class LoginServerSelectionFragment @Inject constructor() : AbstractLoginFragment
     }
 
     private fun initTextViews() {
-        loginServerChoiceEMSLearnMore.text = span {
+        loginServerChoiceEmsLearnMore.text = span {
             text = getString(R.string.login_server_modular_learn_more)
             textDecorationLine = "underline"
         }
     }
 
-    @OnClick(R.id.loginServerChoiceEMSLearnMore)
+    @OnClick(R.id.loginServerChoiceEmsLearnMore)
     fun learnMore() {
         openUrlInChromeCustomTab(requireActivity(), null, EMS_LINK)
     }
@@ -59,7 +59,7 @@ class LoginServerSelectionFragment @Inject constructor() : AbstractLoginFragment
         loginViewModel.handle(LoginAction.UpdateServerType(ServerType.MatrixOrg))
     }
 
-    @OnClick(R.id.loginServerChoiceEMS)
+    @OnClick(R.id.loginServerChoiceEms)
     fun selectEMS() {
         loginViewModel.handle(LoginAction.UpdateServerType(ServerType.EMS))
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
index b5c19d779a..4b9f528254 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -23,10 +23,10 @@ import android.view.inputmethod.EditorInfo
 import androidx.core.view.isVisible
 import butterknife.OnClick
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.utils.ensureProtocol
-import im.vector.riotx.core.utils.openUrlInChromeCustomTab
+import im.vector.app.R
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.utils.ensureProtocol
+import im.vector.app.core.utils.openUrlInChromeCustomTab
 import kotlinx.android.synthetic.main.fragment_login_server_url_form.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
index 7b0ba7b1f9..fa2f6b9df8 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import androidx.core.view.isVisible
 import butterknife.OnClick
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.toReducedUrl
+import im.vector.app.R
+import im.vector.app.core.extensions.toReducedUrl
 import kotlinx.android.synthetic.main.fragment_login_signup_signin_selection.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSsoFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSsoFragment.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSsoFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSsoFragment.kt
index 538e8be675..8d33ec2e27 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSsoFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSsoFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.content.ComponentName
 import android.net.Uri
@@ -22,8 +22,8 @@ import androidx.browser.customtabs.CustomTabsClient
 import androidx.browser.customtabs.CustomTabsServiceConnection
 import androidx.browser.customtabs.CustomTabsSession
 import androidx.core.view.isVisible
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.openUrlInChromeCustomTab
+import im.vector.app.R
+import im.vector.app.core.utils.openUrlInChromeCustomTab
 import kotlinx.android.synthetic.main.fragment_login_signup_signin_selection.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginSplashFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginSplashFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
index c860d02fec..fe0c36efc6 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import butterknife.OnClick
-import im.vector.riotx.R
+import im.vector.app.R
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginViewEvents.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt
index fe5c00399b..3bc2948f89 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt
@@ -15,10 +15,10 @@
  *
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
-import im.vector.matrix.android.api.auth.registration.FlowResult
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.auth.registration.FlowResult
 
 /**
  * Transient events for Login
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginViewModel.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index bb04fef685..93f8f7a45c 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.content.Context
 import android.net.Uri
@@ -28,28 +28,28 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
-import im.vector.matrix.android.api.auth.data.LoginFlowResult
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
-import im.vector.matrix.android.api.auth.login.LoginWizard
-import im.vector.matrix.android.api.auth.registration.FlowResult
-import im.vector.matrix.android.api.auth.registration.RegistrationResult
-import im.vector.matrix.android.api.auth.registration.RegistrationWizard
-import im.vector.matrix.android.api.auth.registration.Stage
-import im.vector.matrix.android.api.auth.wellknown.WellknownResult
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.extensions.configureAndStart
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.ensureTrailingSlash
-import im.vector.riotx.features.signout.soft.SoftLogoutActivity
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.configureAndStart
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.ensureTrailingSlash
+import im.vector.app.features.signout.soft.SoftLogoutActivity
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.LoginFlowResult
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.login.LoginWizard
+import org.matrix.android.sdk.api.auth.registration.FlowResult
+import org.matrix.android.sdk.api.auth.registration.RegistrationResult
+import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
+import org.matrix.android.sdk.api.auth.registration.Stage
+import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.Cancelable
 import timber.log.Timber
 import java.util.concurrent.CancellationException
 
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginViewState.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewState.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginViewState.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginViewState.kt
index 26e552ed1f..194ed668bc 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Loading
@@ -22,9 +22,9 @@ import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.PersistState
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.auth.SSO_REDIRECT_PATH
-import im.vector.matrix.android.api.auth.SSO_REDIRECT_URL_PARAM
-import im.vector.riotx.core.extensions.appendParamToUrl
+import im.vector.app.core.extensions.appendParamToUrl
+import org.matrix.android.sdk.api.auth.SSO_REDIRECT_PATH
+import org.matrix.android.sdk.api.auth.SSO_REDIRECT_URL_PARAM
 
 data class LoginViewState(
         val asyncLoginAction: Async<Unit> = Uninitialized,
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginWaitForEmailFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginWaitForEmailFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt
index c4507876d7..7202ffc950 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginWaitForEmailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.View
 import com.airbnb.mvrx.args
-import im.vector.matrix.android.api.failure.is401
-import im.vector.riotx.R
+import im.vector.app.R
+import org.matrix.android.sdk.api.failure.is401
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_login_wait_for_email.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginWebFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/login/LoginWebFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
index 62431647c0..6d943fd99f 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginWebFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
@@ -16,13 +16,12 @@
 
 @file:Suppress("DEPRECATION")
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 import android.annotation.SuppressLint
 import android.content.DialogInterface
 import android.graphics.Bitmap
 import android.net.http.SslError
-import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
@@ -31,15 +30,15 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.activityViewModel
-import im.vector.matrix.android.api.auth.LOGIN_FALLBACK_PATH
-import im.vector.matrix.android.api.auth.REGISTER_FALLBACK_PATH
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.appendParamToUrl
-import im.vector.riotx.core.utils.AssetReader
-import im.vector.riotx.features.signout.soft.SoftLogoutAction
-import im.vector.riotx.features.signout.soft.SoftLogoutViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.appendParamToUrl
+import im.vector.app.core.utils.AssetReader
+import im.vector.app.features.signout.soft.SoftLogoutAction
+import im.vector.app.features.signout.soft.SoftLogoutViewModel
+import org.matrix.android.sdk.api.auth.LOGIN_FALLBACK_PATH
+import org.matrix.android.sdk.api.auth.REGISTER_FALLBACK_PATH
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import kotlinx.android.synthetic.main.fragment_login_web.*
 import timber.log.Timber
 import java.net.URLDecoder
@@ -102,14 +101,6 @@ class LoginWebFragment @Inject constructor(
             launchWebView(state)
         } else {
             if (!cookieManager.hasCookies()) {
-                launchWebView(state)
-            } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                try {
-                    cookieManager.removeAllCookie()
-                } catch (e: Exception) {
-                    Timber.e(e, " cookieManager.removeAllCookie() fails")
-                }
-
                 launchWebView(state)
             } else {
                 try {
diff --git a/vector/src/main/java/im/vector/riotx/features/login/ReAuthHelper.kt b/vector/src/main/java/im/vector/app/features/login/ReAuthHelper.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/login/ReAuthHelper.kt
rename to vector/src/main/java/im/vector/app/features/login/ReAuthHelper.kt
index 78979930bd..f379048568 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/ReAuthHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/login/ReAuthHelper.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
-import im.vector.riotx.core.utils.TemporaryStore
+import im.vector.app.core.utils.TemporaryStore
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/riotx/features/login/ServerType.kt b/vector/src/main/java/im/vector/app/features/login/ServerType.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/login/ServerType.kt
rename to vector/src/main/java/im/vector/app/features/login/ServerType.kt
index 058a052059..e0a6ba8b40 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/ServerType.kt
+++ b/vector/src/main/java/im/vector/app/features/login/ServerType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 enum class ServerType {
     Unknown,
diff --git a/vector/src/main/java/im/vector/riotx/features/login/SignMode.kt b/vector/src/main/java/im/vector/app/features/login/SignMode.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/login/SignMode.kt
rename to vector/src/main/java/im/vector/app/features/login/SignMode.kt
index ad06f1f4a9..9933b92f27 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/SignMode.kt
+++ b/vector/src/main/java/im/vector/app/features/login/SignMode.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
 enum class SignMode {
     Unknown,
diff --git a/vector/src/main/java/im/vector/riotx/features/login/SupportedStage.kt b/vector/src/main/java/im/vector/app/features/login/SupportedStage.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/login/SupportedStage.kt
rename to vector/src/main/java/im/vector/app/features/login/SupportedStage.kt
index ce234caeb0..d9036f9ee4 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/SupportedStage.kt
+++ b/vector/src/main/java/im/vector/app/features/login/SupportedStage.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login
+package im.vector.app.features.login
 
-import im.vector.matrix.android.api.auth.registration.Stage
+import org.matrix.android.sdk.api.auth.registration.Stage
 
 /**
  * Stage.Other is not supported, as well as any other new stages added to the SDK before it is added to the list below
diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt b/vector/src/main/java/im/vector/app/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt
rename to vector/src/main/java/im/vector/app/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt
index 6659d65dd6..e6b082ceb7 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login.terms
+package im.vector.app.features.login.terms
 
-import im.vector.matrix.android.internal.auth.registration.LocalizedFlowDataLoginTerms
+import org.matrix.android.sdk.internal.auth.registration.LocalizedFlowDataLoginTerms
 
 data class LocalizedFlowDataLoginTermsChecked(val localizedFlowDataLoginTerms: LocalizedFlowDataLoginTerms,
                                               var checked: Boolean = false)
diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsFragment.kt b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsFragment.kt
rename to vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
index 49abc9ba81..529713af37 100755
--- a/vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login.terms
+package im.vector.app.features.login.terms
 
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.View
 import butterknife.OnClick
 import com.airbnb.mvrx.args
-import im.vector.matrix.android.internal.auth.registration.LocalizedFlowDataLoginTerms
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.toReducedUrl
-import im.vector.riotx.core.utils.openUrlInChromeCustomTab
-import im.vector.riotx.features.login.AbstractLoginFragment
-import im.vector.riotx.features.login.LoginAction
-import im.vector.riotx.features.login.LoginViewState
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.toReducedUrl
+import im.vector.app.core.utils.openUrlInChromeCustomTab
+import im.vector.app.features.login.AbstractLoginFragment
+import im.vector.app.features.login.LoginAction
+import im.vector.app.features.login.LoginViewState
+import org.matrix.android.sdk.internal.auth.registration.LocalizedFlowDataLoginTerms
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_login_terms.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsViewState.kt b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsViewState.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsViewState.kt
rename to vector/src/main/java/im/vector/app/features/login/terms/LoginTermsViewState.kt
index 77293fbef6..c09c76efc3 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsViewState.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login.terms
+package im.vector.app.features.login.terms
 
 import com.airbnb.mvrx.MvRxState
-import im.vector.matrix.android.internal.auth.registration.LocalizedFlowDataLoginTerms
+import org.matrix.android.sdk.internal.auth.registration.LocalizedFlowDataLoginTerms
 
 data class LoginTermsViewState(
         val localizedFlowDataLoginTermsChecked: List<LocalizedFlowDataLoginTermsChecked>
diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyController.kt b/vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/login/terms/PolicyController.kt
rename to vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt
index 42ed87a280..e786b103a2 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyController.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login.terms
+package im.vector.app.features.login.terms
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.internal.auth.registration.LocalizedFlowDataLoginTerms
+import org.matrix.android.sdk.internal.auth.registration.LocalizedFlowDataLoginTerms
 import javax.inject.Inject
 
 class PolicyController @Inject constructor() : TypedEpoxyController<List<LocalizedFlowDataLoginTermsChecked>>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyItem.kt b/vector/src/main/java/im/vector/app/features/login/terms/PolicyItem.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/login/terms/PolicyItem.kt
rename to vector/src/main/java/im/vector/app/features/login/terms/PolicyItem.kt
index 50e92488a1..b15893b239 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyItem.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/PolicyItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login.terms
+package im.vector.app.features.login.terms
 
 import android.view.View
 import android.widget.CheckBox
@@ -23,8 +23,8 @@ import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
 
 @EpoxyModelClass(layout = R.layout.item_policy)
 abstract class PolicyItem : EpoxyModelWithHolder<PolicyItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/UrlAndName.kt b/vector/src/main/java/im/vector/app/features/login/terms/UrlAndName.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/login/terms/UrlAndName.kt
rename to vector/src/main/java/im/vector/app/features/login/terms/UrlAndName.kt
index 1ccb7cac49..f298aeca37 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/terms/UrlAndName.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/UrlAndName.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login.terms
+package im.vector.app.features.login.terms
 
 data class UrlAndName(
         val url: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/converter.kt b/vector/src/main/java/im/vector/app/features/login/terms/converter.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/login/terms/converter.kt
rename to vector/src/main/java/im/vector/app/features/login/terms/converter.kt
index d28d12eee8..f054a679bc 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/terms/converter.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/converter.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.login.terms
+package im.vector.app.features.login.terms
 
-import im.vector.matrix.android.api.auth.registration.TermPolicies
-import im.vector.matrix.android.internal.auth.registration.LocalizedFlowDataLoginTerms
+import org.matrix.android.sdk.api.auth.registration.TermPolicies
+import org.matrix.android.sdk.internal.auth.registration.LocalizedFlowDataLoginTerms
 
 /**
  * This method extract the policies from the login terms parameter, regarding the user language.
diff --git a/vector/src/main/java/im/vector/riotx/features/media/AttachmentOverlayView.kt b/vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/media/AttachmentOverlayView.kt
rename to vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt
index 2812b011f9..db0b6811da 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/AttachmentOverlayView.kt
+++ b/vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.content.Context
 import android.graphics.Color
@@ -25,9 +25,9 @@ import android.widget.SeekBar
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.Group
-import im.vector.riotx.R
-import im.vector.riotx.attachmentviewer.AttachmentEventListener
-import im.vector.riotx.attachmentviewer.AttachmentEvents
+import im.vector.app.R
+import im.vector.lib.attachmentviewer.AttachmentEventListener
+import im.vector.lib.attachmentviewer.AttachmentEvents
 
 class AttachmentOverlayView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
diff --git a/vector/src/main/java/im/vector/riotx/features/media/BaseAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/media/BaseAttachmentProvider.kt
rename to vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
index d4c41c7cb3..966ee985f0 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/BaseAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.content.Context
 import android.graphics.drawable.Drawable
@@ -22,12 +22,12 @@ import android.view.View
 import android.widget.ImageView
 import com.bumptech.glide.request.target.CustomViewTarget
 import com.bumptech.glide.request.transition.Transition
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.riotx.attachmentviewer.AttachmentInfo
-import im.vector.riotx.attachmentviewer.AttachmentSourceProvider
-import im.vector.riotx.attachmentviewer.ImageLoaderTarget
-import im.vector.riotx.attachmentviewer.VideoLoaderTarget
+import im.vector.lib.attachmentviewer.AttachmentInfo
+import im.vector.lib.attachmentviewer.AttachmentSourceProvider
+import im.vector.lib.attachmentviewer.ImageLoaderTarget
+import im.vector.lib.attachmentviewer.VideoLoaderTarget
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.file.FileService
 import java.io.File
 
 abstract class BaseAttachmentProvider(val imageContentRenderer: ImageContentRenderer, val fileService: FileService) : AttachmentSourceProvider {
diff --git a/vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt
rename to vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
index e13bcf9dde..9d0a931a32 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.app.Activity
 import android.content.Context
@@ -27,18 +27,18 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.net.toUri
 import com.yalantis.ucrop.UCrop
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.multipicker.MultiPicker
-import im.vector.riotx.multipicker.entity.MultiPickerImageType
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.lib.multipicker.MultiPicker
+import im.vector.lib.multipicker.entity.MultiPickerImageType
 import kotlinx.android.synthetic.main.activity_big_image_viewer.*
 import java.io.File
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/media/DataAttachmentRoomProvider.kt b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/media/DataAttachmentRoomProvider.kt
rename to vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
index cb0039fc7e..daa8bbc206 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/DataAttachmentRoomProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.content.Context
 import android.view.View
 import androidx.core.view.isVisible
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.events.model.isVideoMessage
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.riotx.attachmentviewer.AttachmentInfo
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.core.extensions.localDateTime
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.extensions.localDateTime
+import im.vector.lib.attachmentviewer.AttachmentInfo
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.events.model.isVideoMessage
+import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.api.session.room.Room
 import java.io.File
 
 class DataAttachmentRoomProvider(
diff --git a/vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt b/vector/src/main/java/im/vector/app/features/media/DefaultImageLoaderCallback.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt
rename to vector/src/main/java/im/vector/app/features/media/DefaultImageLoaderCallback.kt
index 0cc74f3fee..ec77121b62 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/media/DefaultImageLoaderCallback.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import com.github.piasy.biv.loader.ImageLoader
 import java.io.File
diff --git a/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt
rename to vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
index 926cef0668..2976f4b4b1 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.graphics.drawable.Drawable
 import android.net.Uri
@@ -29,15 +29,15 @@ import com.bumptech.glide.request.target.CustomViewTarget
 import com.bumptech.glide.request.target.Target
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.ORIENTATION_USE_EXIF
 import com.github.piasy.biv.view.BigImageView
-import im.vector.matrix.android.api.session.content.ContentUrlResolver
-import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.glide.GlideApp
-import im.vector.riotx.core.glide.GlideRequest
-import im.vector.riotx.core.ui.model.Size
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.core.utils.isLocalFile
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.glide.GlideRequest
+import im.vector.app.core.ui.model.Size
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.core.utils.isLocalFile
+import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
 import kotlinx.android.parcel.Parcelize
 import timber.log.Timber
 import java.io.File
diff --git a/vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt
rename to vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt
index 8a6c2f7545..fa7f397b8f 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt
@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.Drawable
-import android.os.Build
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewTreeObserver
-import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 import androidx.core.net.toUri
 import androidx.core.transition.addListener
@@ -38,15 +36,15 @@ import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
 import com.github.piasy.biv.indicator.progresspie.ProgressPieIndicator
 import com.github.piasy.biv.view.GlideImageViewFactory
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.glide.GlideApp
-import im.vector.riotx.core.intent.getMimeTypeFromUri
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.utils.shareMedia
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.intent.getMimeTypeFromUri
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.shareMedia
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.file.FileService
 import kotlinx.android.synthetic.main.activity_image_media_viewer.*
 import timber.log.Timber
 import java.io.File
@@ -65,7 +63,7 @@ class ImageMediaViewerActivity : VectorBaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(im.vector.riotx.R.layout.activity_image_media_viewer)
+        setContentView(im.vector.app.R.layout.activity_image_media_viewer)
 
         if (intent.hasExtra(EXTRA_MEDIA_DATA)) {
             mediaData = intent.getParcelableExtra(EXTRA_MEDIA_DATA)!!
@@ -84,7 +82,7 @@ class ImageMediaViewerActivity : VectorBaseActivity() {
 
         configureToolbar(imageMediaViewerToolbar, mediaData)
 
-        if (isFirstCreation() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && addTransitionListener()) {
+        if (isFirstCreation() && addTransitionListener()) {
             // Encrypted image
             imageTransitionView.isVisible = true
             imageMediaViewerImageView.isVisible = false
@@ -183,7 +181,6 @@ class ImageMediaViewerActivity : VectorBaseActivity() {
      *
      * @return true if we were successful in adding a listener to the enter transition
      */
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     private fun addTransitionListener(): Boolean {
         val transition = window.sharedElementEnterTransition
 
diff --git a/vector/src/main/java/im/vector/riotx/features/media/RoomEventsAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/media/RoomEventsAttachmentProvider.kt
rename to vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
index 7a7fea6dc4..b4fa38eefc 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/RoomEventsAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.content.Context
 import android.view.View
 import androidx.core.view.isVisible
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.isVideoMessage
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageImageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent
-import im.vector.matrix.android.api.session.room.model.message.MessageWithAttachmentContent
-import im.vector.matrix.android.api.session.room.model.message.getFileUrl
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt
-import im.vector.riotx.attachmentviewer.AttachmentInfo
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.core.extensions.localDateTime
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.extensions.localDateTime
+import im.vector.lib.attachmentviewer.AttachmentInfo
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.isVideoMessage
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import java.io.File
 import javax.inject.Inject
 
@@ -147,7 +147,7 @@ class RoomEventsAttachmentProvider(
                     elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt(),
                     callback = object : MatrixCallback<File> {
                         override fun onSuccess(data: File) {
-                           callback(data)
+                            callback(data)
                         }
 
                         override fun onFailure(failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/riotx/features/media/UCropHelper.kt b/vector/src/main/java/im/vector/app/features/media/UCropHelper.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/media/UCropHelper.kt
rename to vector/src/main/java/im/vector/app/features/media/UCropHelper.kt
index 5e3ca5f483..8c8c8f22f1 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/UCropHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/media/UCropHelper.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.content.Context
 import android.graphics.Color
@@ -22,8 +22,8 @@ import android.net.Uri
 import androidx.core.content.ContextCompat
 import com.yalantis.ucrop.UCrop
 import com.yalantis.ucrop.UCropActivity
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.features.themes.ThemeUtils
 
 fun createUCropWithDefaultSettings(context: Context, source: Uri, destination: Uri, toolbarTitle: String?): UCrop {
     return UCrop.of(source, destination)
diff --git a/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt
rename to vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
index 9e5facd162..74f4c7148f 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.content.Context
 import android.content.Intent
@@ -30,18 +30,18 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
 import androidx.transition.Transition
-import im.vector.riotx.R
-import im.vector.riotx.attachmentviewer.AttachmentCommands
-import im.vector.riotx.attachmentviewer.AttachmentViewerActivity
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.DaggerScreenComponent
-import im.vector.riotx.core.di.HasVectorInjector
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.di.VectorComponent
-import im.vector.riotx.core.intent.getMimeTypeFromUri
-import im.vector.riotx.core.utils.shareMedia
-import im.vector.riotx.features.themes.ActivityOtherThemes
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.DaggerScreenComponent
+import im.vector.app.core.di.HasVectorInjector
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.di.VectorComponent
+import im.vector.app.core.intent.getMimeTypeFromUri
+import im.vector.app.core.utils.shareMedia
+import im.vector.app.features.themes.ActivityOtherThemes
+import im.vector.app.features.themes.ThemeUtils
+import im.vector.lib.attachmentviewer.AttachmentCommands
+import im.vector.lib.attachmentviewer.AttachmentViewerActivity
 import kotlinx.android.parcel.Parcelize
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt
rename to vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
index e6dec88349..45fc238e93 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.VideoView
 import androidx.core.view.isVisible
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.error.ErrorFormatter
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.error.ErrorFormatter
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
 import kotlinx.android.parcel.Parcelize
 import timber.log.Timber
 import java.io.File
diff --git a/vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt
rename to vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt
index d9df861a25..5bdda9b0be 100644
--- a/vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.media
+package im.vector.app.features.media
 
 import android.content.Context
 import android.content.Intent
@@ -22,14 +22,14 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.widget.Toolbar
 import androidx.core.net.toUri
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.intent.getMimeTypeFromUri
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.utils.shareMedia
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.intent.getMimeTypeFromUri
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.shareMedia
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.file.FileService
 import kotlinx.android.synthetic.main.activity_video_media_viewer.*
 import java.io.File
 import javax.inject.Inject
@@ -48,7 +48,7 @@ class VideoMediaViewerActivity : VectorBaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(im.vector.riotx.R.layout.activity_video_media_viewer)
+        setContentView(im.vector.app.R.layout.activity_video_media_viewer)
 
         if (intent.hasExtra(EXTRA_MEDIA_DATA)) {
             mediaData = intent.getParcelableExtra<VideoContentRenderer.Data>(EXTRA_MEDIA_DATA)!!
diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
similarity index 76%
rename from vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt
rename to vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 8267ba4c99..3da6a7257a 100644
--- a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.navigation
+package im.vector.app.features.navigation
 
 import android.app.Activity
 import android.content.Context
@@ -26,44 +26,50 @@ import androidx.core.app.TaskStackBuilder
 import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.Fragment
-import im.vector.matrix.android.api.session.crypto.verification.IncomingSasVerificationTransaction
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.error.fatalError
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.createdirect.CreateDirectRoomActivity
-import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
-import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity
-import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet
-import im.vector.riotx.features.crypto.verification.SupportedVerificationMethodsProvider
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheet
-import im.vector.riotx.features.debug.DebugMenuActivity
-import im.vector.riotx.features.home.room.detail.RoomDetailActivity
-import im.vector.riotx.features.home.room.detail.RoomDetailArgs
-import im.vector.riotx.features.home.room.detail.widget.WidgetRequestCodes
-import im.vector.riotx.features.home.room.filtered.FilteredRoomsActivity
-import im.vector.riotx.features.invite.InviteUsersToRoomActivity
-import im.vector.riotx.features.media.AttachmentData
-import im.vector.riotx.features.media.BigImageViewerActivity
-import im.vector.riotx.features.media.VectorAttachmentViewerActivity
-import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
-import im.vector.riotx.features.roomdirectory.createroom.CreateRoomActivity
-import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewActivity
-import im.vector.riotx.features.roommemberprofile.RoomMemberProfileActivity
-import im.vector.riotx.features.roommemberprofile.RoomMemberProfileArgs
-import im.vector.riotx.features.roomprofile.RoomProfileActivity
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.settings.VectorSettingsActivity
-import im.vector.riotx.features.share.SharedData
-import im.vector.riotx.features.terms.ReviewTermsActivity
-import im.vector.riotx.features.widgets.WidgetActivity
-import im.vector.riotx.features.widgets.WidgetArgsBuilder
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.error.fatalError
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.toast
+import im.vector.app.features.call.conference.JitsiCallViewModel
+import im.vector.app.features.call.conference.VectorJitsiActivity
+import im.vector.app.features.createdirect.CreateDirectRoomActivity
+import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity
+import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity
+import im.vector.app.features.crypto.recover.BootstrapBottomSheet
+import im.vector.app.features.crypto.verification.SupportedVerificationMethodsProvider
+import im.vector.app.features.crypto.verification.VerificationBottomSheet
+import im.vector.app.features.debug.DebugMenuActivity
+import im.vector.app.features.home.room.detail.RoomDetailActivity
+import im.vector.app.features.home.room.detail.RoomDetailArgs
+import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
+import im.vector.app.features.home.room.filtered.FilteredRoomsActivity
+import im.vector.app.features.invite.InviteUsersToRoomActivity
+import im.vector.app.features.media.AttachmentData
+import im.vector.app.features.media.BigImageViewerActivity
+import im.vector.app.features.media.VectorAttachmentViewerActivity
+import im.vector.app.features.pin.PinActivity
+import im.vector.app.features.pin.PinArgs
+import im.vector.app.features.pin.PinMode
+import im.vector.app.features.roomdirectory.RoomDirectoryActivity
+import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity
+import im.vector.app.features.roomdirectory.roompreview.RoomPreviewActivity
+import im.vector.app.features.roommemberprofile.RoomMemberProfileActivity
+import im.vector.app.features.roommemberprofile.RoomMemberProfileArgs
+import im.vector.app.features.roomprofile.RoomProfileActivity
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorSettingsActivity
+import im.vector.app.features.share.SharedData
+import im.vector.app.features.terms.ReviewTermsActivity
+import im.vector.app.features.widgets.WidgetActivity
+import im.vector.app.features.widgets.WidgetArgsBuilder
+import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
+import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
+import org.matrix.android.sdk.api.session.terms.TermsService
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import org.matrix.android.sdk.api.util.MatrixItem
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -267,9 +273,24 @@ class DefaultNavigator @Inject constructor(
         fragment.startActivityForResult(intent, WidgetRequestCodes.INTEGRATION_MANAGER_REQUEST_CODE)
     }
 
-    override fun openRoomWidget(context: Context, roomId: String, widget: Widget) {
-        val widgetArgs = widgetArgsBuilder.buildRoomWidgetArgs(roomId, widget)
-        context.startActivity(WidgetActivity.newIntent(context, widgetArgs))
+    override fun openRoomWidget(context: Context, roomId: String, widget: Widget, options: Map<String, Any>?) {
+        if (widget.type is WidgetType.Jitsi) {
+            val enableVideo = options?.get(JitsiCallViewModel.ENABLE_VIDEO_OPTION) == true
+            context.startActivity(VectorJitsiActivity.newIntent(context, roomId = roomId, widgetId = widget.widgetId, enableVideo = enableVideo))
+        } else {
+            val widgetArgs = widgetArgsBuilder.buildRoomWidgetArgs(roomId, widget)
+            context.startActivity(WidgetActivity.newIntent(context, widgetArgs))
+        }
+    }
+
+    override fun openPinCode(fragment: Fragment, pinMode: PinMode, requestCode: Int) {
+        val intent = PinActivity.newIntent(fragment.requireContext(), PinArgs(pinMode))
+        fragment.startActivityForResult(intent, requestCode)
+    }
+
+    override fun openPinCode(activity: Activity, pinMode: PinMode, requestCode: Int) {
+        val intent = PinActivity.newIntent(activity, PinArgs(pinMode))
+        activity.startActivityForResult(intent, requestCode)
     }
 
     override fun openMediaViewer(activity: Activity,
diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
similarity index 77%
rename from vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt
rename to vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 2d817183be..ee64c5fc75 100644
--- a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -14,23 +14,25 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.navigation
+package im.vector.app.features.navigation
 
 import android.app.Activity
 import android.content.Context
 import android.view.View
 import androidx.core.util.Pair
 import androidx.fragment.app.Fragment
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.features.home.room.detail.widget.WidgetRequestCodes
-import im.vector.riotx.features.media.AttachmentData
-import im.vector.riotx.features.settings.VectorSettingsActivity
-import im.vector.riotx.features.share.SharedData
-import im.vector.riotx.features.terms.ReviewTermsActivity
+import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
+import im.vector.app.features.media.AttachmentData
+import im.vector.app.features.pin.PinActivity
+import im.vector.app.features.pin.PinMode
+import im.vector.app.features.settings.VectorSettingsActivity
+import im.vector.app.features.share.SharedData
+import im.vector.app.features.terms.ReviewTermsActivity
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
+import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
+import org.matrix.android.sdk.api.session.terms.TermsService
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.util.MatrixItem
 
 interface Navigator {
 
@@ -78,6 +80,10 @@ interface Navigator {
 
     fun openBigImageViewer(activity: Activity, sharedElement: View?, matrixItem: MatrixItem)
 
+    fun openPinCode(fragment: Fragment, pinMode: PinMode, requestCode: Int = PinActivity.PIN_REQUEST_CODE)
+
+    fun openPinCode(activity: Activity, pinMode: PinMode, requestCode: Int = PinActivity.PIN_REQUEST_CODE)
+
     fun openTerms(fragment: Fragment,
                   serviceType: TermsService.ServiceType,
                   baseUrl: String,
@@ -91,7 +97,7 @@ interface Navigator {
 
     fun openIntegrationManager(fragment: Fragment, roomId: String, integId: String?, screen: String?)
 
-    fun openRoomWidget(context: Context, roomId: String, widget: Widget)
+    fun openRoomWidget(context: Context, roomId: String, widget: Widget, options: Map<String, Any>? = null)
 
     fun openMediaViewer(activity: Activity,
                         roomId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt b/vector/src/main/java/im/vector/app/features/notifications/BitmapLoader.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt
rename to vector/src/main/java/im/vector/app/features/notifications/BitmapLoader.kt
index fbef196c53..d1c4624cdc 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/BitmapLoader.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt b/vector/src/main/java/im/vector/app/features/notifications/IconLoader.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt
rename to vector/src/main/java/im/vector/app/features/notifications/IconLoader.kt
index dccae42279..3e68744c88 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/IconLoader.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 import android.content.Context
 import android.os.Build
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/InviteNotifiableEvent.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt
rename to vector/src/main/java/im/vector/app/features/notifications/InviteNotifiableEvent.kt
index 0cfbeffec8..61fd5c677a 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/InviteNotifiableEvent.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 import androidx.core.app.NotificationCompat
 
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt
rename to vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt
index ddf48c7154..2be5650904 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 import java.io.Serializable
 
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt
rename to vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index a2dc8d33f0..649dbd89f9 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 import androidx.core.app.NotificationCompat
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.content.ContentUrlResolver
-import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.matrix.android.api.session.room.timeline.getEditedEventId
-import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.room.detail.timeline.format.DisplayableEventFormatter
-import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter
+import im.vector.app.features.home.room.detail.timeline.format.NoticeEventFormatter
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getEditedEventId
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import timber.log.Timber
 import java.util.UUID
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt
rename to vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
index ab48b5f3b4..fb9ca8d23c 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 import androidx.core.app.NotificationCompat
-import im.vector.matrix.android.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.EventType
 
 data class NotifiableMessageEvent(
         override val eventId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationAction.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt
rename to vector/src/main/java/im/vector/app/features/notifications/NotificationAction.kt
index 6322ecf998..c11ce6794f 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationAction.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
-import im.vector.matrix.android.api.pushrules.Action
+import org.matrix.android.sdk.api.pushrules.Action
 
 data class NotificationAction(
         val shouldNotify: Boolean,
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt
rename to vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index 04b267fb3a..9cfed991bb 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.RemoteInput
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.read.ReadService
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.extensions.vectorComponent
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.vectorComponent
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.read.ReadService
 import timber.log.Timber
 import java.util.UUID
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt
rename to vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index f7085a000e..98d35dc764 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -22,13 +22,13 @@ import android.os.HandlerThread
 import androidx.annotation.WorkerThread
 import androidx.core.app.NotificationCompat
 import androidx.core.app.Person
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.content.ContentUrlResolver
-import im.vector.riotx.ActiveSessionDataSource
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.ActiveSessionDataSource
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import me.gujun.android.span.span
 import timber.log.Timber
 import java.io.File
@@ -442,7 +442,7 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
                         /*
                         TODO
                         if (Matrix.getInstance(VectorApp.getInstance())!!.pushManager.isScreenTurnedOn) {
-                            val pm = VectorApp.getInstance().getSystemService(Context.POWER_SERVICE) as PowerManager
+                            val pm = VectorApp.getInstance().getSystemService<PowerManager>()!!
                             val wl = pm.newWakeLock(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or PowerManager.ACQUIRE_CAUSES_WAKEUP,
                                     NotificationDrawerManager::class.java.name)
                             wl.acquire(3000)
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt
rename to vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index 36874d5782..2b070e540e 100755
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -16,7 +16,7 @@
 
 @file:Suppress("UNUSED_PARAMETER")
 
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 import android.annotation.SuppressLint
 import android.annotation.TargetApi
@@ -35,18 +35,20 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.RemoteInput
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
+import androidx.core.content.getSystemService
 import androidx.core.graphics.drawable.IconCompat
 import androidx.fragment.app.Fragment
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.startNotificationChannelSettingsIntent
-import im.vector.riotx.features.call.VectorCallActivity
-import im.vector.riotx.features.call.service.CallHeadsUpActionReceiver
-import im.vector.riotx.features.home.HomeActivity
-import im.vector.riotx.features.home.room.detail.RoomDetailActivity
-import im.vector.riotx.features.home.room.detail.RoomDetailArgs
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.startNotificationChannelSettingsIntent
+import im.vector.app.features.call.VectorCallActivity
+import im.vector.app.features.call.service.CallHeadsUpActionReceiver
+import im.vector.app.features.home.HomeActivity
+import im.vector.app.features.home.room.detail.RoomDetailActivity
+import im.vector.app.features.home.room.detail.RoomDetailArgs
+import im.vector.app.features.pin.PinLocker
+import im.vector.app.features.settings.VectorPreferences
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -59,6 +61,7 @@ import kotlin.random.Random
 @Singleton
 class NotificationUtils @Inject constructor(private val context: Context,
                                             private val stringProvider: StringProvider,
+                                            private val pinLocker: PinLocker,
                                             private val vectorPreferences: VectorPreferences) {
 
     companion object {
@@ -851,7 +854,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         }
 
         // We cannot use NotificationManagerCompat here.
-        val setting = (context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).currentInterruptionFilter
+        val setting = context.getSystemService<NotificationManager>()!!.currentInterruptionFilter
 
         return setting == NotificationManager.INTERRUPTION_FILTER_NONE
                 || setting == NotificationManager.INTERRUPTION_FILTER_ALARMS
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt b/vector/src/main/java/im/vector/app/features/notifications/OutdatedEventDetector.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt
rename to vector/src/main/java/im/vector/app/features/notifications/OutdatedEventDetector.kt
index d2b939bc99..c6ef616afe 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/OutdatedEventDetector.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
-import im.vector.riotx.ActiveSessionDataSource
+import im.vector.app.ActiveSessionDataSource
 import javax.inject.Inject
 
 class OutdatedEventDetector @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt b/vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt
rename to vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt
index adef246151..791803fa49 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
-import im.vector.matrix.android.api.pushrules.Action
-import im.vector.matrix.android.api.pushrules.PushRuleService
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.Event
+import org.matrix.android.sdk.api.pushrules.Action
+import org.matrix.android.sdk.api.pushrules.PushRuleService
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.Event
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt b/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt
rename to vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt
index c0852abbd4..b9363864e7 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 /**
  * Data class to hold information about a group of notifications for a room
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/SimpleNotifiableEvent.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt
rename to vector/src/main/java/im/vector/app/features/notifications/SimpleNotifiableEvent.kt
index e81307e433..2f74737ba2 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/SimpleNotifiableEvent.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.notifications
+package im.vector.app.features.notifications
 
 import androidx.core.app.NotificationCompat
 
diff --git a/vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandler.kt
rename to vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
index bcf981fc92..87d114c01b 100644
--- a/vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.permalink
+package im.vector.app.features.permalink
 
 import android.content.Context
 import android.net.Uri
-import im.vector.matrix.android.api.permalinks.PermalinkData
-import im.vector.matrix.android.api.permalinks.PermalinkParser
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.features.navigation.Navigator
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.features.navigation.Navigator
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
+import org.matrix.android.sdk.api.session.permalinks.PermalinkData
+import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.rx.rx
 import javax.inject.Inject
 
 class PermalinkHandler @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
diff --git a/vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandlerActivity.kt
rename to vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt
index 5339a2c6f9..e005dd06c5 100644
--- a/vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandlerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.permalink
+package im.vector.app.features.permalink
 
 import android.content.Intent
 import android.os.Bundle
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.home.LoadingFragment
-import im.vector.riotx.features.login.LoginActivity
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.toast
+import im.vector.app.features.home.LoadingFragment
+import im.vector.app.features.login.LoginActivity
 import io.reactivex.android.schedulers.AndroidSchedulers
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
new file mode 100644
index 0000000000..a2930c6129
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.pin
+
+import android.content.Context
+import android.content.Intent
+import androidx.appcompat.widget.Toolbar
+import com.airbnb.mvrx.MvRx
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+
+class PinActivity : VectorBaseActivity(), ToolbarConfigurable, UnlockedActivity {
+
+    companion object {
+
+        const val PIN_REQUEST_CODE = 17890
+
+        fun newIntent(context: Context, args: PinArgs): Intent {
+            return Intent(context, PinActivity::class.java).apply {
+                putExtra(MvRx.KEY_ARG, args)
+            }
+        }
+    }
+
+    override fun getLayoutRes() = R.layout.activity_simple
+
+    override fun initUiAndData() {
+        if (isFirstCreation()) {
+            val fragmentArgs: PinArgs = intent?.extras?.getParcelable(MvRx.KEY_ARG) ?: return
+            addFragment(R.id.simpleFragmentContainer, PinFragment::class.java, fragmentArgs)
+        }
+    }
+
+    override fun configure(toolbar: Toolbar) {
+        configureToolbar(toolbar)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinCodeStore.kt b/vector/src/main/java/im/vector/app/features/pin/PinCodeStore.kt
new file mode 100644
index 0000000000..630b165214
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/pin/PinCodeStore.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.pin
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import com.beautycoder.pflockscreen.security.PFResult
+import com.beautycoder.pflockscreen.security.PFSecurityManager
+import com.beautycoder.pflockscreen.security.callbacks.PFPinCodeHelperCallback
+import org.matrix.android.sdk.api.extensions.orFalse
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+interface PinCodeStore {
+
+    suspend fun storeEncodedPin(encodePin: String)
+
+    suspend fun deleteEncodedPin()
+
+    fun getEncodedPin(): String?
+
+    suspend fun hasEncodedPin(): Boolean
+
+    fun getRemainingPinCodeAttemptsNumber(): Int
+
+    fun getRemainingBiometricsAttemptsNumber(): Int
+
+    /**
+     * Will return the number of remaining attempts
+     */
+    fun onWrongPin(): Int
+
+    /**
+     * Will return the number of remaining attempts
+     */
+    fun onWrongBiometrics(): Int
+
+    /**
+     * Will reset the counters
+     */
+    fun resetCounters()
+}
+
+class SharedPrefPinCodeStore @Inject constructor(private val sharedPreferences: SharedPreferences) : PinCodeStore {
+
+    override suspend fun storeEncodedPin(encodePin: String) = withContext(Dispatchers.IO) {
+        sharedPreferences.edit {
+            putString(ENCODED_PIN_CODE_KEY, encodePin)
+        }
+    }
+
+    override suspend fun deleteEncodedPin() = withContext(Dispatchers.IO) {
+        // Also reset the counters
+        resetCounters()
+        sharedPreferences.edit {
+            remove(ENCODED_PIN_CODE_KEY)
+        }
+        awaitPinCodeCallback<Boolean> {
+            PFSecurityManager.getInstance().pinCodeHelper.delete(it)
+        }
+        return@withContext
+    }
+
+    override fun getEncodedPin(): String? {
+        return sharedPreferences.getString(ENCODED_PIN_CODE_KEY, null)
+    }
+
+    override suspend fun hasEncodedPin(): Boolean = withContext(Dispatchers.IO) {
+        val hasEncodedPin = getEncodedPin()?.isNotBlank().orFalse()
+        if (!hasEncodedPin) {
+            return@withContext false
+        }
+        val result = awaitPinCodeCallback<Boolean> {
+            PFSecurityManager.getInstance().pinCodeHelper.isPinCodeEncryptionKeyExist(it)
+        }
+        result.error == null && result.result
+    }
+
+    override fun getRemainingPinCodeAttemptsNumber(): Int {
+        return sharedPreferences.getInt(REMAINING_PIN_CODE_ATTEMPTS_KEY, MAX_PIN_CODE_ATTEMPTS_NUMBER_BEFORE_LOGOUT)
+    }
+
+    override fun getRemainingBiometricsAttemptsNumber(): Int {
+        return sharedPreferences.getInt(REMAINING_BIOMETRICS_ATTEMPTS_KEY, MAX_BIOMETRIC_ATTEMPTS_NUMBER_BEFORE_FORCE_PIN)
+    }
+
+    override fun onWrongPin(): Int {
+        val remaining = getRemainingPinCodeAttemptsNumber() - 1
+        sharedPreferences.edit {
+            putInt(REMAINING_PIN_CODE_ATTEMPTS_KEY, remaining)
+        }
+        return remaining
+    }
+
+    override fun onWrongBiometrics(): Int {
+        val remaining = getRemainingBiometricsAttemptsNumber() - 1
+        sharedPreferences.edit {
+            putInt(REMAINING_BIOMETRICS_ATTEMPTS_KEY, remaining)
+        }
+        return remaining
+    }
+
+    override fun resetCounters() {
+        sharedPreferences.edit {
+            remove(REMAINING_PIN_CODE_ATTEMPTS_KEY)
+            remove(REMAINING_BIOMETRICS_ATTEMPTS_KEY)
+        }
+    }
+
+    private suspend inline fun <T> awaitPinCodeCallback(crossinline callback: (PFPinCodeHelperCallback<T>) -> Unit) = suspendCoroutine<PFResult<T>> { cont ->
+        callback(PFPinCodeHelperCallback<T> { result -> cont.resume(result) })
+    }
+
+    companion object {
+        private const val ENCODED_PIN_CODE_KEY = "ENCODED_PIN_CODE_KEY"
+        private const val REMAINING_PIN_CODE_ATTEMPTS_KEY = "REMAINING_PIN_CODE_ATTEMPTS_KEY"
+        private const val REMAINING_BIOMETRICS_ATTEMPTS_KEY = "REMAINING_BIOMETRICS_ATTEMPTS_KEY"
+
+        private const val MAX_PIN_CODE_ATTEMPTS_NUMBER_BEFORE_LOGOUT = 3
+        private const val MAX_BIOMETRIC_ATTEMPTS_NUMBER_BEFORE_FORCE_PIN = 5
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
new file mode 100644
index 0000000000..fedc705176
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.pin
+
+import android.app.Activity
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.View
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.lifecycleScope
+import com.airbnb.mvrx.args
+import com.beautycoder.pflockscreen.PFFLockScreenConfiguration
+import com.beautycoder.pflockscreen.fragments.PFLockScreenFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.toast
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
+import kotlinx.android.parcel.Parcelize
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@Parcelize
+data class PinArgs(
+        val pinMode: PinMode
+) : Parcelable
+
+class PinFragment @Inject constructor(
+        private val pinCodeStore: PinCodeStore
+) : VectorBaseFragment() {
+
+    private val fragmentArgs: PinArgs by args()
+
+    override fun getLayoutResId() = R.layout.fragment_pin
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        when (fragmentArgs.pinMode) {
+            PinMode.CREATE -> showCreateFragment()
+            PinMode.DELETE -> showDeleteFragment()
+            PinMode.AUTH   -> showAuthFragment()
+        }
+    }
+
+    private fun showDeleteFragment() {
+        val encodedPin = pinCodeStore.getEncodedPin() ?: return
+        val authFragment = PFLockScreenFragment()
+        val builder = PFFLockScreenConfiguration.Builder(requireContext())
+                .setUseBiometric(pinCodeStore.getRemainingBiometricsAttemptsNumber() > 0)
+                .setTitle(getString(R.string.auth_pin_confirm_to_disable_title))
+                .setClearCodeOnError(true)
+                .setMode(PFFLockScreenConfiguration.MODE_AUTH)
+        authFragment.setConfiguration(builder.build())
+        authFragment.setEncodedPinCode(encodedPin)
+        authFragment.setLoginListener(object : PFLockScreenFragment.OnPFLockScreenLoginListener {
+            override fun onPinLoginFailed() {
+                onWrongPin()
+            }
+
+            override fun onBiometricAuthSuccessful() {
+                lifecycleScope.launch {
+                    pinCodeStore.deleteEncodedPin()
+                    vectorBaseActivity.setResult(Activity.RESULT_OK)
+                    vectorBaseActivity.finish()
+                }
+            }
+
+            override fun onBiometricAuthLoginFailed() {
+                val remainingAttempts = pinCodeStore.onWrongBiometrics()
+                if (remainingAttempts <= 0) {
+                    // Disable Biometrics
+                    builder.setUseBiometric(false)
+                    authFragment.setConfiguration(builder.build())
+                }
+            }
+
+            override fun onCodeInputSuccessful() {
+                lifecycleScope.launch {
+                    pinCodeStore.deleteEncodedPin()
+                    vectorBaseActivity.setResult(Activity.RESULT_OK)
+                    vectorBaseActivity.finish()
+                }
+            }
+        })
+        replaceFragment(R.id.pinFragmentContainer, authFragment)
+    }
+
+    private fun showCreateFragment() {
+        val createFragment = PFLockScreenFragment()
+        val builder = PFFLockScreenConfiguration.Builder(requireContext())
+                .setNewCodeValidation(true)
+                .setTitle(getString(R.string.create_pin_title))
+                .setNewCodeValidationTitle(getString(R.string.create_pin_confirm_title))
+                .setMode(PFFLockScreenConfiguration.MODE_CREATE)
+
+        createFragment.setConfiguration(builder.build())
+        createFragment.setCodeCreateListener(object : PFLockScreenFragment.OnPFLockScreenCodeCreateListener {
+            override fun onNewCodeValidationFailed() {
+                Toast.makeText(requireContext(), getString(R.string.create_pin_confirm_failure), Toast.LENGTH_SHORT).show()
+            }
+
+            override fun onCodeCreated(encodedCode: String) {
+                lifecycleScope.launch {
+                    pinCodeStore.storeEncodedPin(encodedCode)
+                    vectorBaseActivity.setResult(Activity.RESULT_OK)
+                    vectorBaseActivity.finish()
+                }
+            }
+        })
+        replaceFragment(R.id.pinFragmentContainer, createFragment)
+    }
+
+    private fun showAuthFragment() {
+        val encodedPin = pinCodeStore.getEncodedPin() ?: return
+        val authFragment = PFLockScreenFragment()
+        val canUseBiometrics = pinCodeStore.getRemainingBiometricsAttemptsNumber() > 0
+        val builder = PFFLockScreenConfiguration.Builder(requireContext())
+                .setUseBiometric(true)
+                .setAutoShowBiometric(true)
+                .setUseBiometric(canUseBiometrics)
+                .setAutoShowBiometric(canUseBiometrics)
+                .setTitle(getString(R.string.auth_pin_title))
+                .setLeftButton(getString(R.string.auth_pin_forgot))
+                .setClearCodeOnError(true)
+                .setMode(PFFLockScreenConfiguration.MODE_AUTH)
+        authFragment.setConfiguration(builder.build())
+        authFragment.setEncodedPinCode(encodedPin)
+        authFragment.setOnLeftButtonClickListener {
+            displayForgotPinWarningDialog()
+        }
+        authFragment.setLoginListener(object : PFLockScreenFragment.OnPFLockScreenLoginListener {
+            override fun onPinLoginFailed() {
+                onWrongPin()
+            }
+
+            override fun onBiometricAuthSuccessful() {
+                pinCodeStore.resetCounters()
+                vectorBaseActivity.setResult(Activity.RESULT_OK)
+                vectorBaseActivity.finish()
+            }
+
+            override fun onBiometricAuthLoginFailed() {
+                val remainingAttempts = pinCodeStore.onWrongBiometrics()
+                if (remainingAttempts <= 0) {
+                    // Disable Biometrics
+                    builder.setUseBiometric(false)
+                    authFragment.setConfiguration(builder.build())
+                }
+            }
+
+            override fun onCodeInputSuccessful() {
+                pinCodeStore.resetCounters()
+                vectorBaseActivity.setResult(Activity.RESULT_OK)
+                vectorBaseActivity.finish()
+            }
+        })
+        replaceFragment(R.id.pinFragmentContainer, authFragment)
+    }
+
+    private fun onWrongPin() {
+        val remainingAttempts = pinCodeStore.onWrongPin()
+        when {
+            remainingAttempts > 1  ->
+                requireActivity().toast(resources.getQuantityString(R.plurals.wrong_pin_message_remaining_attempts, remainingAttempts, remainingAttempts))
+            remainingAttempts == 1 ->
+                requireActivity().toast(R.string.wrong_pin_message_last_remaining_attempt)
+            else                   -> {
+                requireActivity().toast(R.string.too_many_pin_failures)
+                // Logout
+                MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCredentials = true))
+            }
+        }
+    }
+
+    private fun displayForgotPinWarningDialog() {
+        AlertDialog.Builder(requireContext())
+                .setTitle(getString(R.string.auth_pin_reset_title))
+                .setMessage(getString(R.string.auth_pin_reset_content))
+                .setPositiveButton(getString(R.string.auth_pin_new_pin_action)) { _, _ ->
+                    launchResetPinFlow()
+                }
+                .setNegativeButton(R.string.cancel, null)
+                .show()
+    }
+
+    private fun launchResetPinFlow() {
+        MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCredentials = true))
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
new file mode 100644
index 0000000000..aa7202a7ae
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.pin
+
+import android.os.SystemClock
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.OnLifecycleEvent
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private const val PERIOD_OF_GRACE_IN_MS = 2 * 60 * 1000L
+
+/**
+ * This class is responsible for keeping the status of locking
+ * It automatically locks when entering background/foreground with a grace period.
+ * You can force to unlock with unlock method, use it whenever the pin code has been validated.
+ */
+
+@Singleton
+class PinLocker @Inject constructor(private val pinCodeStore: PinCodeStore) : LifecycleObserver {
+
+    enum class State {
+        // App is locked, can be unlock
+        LOCKED,
+
+        // App is blocked and can't be unlocked as long as the app is in foreground
+        BLOCKED,
+
+        // is unlocked, the app can be used
+        UNLOCKED
+    }
+
+    private val liveState = MutableLiveData<State>()
+
+    private var isBlocked = false
+    private var shouldBeLocked = true
+    private var entersBackgroundTs = 0L
+
+    fun getLiveState(): LiveData<State> {
+        return liveState
+    }
+
+    private fun computeState() {
+        GlobalScope.launch {
+            val state = if (isBlocked) {
+                State.BLOCKED
+            } else if (shouldBeLocked && pinCodeStore.hasEncodedPin()) {
+                State.LOCKED
+            } else {
+                State.UNLOCKED
+            }
+            if (liveState.value != state) {
+                liveState.postValue(state)
+            }
+        }
+    }
+
+    fun unlock() {
+        Timber.v("Unlock app")
+        shouldBeLocked = false
+        computeState()
+    }
+
+    fun block() {
+        Timber.v("Block app")
+        isBlocked = true
+        computeState()
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    fun entersForeground() {
+        val timeElapsedSinceBackground = SystemClock.elapsedRealtime() - entersBackgroundTs
+        shouldBeLocked = shouldBeLocked || timeElapsedSinceBackground >= PERIOD_OF_GRACE_IN_MS
+        Timber.v("App enters foreground after $timeElapsedSinceBackground ms spent in background")
+        computeState()
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    fun entersBackground() {
+        isBlocked = false
+        entersBackgroundTs = SystemClock.elapsedRealtime()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinMode.kt b/vector/src/main/java/im/vector/app/features/pin/PinMode.kt
new file mode 100644
index 0000000000..732b55fd58
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/pin/PinMode.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.pin
+
+enum class PinMode {
+    CREATE,
+    DELETE,
+    AUTH
+}
diff --git a/vector/src/main/java/im/vector/app/features/pin/UnlockedActivity.kt b/vector/src/main/java/im/vector/app/features/pin/UnlockedActivity.kt
new file mode 100644
index 0000000000..afe0432559
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/pin/UnlockedActivity.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.pin
+
+/**
+ * Tag class for activities that should not be protected by PIN code.
+ */
+interface UnlockedActivity
diff --git a/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt
rename to vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index e5b2f34f61..c52b586eb4 100644
--- a/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.popup
+package im.vector.app.features.popup
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -25,10 +25,11 @@ import android.widget.ImageView
 import com.tapadoo.alerter.Alerter
 import com.tapadoo.alerter.OnHideAlertListener
 import dagger.Lazy
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.pin.PinActivity
+import im.vector.app.features.themes.ThemeUtils
 import timber.log.Timber
 import java.lang.ref.WeakReference
 import javax.inject.Inject
@@ -84,12 +85,10 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
                 setLightStatusBar()
             }
         }
-        if (currentAlerter?.shouldBeDisplayedIn?.invoke(activity) == false || activity !is VectorBaseActivity) {
+        weakCurrentActivity = WeakReference(activity)
+        if (!shouldBeDisplayedIn(currentAlerter, activity)) {
             return
         }
-
-        weakCurrentActivity = WeakReference(activity)
-
         if (currentAlerter != null) {
             if (currentAlerter!!.expirationTimestamp != null && System.currentTimeMillis() > currentAlerter!!.expirationTimestamp!!) {
                 // this alert has expired, remove it
@@ -126,7 +125,7 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
         }
         currentAlerter = next
         next?.let {
-            if (next.shouldBeDisplayedIn?.invoke(currentActivity) == false) return
+            if (!shouldBeDisplayedIn(next, currentActivity)) return
             val currentTime = System.currentTimeMillis()
             if (next.expirationTimestamp != null && currentTime > next.expirationTimestamp!!) {
                 // skip
@@ -250,4 +249,11 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
             displayNextIfPossible()
         }, 500)
     }
+
+    private fun shouldBeDisplayedIn(alert: VectorAlert?, activity: Activity): Boolean {
+        return alert != null
+                && activity !is PinActivity
+                && activity is VectorBaseActivity
+                && alert.shouldBeDisplayedIn?.invoke(activity) == true
+    }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/popup/VectorAlert.kt b/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/popup/VectorAlert.kt
rename to vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt
index 259df1c7e0..ccf9d765fd 100644
--- a/vector/src/main/java/im/vector/riotx/features/popup/VectorAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.popup
+package im.vector.app.features.popup
 
 import android.app.Activity
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
-import im.vector.matrix.android.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.MatrixItem
 import java.lang.ref.WeakReference
 
 interface VectorAlert {
diff --git a/vector/src/main/java/im/vector/riotx/features/powerlevel/PowerLevelsObservableFactory.kt b/vector/src/main/java/im/vector/app/features/powerlevel/PowerLevelsObservableFactory.kt
similarity index 69%
rename from vector/src/main/java/im/vector/riotx/features/powerlevel/PowerLevelsObservableFactory.kt
rename to vector/src/main/java/im/vector/app/features/powerlevel/PowerLevelsObservableFactory.kt
index ee4c20baca..416964c418 100644
--- a/vector/src/main/java/im/vector/riotx/features/powerlevel/PowerLevelsObservableFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/powerlevel/PowerLevelsObservableFactory.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.powerlevel
+package im.vector.app.features.powerlevel
 
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.rx.mapOptional
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.rx.mapOptional
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
 import io.reactivex.Observable
 import io.reactivex.schedulers.Schedulers
 
diff --git a/vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerActivity.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerActivity.kt
rename to vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
index f9c92ba3ad..616da791d3 100644
--- a/vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.qrcode
+package im.vector.app.features.qrcode
 
 import android.app.Activity
 import android.content.Intent
@@ -23,10 +23,10 @@ import androidx.fragment.app.Fragment
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.Result
 import com.google.zxing.ResultMetadataType
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.VectorBaseActivity
 
 class QrCodeScannerActivity : VectorBaseActivity() {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerFragment.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerFragment.kt
rename to vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt
index 2c6e9ed3d5..6371e3c29b 100644
--- a/vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.qrcode
+package im.vector.app.features.qrcode
 
 import com.google.zxing.Result
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_qr_code_scanner.*
 import me.dm7.barcodescanner.zxing.ZXingScannerView
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt
rename to vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index f943186e2e..e26736de7e 100755
--- a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.rageshake
+package im.vector.app.features.rageshake
 
 import android.view.Menu
 import android.view.MenuItem
@@ -22,9 +22,9 @@ import android.widget.Toast
 import androidx.core.view.isVisible
 import butterknife.OnCheckedChanged
 import butterknife.OnTextChanged
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.platform.VectorBaseActivity
 import kotlinx.android.synthetic.main.activity_bug_report.*
 import timber.log.Timber
 
diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt
rename to vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 9bb2eb9424..7bbc001f0a 100755
--- a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.rageshake
+package im.vector.app.features.rageshake
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -28,17 +28,17 @@ import android.os.Build
 import android.view.View
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
-import im.vector.matrix.android.api.Matrix
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.extensions.getAllChildFragments
-import im.vector.riotx.core.extensions.toOnOff
-import im.vector.riotx.features.settings.VectorLocale
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.settings.locale.SystemLocaleProvider
-import im.vector.riotx.features.themes.ThemeUtils
-import im.vector.riotx.features.version.VersionProvider
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.getAllChildFragments
+import im.vector.app.core.extensions.toOnOff
+import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.locale.SystemLocaleProvider
+import im.vector.app.features.themes.ThemeUtils
+import im.vector.app.features.version.VersionProvider
+import org.matrix.android.sdk.api.Matrix
 import okhttp3.Call
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java b/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java
rename to vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java
index 5b40b82733..878b9f7171 100755
--- a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.rageshake;
+package im.vector.app.features.rageshake;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt b/vector/src/main/java/im/vector/app/features/rageshake/RageShake.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt
rename to vector/src/main/java/im/vector/app/features/rageshake/RageShake.kt
index effed19c59..31b15c76d0 100644
--- a/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/RageShake.kt
@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.rageshake
+package im.vector.app.features.rageshake
 
 import android.content.Context
 import android.hardware.Sensor
 import android.hardware.SensorManager
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.getSystemService
 import com.squareup.seismic.ShakeDetector
-import im.vector.riotx.R
-import im.vector.riotx.core.hardware.vibrate
-import im.vector.riotx.features.navigation.Navigator
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.settings.VectorSettingsActivity
+import im.vector.app.R
+import im.vector.app.core.hardware.vibrate
+import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorSettingsActivity
 import javax.inject.Inject
 
 class RageShake @Inject constructor(private val activity: AppCompatActivity,
@@ -41,7 +42,7 @@ class RageShake @Inject constructor(private val activity: AppCompatActivity,
     var interceptor: (() -> Unit)? = null
 
     fun start() {
-        val sensorManager = activity.getSystemService(AppCompatActivity.SENSOR_SERVICE) as? SensorManager ?: return
+        val sensorManager = activity.getSystemService<SensorManager>() ?: return
 
         shakeDetector = ShakeDetector(this).apply {
             setSensitivity(vectorPreferences.getRageshakeSensitivity())
@@ -94,8 +95,7 @@ class RageShake @Inject constructor(private val activity: AppCompatActivity,
          * Check if the feature is available
          */
         fun isAvailable(context: Context): Boolean {
-            return (context.getSystemService(AppCompatActivity.SENSOR_SERVICE) as? SensorManager)
-                    ?.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) != null
+            return context.getSystemService<SensorManager>()?.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) != null
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt
rename to vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
index d4ad4efb6f..6f38ae0102 100644
--- a/vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.rageshake
+package im.vector.app.features.rageshake
 
 import android.content.Context
 import android.util.Log
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorPreferences
 import timber.log.Timber
 import java.io.File
 import java.io.PrintWriter
@@ -54,10 +54,10 @@ class VectorFileLogger @Inject constructor(val context: Context, private val vec
         }
     }
 
-    private val sLogger = Logger.getLogger("im.vector.riotx")
+    private val sLogger = Logger.getLogger("im.vector.app")
     private var sFileHandler: FileHandler? = null
     private var sCacheDirectory: File? = null
-    private var sFileName = "riotxlogs"
+    private var sFileName = "elementLogs"
 
     private val prioPrefixes = mapOf(
             Log.VERBOSE to "V/ ",
diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt
rename to vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt
index 1673cd7032..53f10e5d54 100644
--- a/vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.rageshake
+package im.vector.app.features.rageshake
 
 import android.content.Context
 import android.os.Build
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import im.vector.matrix.android.api.Matrix
-import im.vector.riotx.core.resources.VersionCodeProvider
-import im.vector.riotx.features.version.VersionProvider
+import im.vector.app.core.resources.VersionCodeProvider
+import im.vector.app.features.version.VersionProvider
+import org.matrix.android.sdk.api.Matrix
 import timber.log.Timber
 import java.io.PrintWriter
 import java.io.StringWriter
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt
rename to vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
index 1dc9f34924..447525f72f 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.observe
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.emoji_chooser_fragment.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserViewModel.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt
rename to vector/src/main/java/im/vector/app/features/reactions/EmojiChooserViewModel.kt
index 9a0317f454..df2085e41b 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserViewModel.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import im.vector.riotx.core.utils.LiveEvent
+import im.vector.app.core.utils.LiveEvent
 import javax.inject.Inject
 
 class EmojiChooserViewModel @Inject constructor() : ViewModel() {
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiDrawView.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt
rename to vector/src/main/java/im/vector/app/features/reactions/EmojiDrawView.kt
index b85b2576d0..fec185b1c3 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiDrawView.kt
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Typeface
+import android.os.Trace
 import android.text.StaticLayout
 import android.text.TextPaint
 import android.util.AttributeSet
@@ -43,7 +44,7 @@ class EmojiDrawView @JvmOverloads constructor(
     var emoji: String? = null
 
     override fun onDraw(canvas: Canvas?) {
-        EmojiRecyclerAdapter.beginTraceSession("EmojiDrawView.onDraw")
+        Trace.beginSection("EmojiDrawView.onDraw")
         super.onDraw(canvas)
         canvas?.save()
         val space = abs((width - emojiSize) / 2f)
@@ -52,7 +53,7 @@ class EmojiDrawView @JvmOverloads constructor(
             mLayout!!.draw(canvas)
         }
         canvas?.restore()
-        EmojiRecyclerAdapter.endTraceSession()
+        Trace.endSection()
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt
rename to vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
index 562ad6f5b2..4fe74c2bcc 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
 import android.app.Activity
 import android.content.Context
@@ -30,12 +30,12 @@ import androidx.lifecycle.Observer
 import com.airbnb.mvrx.viewModel
 import com.google.android.material.tabs.TabLayout
 import com.jakewharton.rxbinding3.widget.queryTextChanges
-import im.vector.riotx.EmojiCompatFontProvider
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.observeEvent
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.reactions.data.EmojiDataSource
+import im.vector.app.EmojiCompatFontProvider
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.observeEvent
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.reactions.data.EmojiDataSource
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.activity_emoji_reaction_picker.*
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt
rename to vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt
index efccb9c917..92bc21be25 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
 import android.os.Build
 import android.os.Trace
@@ -29,8 +29,8 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.AutoTransition
 import androidx.transition.TransitionManager
-import im.vector.riotx.R
-import im.vector.riotx.features.reactions.data.EmojiDataSource
+import im.vector.app.R
+import im.vector.app.features.reactions.data.EmojiDataSource
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -125,7 +125,7 @@ class EmojiRecyclerAdapter @Inject constructor(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        beginTraceSession("MyAdapter.onCreateViewHolder")
+        Trace.beginSection("MyAdapter.onCreateViewHolder")
         val inflater = LayoutInflater.from(parent.context)
         val itemView = inflater.inflate(viewType, parent, false)
         itemView.setOnClickListener(itemClickListener)
@@ -133,16 +133,16 @@ class EmojiRecyclerAdapter @Inject constructor(
             R.layout.grid_section_header -> SectionViewHolder(itemView)
             else                         -> EmojiViewHolder(itemView)
         }
-        endTraceSession()
+        Trace.endSection()
         return viewHolder
     }
 
     override fun getItemViewType(position: Int): Int {
-        beginTraceSession("MyAdapter.getItemViewType")
+        Trace.beginSection("MyAdapter.getItemViewType")
         if (isSection(position)) {
             return R.layout.grid_section_header
         }
-        endTraceSession()
+        Trace.endSection()
         return R.layout.grid_item_emoji
     }
 
@@ -183,7 +183,7 @@ class EmojiRecyclerAdapter @Inject constructor(
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        beginTraceSession("MyAdapter.onBindViewHolder")
+        Trace.beginSection("MyAdapter.onBindViewHolder")
         val sectionNumber = getSectionForAbsoluteIndex(position)
         if (isSection(position)) {
             holder.bind(dataSource.rawData.categories[sectionNumber].name)
@@ -202,7 +202,7 @@ class EmojiRecyclerAdapter @Inject constructor(
                 holder.bind(null)
             }
         }
-        endTraceSession()
+        Trace.endSection()
     }
 
     override fun onViewRecycled(holder: ViewHolder) {
@@ -259,18 +259,6 @@ class EmojiRecyclerAdapter @Inject constructor(
     }
 
     companion object {
-        fun endTraceSession() {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-                Trace.endSection()
-            }
-        }
-
-        fun beginTraceSession(sectionName: String) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-                Trace.beginSection(sectionName)
-            }
-        }
-
         private val staticLayoutCache = HashMap<String, StaticLayout>()
 
         private fun getStaticLayoutForEmoji(emoji: String): StaticLayout {
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchAction.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchAction.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchAction.kt
rename to vector/src/main/java/im/vector/app/features/reactions/EmojiSearchAction.kt
index badc6ea1e4..148390d06d 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchAction.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class EmojiSearchAction : VectorViewModelAction {
     data class UpdateQuery(val queryString: String) : EmojiSearchAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultController.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultController.kt
rename to vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt
index 208d9d7a56..8c510f568a 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultController.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
 import android.graphics.Typeface
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.riotx.EmojiCompatFontProvider
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericFooterItem
+import im.vector.app.EmojiCompatFontProvider
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
 import javax.inject.Inject
 
 class EmojiSearchResultController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt
rename to vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt
index a62b2d39cb..685f0dd64e 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.LiveEvent
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.LiveEvent
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt
rename to vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultItem.kt
index 55bf29e25f..6db4a6bf58 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultItem.kt
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
 import android.graphics.Typeface
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.reactions.data.EmojiItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.reactions.data.EmojiItem
 
 @EpoxyModelClass(layout = R.layout.item_emoji_result)
 abstract class EmojiSearchResultItem : EpoxyModelWithHolder<EmojiSearchResultItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt
rename to vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt
index 9856693d22..98b729603a 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.MvRxState
@@ -21,10 +21,10 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.reactions.data.EmojiDataSource
-import im.vector.riotx.features.reactions.data.EmojiItem
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.reactions.data.EmojiDataSource
+import im.vector.app.features.reactions.data.EmojiItem
 
 data class EmojiSearchResultViewState(
         val query: String = "",
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt b/vector/src/main/java/im/vector/app/features/reactions/ReactionClickListener.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt
rename to vector/src/main/java/im/vector/app/features/reactions/ReactionClickListener.kt
index ad98868b63..74313e7859 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/ReactionClickListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.reactions
+package im.vector.app.features.reactions
 
 interface ReactionClickListener {
     fun onReactionSelected(reaction: String)
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiCategory.kt b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiCategory.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiCategory.kt
rename to vector/src/main/java/im/vector/app/features/reactions/data/EmojiCategory.kt
index a6c238a4c4..7016963a62 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiCategory.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiCategory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.reactions.data
+package im.vector.app.features.reactions.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiData.kt b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiData.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiData.kt
rename to vector/src/main/java/im/vector/app/features/reactions/data/EmojiData.kt
index f2094bfc7b..cc751ffab7 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiData.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiData.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.reactions.data
+package im.vector.app.features.reactions.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiDataSource.kt b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiDataSource.kt
rename to vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt
index 4acb8ed79e..ce17459bb3 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiDataSource.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions.data
+package im.vector.app.features.reactions.data
 
 import android.content.res.Resources
 import com.squareup.moshi.Moshi
-import im.vector.riotx.R
+import im.vector.app.R
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiItem.kt b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiItem.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiItem.kt
rename to vector/src/main/java/im/vector/app/features/reactions/data/EmojiItem.kt
index 57083e8467..5a532c78f1 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiItem.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.reactions.data
+package im.vector.app.features.reactions.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt
rename to vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt
index 1555c72119..e44ce8ee10 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions.widget
+package im.vector.app.features.reactions.widget
 
 import android.animation.ArgbEvaluator
 import android.content.Context
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt
rename to vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
index a0dc4a4ae5..5430bc60fd 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions.widget
+package im.vector.app.features.reactions.widget
 
 import android.animation.ArgbEvaluator
 import android.content.Context
diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt
rename to vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
index 140edaf03a..364ac999c1 100644
--- a/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.reactions.widget
+package im.vector.app.features.reactions.widget
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
@@ -35,10 +35,10 @@ import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.core.content.ContextCompat
 import androidx.core.content.withStyledAttributes
-import im.vector.riotx.EmojiCompatWrapper
-import im.vector.riotx.R
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.utils.TextUtils
+import im.vector.app.EmojiCompatWrapper
+import im.vector.app.R
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.utils.TextUtils
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipAction.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipAction.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipAction.kt
rename to vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipAction.kt
index b3a1fa6976..b7fe412f7b 100644
--- a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipAction.kt
+++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.room
+package im.vector.app.features.room
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RequireActiveMembershipAction : VectorViewModelAction {
     data class ChangeRoom(val roomId: String) : RequireActiveMembershipAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewEvents.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewEvents.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewEvents.kt
index d3c3e39cfa..62c3f45558 100644
--- a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.room
+package im.vector.app.features.room
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class RequireActiveMembershipViewEvents : VectorViewEvents {
     data class RoomLeft(val leftMessage: String?) : RequireActiveMembershipViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewModel.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewModel.kt
rename to vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
index e242135218..783d4d45a2 100644
--- a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.room
+package im.vector.app.features.room
 
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -23,19 +23,19 @@ import com.airbnb.mvrx.ViewModelContext
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
 import io.reactivex.Observable
 import io.reactivex.schedulers.Schedulers
 
diff --git a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewState.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewState.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewState.kt
rename to vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewState.kt
index ccf0270efc..2ca68b5e8b 100644
--- a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewState.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.room
+package im.vector.app.features.room
 
 import com.airbnb.mvrx.MvRxState
-import im.vector.riotx.features.roommemberprofile.RoomMemberProfileArgs
-import im.vector.riotx.features.roomprofile.RoomProfileArgs
+import im.vector.app.features.roommemberprofile.RoomMemberProfileArgs
+import im.vector.app.features.roomprofile.RoomProfileArgs
 
 data class RequireActiveMembershipViewState(
         val roomId: String? = null
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/JoinState.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/JoinState.kt
index 546412b2a6..dfcbb470cd 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/JoinState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
 /**
  * Join state of a room
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomItem.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomItem.kt
index aa533857e0..3a4ba5bb34 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomItem.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.platform.ButtonStateView
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.ButtonStateView
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_public_room)
 abstract class PublicRoomItem : VectorEpoxyModel<PublicRoomItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
index 04ddccdd8a..c60336c1af 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.epoxy.VisibilityState
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.errorWithRetryItem
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.epoxy.noResultItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class PublicRoomsController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
index dcccd33cf6..57006af6f1 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
 import android.os.Bundle
 import android.view.MenuItem
@@ -23,13 +23,13 @@ import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.snackbar.Snackbar
 import com.jakewharton.rxbinding3.appcompat.queryTextChanges
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.trackItemsVisibilityChange
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.trackItemsVisibilityChange
+import im.vector.app.core.platform.VectorBaseFragment
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import io.reactivex.rxkotlin.subscribeBy
 import kotlinx.android.synthetic.main.fragment_public_rooms.*
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt
index 67b17ea34e..b4cdb2f009 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
+import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
 
 data class PublicRoomsViewState(
         // The current filter
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryAction.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt
index 8b32726370..a94cb7709f 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
-import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
 
 sealed class RoomDirectoryAction : VectorViewModelAction {
     data class SetRoomDirectoryData(val roomDirectoryData: RoomDirectoryData) : RoomDirectoryAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt
index e5ae0d4f54..6be810d0be 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import com.airbnb.mvrx.viewModel
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.extensions.addFragmentToBackstack
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.roomdirectory.createroom.CreateRoomAction
-import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment
-import im.vector.riotx.features.roomdirectory.createroom.CreateRoomViewModel
-import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.extensions.addFragmentToBackstack
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.roomdirectory.createroom.CreateRoomAction
+import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
+import im.vector.app.features.roomdirectory.createroom.CreateRoomViewModel
+import im.vector.app.features.roomdirectory.picker.RoomDirectoryPickerFragment
 import javax.inject.Inject
 
 class RoomDirectoryActivity : VectorBaseActivity() {
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedAction.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedAction.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedAction.kt
index b257f82595..9911ce6686 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
-import im.vector.riotx.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedAction
 
 /**
  * Supported navigation actions for [RoomDirectoryActivity]
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedActionViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedActionViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedActionViewModel.kt
index 12ae9c1cb5..dc2ee75d64 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedActionViewModel.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
-import im.vector.riotx.core.platform.VectorSharedActionViewModel
+import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 class RoomDirectorySharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<RoomDirectorySharedAction>()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewEvents.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewEvents.kt
index 499e8d390d..60b1d11c4a 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for room directory screen
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index 1b51ab1822..42b17b4dad 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory
+package im.vector.app.features.roomdirectory
 
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.Fail
@@ -25,19 +25,19 @@ import com.airbnb.mvrx.ViewModelContext
 import com.airbnb.mvrx.appendAt
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsFilter
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsParams
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoomsResponse
-import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
-import im.vector.matrix.android.api.session.room.roomSummaryQueryParams
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsFilter
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
+import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 
 private const val PUBLIC_ROOMS_LIMIT = 20
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomAction.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt
index 8986db180a..3b687395fd 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.createroom
+package im.vector.app.features.roomdirectory.createroom
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class CreateRoomAction : VectorViewModelAction {
     data class SetName(val name: String) : CreateRoomAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomActivity.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
index 2831457224..e003c4905c 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.createroom
+package im.vector.app.features.roomdirectory.createroom
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.widget.Toolbar
 import com.airbnb.mvrx.viewModel
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.roomdirectory.RoomDirectorySharedAction
-import im.vector.riotx.features.roomdirectory.RoomDirectorySharedActionViewModel
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.roomdirectory.RoomDirectorySharedAction
+import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
index 13649c113f..ba7c5ca083 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.createroom
+package im.vector.app.features.roomdirectory.createroom
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.errorWithRetryItem
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.form.formEditTextItem
-import im.vector.riotx.features.form.formSwitchItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.form.formEditTextItem
+import im.vector.app.features.form.formSwitchItem
 import javax.inject.Inject
 
 class CreateRoomController @Inject constructor(private val stringProvider: StringProvider,
@@ -104,8 +104,11 @@ class CreateRoomController @Inject constructor(private val stringProvider: Strin
             enabled(enableFormElement)
             title(stringProvider.getString(R.string.create_room_encryption_title))
             summary(
-                    if (viewState.hsAdminHasDisabledE2E) stringProvider.getString(R.string.settings_hs_admin_e2e_disabled)
-                    else stringProvider.getString(R.string.create_room_encryption_description)
+                    if (viewState.hsAdminHasDisabledE2E) {
+                        stringProvider.getString(R.string.settings_hs_admin_e2e_disabled)
+                    } else {
+                        stringProvider.getString(R.string.create_room_encryption_description)
+                    }
             )
             switchChecked(viewState.isEncrypted)
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
index 7956f2fd9e..f3be178e64 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.createroom
+package im.vector.app.features.roomdirectory.createroom
 
 import android.os.Bundle
 import android.view.MenuItem
@@ -22,12 +22,12 @@ import android.view.View
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.roomdirectory.RoomDirectorySharedAction
-import im.vector.riotx.features.roomdirectory.RoomDirectorySharedActionViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.roomdirectory.RoomDirectorySharedAction
+import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
 import kotlinx.android.synthetic.main.fragment_create_room.*
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index e2d51dff83..a9c507ba7a 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.createroom
+package im.vector.app.features.roomdirectory.createroom
 
 import androidx.fragment.app.FragmentActivity
 import com.airbnb.mvrx.ActivityViewModelContext
@@ -25,14 +25,14 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
-import im.vector.matrix.android.api.session.room.model.create.CreateRoomPreset
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.roomdirectory.RoomDirectoryActivity
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 
 class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: CreateRoomViewState,
                                                       private val session: Session
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
index 1758f77818..a49473b16e 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.createroom
+package im.vector.app.features.roomdirectory.createroom
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt
index c0f77aad74..8f57acee47 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.picker
+package im.vector.app.features.roomdirectory.picker
 
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -22,11 +22,11 @@ import android.widget.TextView
 import androidx.core.view.isInvisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.glide.GlideApp
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.glide.GlideApp
 
 @EpoxyModelClass(layout = R.layout.item_room_directory)
 abstract class RoomDirectoryItem : VectorEpoxyModel<RoomDirectoryItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt
index 0b02101ecb..d51ad5040b 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.picker
+package im.vector.app.features.roomdirectory.picker
 
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
-import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringArrayProvider
+import im.vector.app.R
+import im.vector.app.core.resources.StringArrayProvider
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
+import org.matrix.android.sdk.api.session.room.model.thirdparty.ThirdPartyProtocol
 import javax.inject.Inject
 
 class RoomDirectoryListCreator @Inject constructor(private val stringArrayProvider: StringArrayProvider,
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerAction.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt
index 157025bb0c..36f2cd4296 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.picker
+package im.vector.app.features.roomdirectory.picker
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomDirectoryPickerAction : VectorViewModelAction {
     object Retry : RoomDirectoryPickerAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
index 623d056141..2dd3b509a8 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.picker
+package im.vector.app.features.roomdirectory.picker
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
-import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.errorWithRetryItem
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
 import javax.inject.Inject
 
 class RoomDirectoryPickerController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
index 1d71035d99..963f842304 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.picker
+package im.vector.app.features.roomdirectory.picker
 
 import android.os.Bundle
 import android.view.MenuItem
@@ -22,16 +22,16 @@ import android.view.View
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.roomdirectory.RoomDirectoryAction
-import im.vector.riotx.features.roomdirectory.RoomDirectorySharedAction
-import im.vector.riotx.features.roomdirectory.RoomDirectorySharedActionViewModel
-import im.vector.riotx.features.roomdirectory.RoomDirectoryViewModel
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.roomdirectory.RoomDirectoryAction
+import im.vector.app.features.roomdirectory.RoomDirectorySharedAction
+import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
+import im.vector.app.features.roomdirectory.RoomDirectoryViewModel
+import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
 import kotlinx.android.synthetic.main.fragment_room_directory_picker.*
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
index 54f93b5404..44044304bc 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.picker
+package im.vector.app.features.roomdirectory.picker
 
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -23,11 +23,11 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.thirdparty.ThirdPartyProtocol
 
 class RoomDirectoryPickerViewModel @AssistedInject constructor(@Assisted initialState: RoomDirectoryPickerViewState,
                                                                private val session: Session)
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt
index 85797a31e4..61cf50e8dd 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.picker
+package im.vector.app.features.roomdirectory.picker
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol
+import org.matrix.android.sdk.api.session.room.model.thirdparty.ThirdPartyProtocol
 
 data class RoomDirectoryPickerViewState(
         val asyncThirdPartyRequest: Async<Map<String, ThirdPartyProtocol>> = Uninitialized
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewAction.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewAction.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewAction.kt
index 426078fa3d..8e0d2db67e 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.roompreview
+package im.vector.app.features.roomdirectory.roompreview
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomPreviewAction : VectorViewModelAction {
     object Join : RoomPreviewAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
index 063cf3b8ff..0a25d93de2 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.roompreview
+package im.vector.app.features.roomdirectory.roompreview
 
 import android.content.Context
 import android.content.Intent
 import android.os.Parcelable
 import androidx.appcompat.widget.Toolbar
-import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
+import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
+import org.matrix.android.sdk.api.util.MatrixItem
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
index ee01e8f7fe..5d13d3d9fe 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.roompreview
+package im.vector.app.features.roomdirectory.roompreview
 
 import android.os.Bundle
 import android.view.View
@@ -23,12 +23,12 @@ import androidx.transition.TransitionManager
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.platform.ButtonStateView
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.roomdirectory.JoinState
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.ButtonStateView
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roomdirectory.JoinState
 import kotlinx.android.synthetic.main.fragment_room_preview_no_preview.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
index c5e79832fc..04b7c33fb2 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.roompreview
+package im.vector.app.features.roomdirectory.roompreview
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.members.ChangeMembershipState
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.roomSummaryQueryParams
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.roomdirectory.JoinState
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.roomdirectory.JoinState
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 
 class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val initialState: RoomPreviewViewState,
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt
rename to vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt
index 04806ccf27..f461225e2d 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomdirectory.roompreview
+package im.vector.app.features.roomdirectory.roompreview
 
 import com.airbnb.mvrx.MvRxState
-import im.vector.riotx.features.roomdirectory.JoinState
+import im.vector.app.features.roomdirectory.JoinState
 
 data class RoomPreviewViewState(
         // The room id
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileAction.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileAction.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileAction.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileAction.kt
index e60f268b22..7a171ca3e5 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileAction.kt
@@ -15,9 +15,9 @@
  *
  */
 
-package im.vector.riotx.features.roommemberprofile
+package im.vector.app.features.roommemberprofile
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomMemberProfileAction : VectorViewModelAction {
     object RetryFetchingInfo : RoomMemberProfileAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileActivity.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
index 3323c29fee..954dd09024 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.features.roommemberprofile
+package im.vector.app.features.roommemberprofile
 
 import android.content.Context
 import android.content.Intent
@@ -23,14 +23,14 @@ import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.room.RequireActiveMembershipViewEvents
-import im.vector.riotx.features.room.RequireActiveMembershipViewModel
-import im.vector.riotx.features.room.RequireActiveMembershipViewState
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.room.RequireActiveMembershipViewEvents
+import im.vector.app.features.room.RequireActiveMembershipViewModel
+import im.vector.app.features.room.RequireActiveMembershipViewState
 import javax.inject.Inject
 
 class RoomMemberProfileActivity :
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileController.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
index a12d496e45..ca9ecb62ef 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -15,19 +15,19 @@
  *
  */
 
-package im.vector.riotx.features.roommemberprofile
+package im.vector.app.features.roommemberprofile
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.android.api.session.room.powerlevels.Role
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.profiles.buildProfileAction
-import im.vector.riotx.core.epoxy.profiles.buildProfileSection
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericFooterItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.profiles.buildProfileAction
+import im.vector.app.core.epoxy.profiles.buildProfileSection
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
 import javax.inject.Inject
 
 class RoomMemberProfileController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileFragment.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index e9f4a736ef..9c6e813f0b 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.features.roommemberprofile
+package im.vector.app.features.roommemberprofile
 
 import android.os.Bundle
 import android.os.Parcelable
@@ -29,23 +29,23 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.room.powerlevels.Role
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.animations.AppBarStateChangeListener
-import im.vector.riotx.core.animations.MatrixItemAppBarStateChangeListener
-import im.vector.riotx.core.dialogs.ConfirmationDialogBuilder
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.platform.StateView
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.startSharePlainTextIntent
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheet
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.roommemberprofile.devices.DeviceListBottomSheet
-import im.vector.riotx.features.roommemberprofile.powerlevel.EditPowerLevelDialogs
+import im.vector.app.R
+import im.vector.app.core.animations.AppBarStateChangeListener
+import im.vector.app.core.animations.MatrixItemAppBarStateChangeListener
+import im.vector.app.core.dialogs.ConfirmationDialogBuilder
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.StateView
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.startSharePlainTextIntent
+import im.vector.app.features.crypto.verification.VerificationBottomSheet
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
+import im.vector.app.features.roommemberprofile.powerlevel.EditPowerLevelDialogs
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
+import org.matrix.android.sdk.api.util.MatrixItem
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_matrix_profile.*
 import kotlinx.android.synthetic.main.view_stub_room_member_profile_header.*
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewEvents.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt
index 69c73007e0..9981d72e07 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roommemberprofile
+package im.vector.app.features.roommemberprofile
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for RoomMemberProfile
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
index 6fc1facbc3..f2c85c96c7 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.features.roommemberprofile
+package im.vector.app.features.roommemberprofile
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Fail
@@ -27,35 +27,34 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.permalinks.PermalinkFactory
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.profile.ProfileService
-import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.api.session.room.members.roomMemberQueryParams
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.android.api.session.room.powerlevels.Role
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.matrix.android.api.util.toOptional
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory
+import im.vector.app.R
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.profile.ProfileService
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.util.awaitCallback
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
 
 class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private val initialState: RoomMemberProfileViewState,
                                                              private val stringProvider: StringProvider,
@@ -337,7 +336,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
     }
 
     private fun handleShareRoomMemberProfile() {
-        PermalinkFactory.createPermalink(initialState.userId)?.let { permalink ->
+        session.permalinkService().createPermalink(initialState.userId)?.let { permalink ->
             _viewEvents.post(RoomMemberProfileViewEvents.ShareRoomMemberProfile(permalink))
         }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewState.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewState.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt
index 81423d2b9e..dec003b37d 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt
@@ -15,15 +15,15 @@
  *
  */
 
-package im.vector.riotx.features.roommemberprofile
+package im.vector.app.features.roommemberprofile
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.util.MatrixItem
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.util.MatrixItem
 
 data class RoomMemberProfileViewState(
         val userId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListAction.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListAction.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListAction.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListAction.kt
index 58a486c1b6..fc28b68b79 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roommemberprofile.devices
+package im.vector.app.features.roommemberprofile.devices
 
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 
 sealed class DeviceListAction : VectorViewModelAction {
     data class SelectDevice(val device: CryptoDeviceInfo) : DeviceListAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
index 591b014c72..a8c6842c08 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.roommemberprofile.devices
+package im.vector.app.features.roommemberprofile.devices
 
 import android.content.DialogInterface
 import android.os.Bundle
@@ -23,12 +23,12 @@ import androidx.fragment.app.Fragment
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.commitTransaction
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheet
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import javax.inject.Inject
 import kotlin.reflect.KClass
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt
index 39758671c8..7a2990775d 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roommemberprofile.devices
+package im.vector.app.features.roommemberprofile.devices
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for device list screen
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
index 036c9269df..db97399f1b 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.roommemberprofile.devices
+package im.vector.app.features.roommemberprofile.devices
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -24,16 +24,16 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
-import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.rx.rx
 
 data class DeviceListViewState(
         val userItem: MatrixItem? = null,
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
index 87d156759d..f68965f42c 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.roommemberprofile.devices
+package im.vector.app.features.roommemberprofile.devices
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
@@ -22,18 +22,18 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.errorWithRetryItem
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.GenericItem
-import im.vector.riotx.core.ui.list.genericFooterItem
-import im.vector.riotx.core.ui.list.genericItem
-import im.vector.riotx.core.ui.list.genericItemWithValue
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericItem
+import im.vector.app.core.ui.list.genericItemWithValue
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import me.gujun.android.span.span
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListFragment.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt
index 5fdb776b12..9f90ffbb84 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.roommemberprofile.devices
+package im.vector.app.features.roommemberprofile.devices
 
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.DimensionConverter
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.DimensionConverter
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import javax.inject.Inject
 
 class DeviceListFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
index 2e943b0eff..decc22c979 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.roommemberprofile.devices
+package im.vector.app.features.roommemberprofile.devices
 
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.DimensionConverter
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.DimensionConverter
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import javax.inject.Inject
 
 class DeviceTrustInfoActionFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
index a9af166c1d..fad1a35d6a 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  *
  */
-package im.vector.riotx.features.roommemberprofile.devices
+package im.vector.app.features.roommemberprofile.devices
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.GenericItem
-import im.vector.riotx.core.ui.list.genericFooterItem
-import im.vector.riotx.core.ui.list.genericItem
-import im.vector.riotx.core.ui.list.genericItemWithValue
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericItem
+import im.vector.app.core.ui.list.genericItemWithValue
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import me.gujun.android.span.span
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
rename to vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
index 5672c621c7..b871a3690e 100644
--- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roommemberprofile.powerlevel
+package im.vector.app.features.roommemberprofile.powerlevel
 
 import android.app.Activity
 import android.content.DialogInterface
 import android.view.KeyEvent
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
-import im.vector.matrix.android.api.session.room.powerlevels.Role
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.hideKeyboard
+import im.vector.app.R
+import im.vector.app.core.extensions.hideKeyboard
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
 import kotlinx.android.synthetic.main.dialog_edit_power_level.view.*
 
 object EditPowerLevelDialogs {
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileAction.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
index 20498dbf84..8061ad6bfc 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
@@ -15,11 +15,11 @@
  *
  */
 
-package im.vector.riotx.features.roomprofile
+package im.vector.app.features.roomprofile
 
 import android.net.Uri
-import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
-import im.vector.riotx.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomProfileAction: VectorViewModelAction {
     object LeaveRoom: RoomProfileAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileActivity.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
index c628ba6359..6bcb9f9c7f 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.features.roomprofile
+package im.vector.app.features.roomprofile
 
 import android.content.Context
 import android.content.Intent
@@ -23,19 +23,19 @@ import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.extensions.addFragmentToBackstack
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.room.RequireActiveMembershipViewEvents
-import im.vector.riotx.features.room.RequireActiveMembershipViewModel
-import im.vector.riotx.features.room.RequireActiveMembershipViewState
-import im.vector.riotx.features.roomprofile.banned.RoomBannedMemberListFragment
-import im.vector.riotx.features.roomprofile.members.RoomMemberListFragment
-import im.vector.riotx.features.roomprofile.settings.RoomSettingsFragment
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsFragment
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.extensions.addFragmentToBackstack
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.room.RequireActiveMembershipViewEvents
+import im.vector.app.features.room.RequireActiveMembershipViewModel
+import im.vector.app.features.room.RequireActiveMembershipViewState
+import im.vector.app.features.roomprofile.banned.RoomBannedMemberListFragment
+import im.vector.app.features.roomprofile.members.RoomMemberListFragment
+import im.vector.app.features.roomprofile.settings.RoomSettingsFragment
+import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment
 import javax.inject.Inject
 
 class RoomProfileActivity :
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileController.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 249247cd63..815478b46b 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -15,17 +15,17 @@
  *
  */
 
-package im.vector.riotx.features.roomprofile
+package im.vector.app.features.roomprofile
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.profiles.buildProfileAction
-import im.vector.riotx.core.epoxy.profiles.buildProfileSection
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericFooterItem
-import im.vector.riotx.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import im.vector.app.R
+import im.vector.app.core.epoxy.profiles.buildProfileAction
+import im.vector.app.core.epoxy.profiles.buildProfileSection
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.features.settings.VectorPreferences
 import javax.inject.Inject
 
 class RoomProfileController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index d65ec82921..2722d54950 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.features.roomprofile
+package im.vector.app.features.roomprofile
 
 import android.app.Activity
 import android.content.Intent
@@ -34,34 +34,34 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.yalantis.ucrop.UCrop
-import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.animations.AppBarStateChangeListener
-import im.vector.riotx.core.animations.MatrixItemAppBarStateChangeListener
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.core.intent.getFilenameFromUri
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.core.utils.copyToClipboard
-import im.vector.riotx.core.utils.startSharePlainTextIntent
-import im.vector.riotx.features.crypto.util.toImageRes
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.list.actions.RoomListActionsArgs
-import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsBottomSheet
-import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedAction
-import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
-import im.vector.riotx.features.media.BigImageViewerActivity
-import im.vector.riotx.features.media.createUCropWithDefaultSettings
-import im.vector.riotx.multipicker.MultiPicker
-import im.vector.riotx.multipicker.entity.MultiPickerImageType
+import im.vector.lib.multipicker.MultiPicker
+import im.vector.lib.multipicker.entity.MultiPickerImageType
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.animations.AppBarStateChangeListener
+import im.vector.app.core.animations.MatrixItemAppBarStateChangeListener
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.intent.getFilenameFromUri
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.core.utils.copyToClipboard
+import im.vector.app.core.utils.startSharePlainTextIntent
+import im.vector.app.features.crypto.util.toImageRes
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.actions.RoomListActionsArgs
+import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
+import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedAction
+import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
+import im.vector.app.features.media.BigImageViewerActivity
+import im.vector.app.features.media.createUCropWithDefaultSettings
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_matrix_profile.*
 import kotlinx.android.synthetic.main.view_stub_room_profile_header.*
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedAction.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt
index 76d87b3a93..0052ddee99 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile
+package im.vector.app.features.roomprofile
 
-import im.vector.riotx.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedAction
 
 /**
  * Supported navigation actions for [RoomProfileActivity]
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedActionViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedActionViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedActionViewModel.kt
index e1921b0c23..49e68ca0a5 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedActionViewModel.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile
+package im.vector.app.features.roomprofile
 
-import im.vector.riotx.core.platform.VectorSharedActionViewModel
+import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 class RoomProfileSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<RoomProfileSharedAction>()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewEvents.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewEvents.kt
index c0c1f2eb24..1245016ada 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile
+package im.vector.app.features.roomprofile
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for RoomProfile
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
index 5ad74f8663..2d409888e9 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
@@ -15,26 +15,25 @@
  *
  */
 
-package im.vector.riotx.features.roomprofile
+package im.vector.app.features.roomprofile
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.permalinks.PermalinkFactory
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.members.roomMemberQueryParams
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory
+import im.vector.app.R
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
 import java.util.UUID
 
 class RoomProfileViewModel @AssistedInject constructor(@Assisted private val initialState: RoomProfileViewState,
@@ -118,9 +117,10 @@ class RoomProfileViewModel @AssistedInject constructor(@Assisted private val ini
     }
 
     private fun handleShareRoomProfile() {
-        PermalinkFactory.createPermalink(initialState.roomId)?.let { permalink ->
-            _viewEvents.post(RoomProfileViewEvents.ShareRoomProfile(permalink))
-        }
+        session.permalinkService().createRoomPermalink(initialState.roomId)
+                ?.let { permalink ->
+                    _viewEvents.post(RoomProfileViewEvents.ShareRoomProfile(permalink))
+                }
     }
 
     private fun handleChangeAvatar(action: RoomProfileAction.ChangeRoomAvatar) {
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewState.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
index 3cab6f38f4..10d35db36e 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
@@ -15,13 +15,13 @@
  *
  */
 
-package im.vector.riotx.features.roomprofile
+package im.vector.app.features.roomprofile
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 data class RoomProfileViewState(
         val roomId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberAction.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt
index 081af556d7..9af554e883 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.banned
+package im.vector.app.features.roomprofile.banned
 
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.riotx.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomBannedListMemberAction : VectorViewModelAction {
     data class QueryInfo(val roomMemberSummary: RoomMemberSummary) : RoomBannedListMemberAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
index 35f5589e9f..b65b3de807 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.banned
+package im.vector.app.features.roomprofile.banned
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -22,22 +22,22 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.members.roomMemberQueryParams
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomMemberContent
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.internal.util.awaitCallback
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
+import im.vector.app.R
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt
new file mode 100644
index 0000000000..a65a30441d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.roomprofile.banned
+
+import com.airbnb.epoxy.TypedEpoxyController
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.epoxy.profiles.buildProfileSection
+import im.vector.app.core.epoxy.profiles.profileMatrixItemWithProgress
+import im.vector.app.core.extensions.join
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.features.home.AvatarRenderer
+import javax.inject.Inject
+
+class RoomBannedMemberListController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val stringProvider: StringProvider,
+        colorProvider: ColorProvider
+) : TypedEpoxyController<RoomBannedMemberListViewState>() {
+
+    interface Callback {
+        fun onUnbanClicked(roomMember: RoomMemberSummary)
+    }
+
+    private val dividerColor = colorProvider.getColorFromAttribute(R.attr.vctr_list_divider_color)
+
+    var callback: Callback? = null
+
+    init {
+        setData(null)
+    }
+
+    override fun buildModels(data: RoomBannedMemberListViewState?) {
+        val bannedList = data?.bannedMemberSummaries?.invoke() ?: return
+
+        val quantityString = stringProvider.getQuantityString(R.plurals.room_settings_banned_users_count, bannedList.size, bannedList.size)
+
+        if (bannedList.isEmpty()) {
+            buildProfileSection(stringProvider.getString(R.string.room_settings_banned_users_title))
+
+            genericFooterItem {
+                id("footer")
+                text(quantityString)
+            }
+        } else {
+            buildProfileSection(quantityString)
+
+            bannedList.join(
+                    each = { _, roomMember ->
+                        val actionInProgress = data.onGoingModerationAction.contains(roomMember.userId)
+                        profileMatrixItemWithProgress {
+                            id(roomMember.userId)
+                            matrixItem(roomMember.toMatrixItem())
+                            avatarRenderer(avatarRenderer)
+                            apply {
+                                if (actionInProgress) {
+                                    inProgress(true)
+                                    editable(false)
+                                } else {
+                                    inProgress(false)
+                                    editable(true)
+                                    clickListener { _ ->
+                                        callback?.onUnbanClicked(roomMember)
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    between = { _, roomMemberBefore ->
+                        dividerItem {
+                            id("divider_${roomMemberBefore.userId}")
+                            color(dividerColor)
+                        }
+                    }
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
index a6ebcf1acf..480deea6af 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.banned
+package im.vector.app.features.roomprofile.banned
 
 import android.os.Bundle
 import android.view.View
@@ -22,15 +22,15 @@ import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.roomprofile.RoomProfileArgs
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.toast
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.android.synthetic.main.fragment_room_setting_generic.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListViewState.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt
index 5b3d4e0826..ee8e534b1f 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.banned
+package im.vector.app.features.roomprofile.banned
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.features.roomprofile.RoomProfileArgs
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import im.vector.app.features.roomprofile.RoomProfileArgs
 
 data class RoomBannedMemberListViewState(
         val roomId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedViewEvents.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedViewEvents.kt
index 69e422b022..ea2d775a29 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedViewEvents.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.banned
+package im.vector.app.features.roomprofile.banned
 
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.riotx.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class RoomBannedViewEvents : VectorViewEvents {
     data class ShowBannedInfo(val bannedByUserId: String, val banReason: String, val roomMemberSummary: RoomMemberSummary) : RoomBannedViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListAction.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListAction.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListAction.kt
index d6a63197bd..c61dcb98f5 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.members
+package im.vector.app.features.roomprofile.members
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomMemberListAction : VectorViewModelAction {
     data class RevokeThreePidInvite(val stateKey: String) : RoomMemberListAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListController.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
index 8cf93e8589..59b1bca26f 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.members
+package im.vector.app.features.roomprofile.members
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.RoomThirdPartyInviteContent
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.epoxy.profiles.buildProfileSection
-import im.vector.riotx.core.epoxy.profiles.profileMatrixItem
-import im.vector.riotx.core.extensions.join
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.epoxy.profiles.buildProfileSection
+import im.vector.app.core.epoxy.profiles.profileMatrixItem
+import im.vector.app.core.extensions.join
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.AvatarRenderer
 import javax.inject.Inject
 
 class RoomMemberListController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 6fe1f7ad18..46d0f35b95 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.members
+package im.vector.app.features.roomprofile.members
 
 import android.os.Bundle
 import android.view.Menu
@@ -24,17 +24,17 @@ import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.RoomThirdPartyInviteContent
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.roomprofile.RoomProfileArgs
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.android.synthetic.main.fragment_room_setting_generic.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
index 23d5e61399..5ce4b60445 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.members
+package im.vector.app.features.roomprofile.members
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -22,27 +22,27 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.members.roomMemberQueryParams
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.android.api.session.room.powerlevels.Role
-import im.vector.matrix.rx.asObservable
-import im.vector.matrix.rx.mapOptional
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
+import org.matrix.android.sdk.rx.asObservable
+import org.matrix.android.sdk.rx.mapOptional
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.BiFunction
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewState.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
index 55fb950a8e..4d21aa103f 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.members
+package im.vector.app.features.roomprofile.members
 
 import androidx.annotation.StringRes
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.R
-import im.vector.riotx.features.roomprofile.RoomProfileArgs
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import im.vector.app.R
+import im.vector.app.features.roomprofile.RoomProfileArgs
 
 data class RoomMemberListViewState(
         val roomId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberSummaryComparator.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryComparator.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberSummaryComparator.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryComparator.kt
index cc1dd29d13..1e44c34e6f 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberSummaryComparator.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryComparator.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.members
+package im.vector.app.features.roomprofile.members
 
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import javax.inject.Inject
 
 class RoomMemberSummaryComparator @Inject constructor() : Comparator<RoomMemberSummary> {
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsAction.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
index 908b72606d..cac6994952 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.settings
+package im.vector.app.features.roomprofile.settings
 
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
-import im.vector.riotx.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomSettingsAction : VectorViewModelAction {
     data class SetRoomName(val newName: String) : RoomSettingsAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsController.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index e9d2e5ccb5..a60f223532 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.settings
+package im.vector.app.features.roomprofile.settings
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibilityContent
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.profiles.buildProfileAction
-import im.vector.riotx.core.epoxy.profiles.buildProfileSection
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.form.formEditTextItem
-import im.vector.riotx.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import im.vector.app.R
+import im.vector.app.core.epoxy.profiles.buildProfileAction
+import im.vector.app.core.epoxy.profiles.buildProfileSection
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.form.formEditTextItem
+import im.vector.app.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter
 import javax.inject.Inject
 
 class RoomSettingsController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
index 840ec9f00c..6a27d5ee0a 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.settings
+package im.vector.app.features.roomprofile.settings
 
 import android.os.Bundle
 import android.view.Menu
@@ -25,19 +25,19 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibilityContent
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter
-import im.vector.riotx.features.roomprofile.RoomProfileArgs
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.toast
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter
+import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.android.synthetic.main.fragment_room_setting_generic.*
 import kotlinx.android.synthetic.main.merge_overlay_waiting_view.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewEvents.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewEvents.kt
index c30a5ff9c9..952ca791c9 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewEvents.kt
@@ -15,9 +15,9 @@
  *
  */
 
-package im.vector.riotx.features.roomprofile.settings
+package im.vector.app.features.roomprofile.settings
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for room settings screen
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index 652c5cf4c5..337610aa46 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.settings
+package im.vector.app.features.roomprofile.settings
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
 import io.reactivex.Completable
 import io.reactivex.Observable
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewState.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
index c8d81f3ead..b20861ae8a 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.settings
+package im.vector.app.features.roomprofile.settings
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.features.roomprofile.RoomProfileArgs
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import im.vector.app.features.roomprofile.RoomProfileArgs
 
 data class RoomSettingsViewState(
         val roomId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsAction.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsAction.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsAction.kt
index 59571de122..f383122561 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads
+package im.vector.app.features.roomprofile.uploads
 
-import im.vector.matrix.android.api.session.room.uploads.UploadEvent
-import im.vector.riotx.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomUploadsAction : VectorViewModelAction {
     data class Download(val uploadEvent: UploadEvent) : RoomUploadsAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
index 47dab994b4..b3f5047df4 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads
+package im.vector.app.features.roomprofile.uploads
 
 import android.os.Bundle
 import android.view.View
@@ -23,17 +23,17 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.tabs.TabLayoutMediator
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.intent.getMimeTypeFromUri
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.saveMedia
-import im.vector.riotx.core.utils.shareMedia
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.notifications.NotificationUtils
-import im.vector.riotx.features.roomprofile.RoomProfileArgs
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.intent.getMimeTypeFromUri
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.saveMedia
+import im.vector.app.core.utils.shareMedia
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.android.synthetic.main.fragment_room_uploads.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt
index 6866d5e2fa..fe1ac51d23 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads
+package im.vector.app.features.roomprofile.uploads
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import im.vector.riotx.features.roomprofile.uploads.files.RoomUploadsFilesFragment
-import im.vector.riotx.features.roomprofile.uploads.media.RoomUploadsMediaFragment
+import im.vector.app.features.roomprofile.uploads.files.RoomUploadsFilesFragment
+import im.vector.app.features.roomprofile.uploads.media.RoomUploadsMediaFragment
 
 class RoomUploadsPagerAdapter(
         private val fragment: Fragment
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewEvents.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewEvents.kt
index cd0c34494d..946076ff6e 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads
+package im.vector.app.features.roomprofile.uploads
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 import java.io.File
 
 sealed class RoomUploadsViewEvents : VectorViewEvents {
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewModel.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
index 7cc8b9b31d..db8de1f974 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads
+package im.vector.app.features.roomprofile.uploads
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
@@ -26,17 +26,17 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.file.FileService
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.message.getFileUrl
-import im.vector.matrix.android.api.session.room.uploads.GetUploadsResult
-import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.uploads.GetUploadsResult
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
+import org.matrix.android.sdk.internal.util.awaitCallback
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
 import java.io.File
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewState.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewState.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewState.kt
index 3e31a3cdd6..b983a6d074 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewState.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads
+package im.vector.app.features.roomprofile.uploads
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.uploads.UploadEvent
-import im.vector.riotx.features.roomprofile.RoomProfileArgs
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
+import im.vector.app.features.roomprofile.RoomProfileArgs
 
 data class RoomUploadsViewState(
         val roomId: String = "",
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
index bba7a40440..66b4dfda33 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads.files
+package im.vector.app.features.roomprofile.uploads.files
 
 import android.os.Bundle
 import android.view.View
@@ -24,15 +24,15 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.room.uploads.UploadEvent
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.trackItemsVisibilityChange
-import im.vector.riotx.core.platform.StateView
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsAction
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewModel
+import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.trackItemsVisibilityChange
+import im.vector.app.core.platform.StateView
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.roomprofile.uploads.RoomUploadsAction
+import im.vector.app.features.roomprofile.uploads.RoomUploadsViewModel
 import kotlinx.android.synthetic.main.fragment_generic_state_view_recycler.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileController.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
index 60f966e7d2..46ab4f5986 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads.files
+package im.vector.app.features.roomprofile.uploads.files
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.epoxy.VisibilityState
-import im.vector.matrix.android.api.session.room.uploads.UploadEvent
-import im.vector.riotx.R
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewState
+import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
+import im.vector.app.R
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.roomprofile.uploads.RoomUploadsViewState
 import javax.inject.Inject
 
 class UploadsFileController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileItem.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileItem.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileItem.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileItem.kt
index 927672dd70..6b75209224 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileItem.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads.files
+package im.vector.app.features.roomprofile.uploads.files
 
 import android.view.View
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_uploads_file)
 abstract class UploadsFileItem : VectorEpoxyModel<UploadsFileItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/Config.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/Config.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/Config.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/Config.kt
index 50d4feff55..d2a5075118 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/Config.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/Config.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads.media
+package im.vector.app.features.roomprofile.uploads.media
 
 // Min image size. Size will be adjusted at runtime
 const val IMAGE_SIZE_DP = 120
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
index dda070bf48..eabeab9183 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads.media
+package im.vector.app.features.roomprofile.uploads.media
 
 import android.os.Bundle
 import android.util.DisplayMetrics
@@ -29,23 +29,23 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.appbar.AppBarLayout
-import im.vector.matrix.android.api.session.room.model.message.MessageImageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent
-import im.vector.matrix.android.api.session.room.model.message.getFileUrl
-import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.trackItemsVisibilityChange
-import im.vector.riotx.core.platform.StateView
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.features.media.AttachmentData
-import im.vector.riotx.features.media.ImageContentRenderer
-import im.vector.riotx.features.media.VideoContentRenderer
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsAction
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsFragment
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewModel
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewState
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.trackItemsVisibilityChange
+import im.vector.app.core.platform.StateView
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.media.AttachmentData
+import im.vector.app.features.media.ImageContentRenderer
+import im.vector.app.features.media.VideoContentRenderer
+import im.vector.app.features.roomprofile.uploads.RoomUploadsAction
+import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment
+import im.vector.app.features.roomprofile.uploads.RoomUploadsViewModel
+import im.vector.app.features.roomprofile.uploads.RoomUploadsViewState
 import kotlinx.android.synthetic.main.fragment_generic_state_view_recycler.*
 import kotlinx.android.synthetic.main.fragment_room_uploads.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsImageItem.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsImageItem.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt
index 3b83e99656..2294095623 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsImageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads.media
+package im.vector.app.features.roomprofile.uploads.media
 
 import android.view.View
 import android.widget.ImageView
 import androidx.core.view.ViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.media.ImageContentRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.media.ImageContentRenderer
 
 @EpoxyModelClass(layout = R.layout.item_uploads_image)
 abstract class UploadsImageItem : VectorEpoxyModel<UploadsImageItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsMediaController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsMediaController.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
index 72e4cb6d06..6f60a77296 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsMediaController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads.media
+package im.vector.app.features.roomprofile.uploads.media
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.epoxy.VisibilityState
-import im.vector.matrix.android.api.session.room.model.message.MessageImageContent
-import im.vector.matrix.android.api.session.room.model.message.MessageType
-import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent
-import im.vector.matrix.android.api.session.room.model.message.getFileUrl
-import im.vector.matrix.android.api.session.room.uploads.UploadEvent
-import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt
-import im.vector.riotx.core.epoxy.squareLoadingItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.features.media.ImageContentRenderer
-import im.vector.riotx.features.media.VideoContentRenderer
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewState
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
+import im.vector.app.core.epoxy.squareLoadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.media.ImageContentRenderer
+import im.vector.app.features.media.VideoContentRenderer
+import im.vector.app.features.roomprofile.uploads.RoomUploadsViewState
 import javax.inject.Inject
 
 class UploadsMediaController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsVideoItem.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsVideoItem.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt
index f20f6ed5b1..3a042943c2 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsVideoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.roomprofile.uploads.media
+package im.vector.app.features.roomprofile.uploads.media
 
 import android.view.View
 import android.widget.ImageView
 import androidx.core.view.ViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.utils.DebouncedClickListener
-import im.vector.riotx.features.media.ImageContentRenderer
-import im.vector.riotx.features.media.VideoContentRenderer
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.media.ImageContentRenderer
+import im.vector.app.features.media.VideoContentRenderer
 
 @EpoxyModelClass(layout = R.layout.item_uploads_video)
 abstract class UploadsVideoItem : VectorEpoxyModel<UploadsVideoItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/session/SessionListener.kt b/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/session/SessionListener.kt
rename to vector/src/main/java/im/vector/app/features/session/SessionListener.kt
index 4aef387d7c..89e02f3600 100644
--- a/vector/src/main/java/im/vector/riotx/features/session/SessionListener.kt
+++ b/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.session
+package im.vector.app.features.session
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import im.vector.matrix.android.api.failure.GlobalError
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.core.extensions.postLiveEvent
-import im.vector.riotx.core.utils.LiveEvent
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.core.extensions.postLiveEvent
+import im.vector.app.core.utils.LiveEvent
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt b/vector/src/main/java/im/vector/app/features/settings/FontScale.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt
rename to vector/src/main/java/im/vector/app/features/settings/FontScale.kt
index 47c438695c..5fbb021e0a 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/FontScale.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.content.Context
 import androidx.annotation.StringRes
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import im.vector.riotx.R
+import im.vector.app.R
 
 /**
  * Object to manage the Font Scale choice of the user
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
similarity index 73%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
index 75ddbadd2e..d2f92e300e 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.content.Context
 import android.content.res.Configuration
-import android.os.Build
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.R
+import im.vector.app.BuildConfig
+import im.vector.app.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import timber.log.Timber
@@ -108,13 +107,11 @@ object VectorLocale {
                 putString(APPLICATION_LOCALE_VARIANT_KEY, variant)
             }
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                val script = locale.script
-                if (script.isEmpty()) {
-                    remove(APPLICATION_LOCALE_SCRIPT_KEY)
-                } else {
-                    putString(APPLICATION_LOCALE_SCRIPT_KEY, script)
-                }
+            val script = locale.script
+            if (script.isEmpty()) {
+                remove(APPLICATION_LOCALE_SCRIPT_KEY)
+            } else {
+                putString(APPLICATION_LOCALE_SCRIPT_KEY, script)
             }
         }
     }
@@ -128,40 +125,15 @@ object VectorLocale {
      * @return the localized string
      */
     private fun getString(context: Context, locale: Locale, resourceId: Int): String {
-        val result: String
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            val config = Configuration(context.resources.configuration)
-            config.setLocale(locale)
-            result = try {
-                context.createConfigurationContext(config).getText(resourceId).toString()
-            } catch (e: Exception) {
-                Timber.e(e, "## getString() failed")
-                // use the default one
-                context.getString(resourceId)
-            }
-        } else {
-            val resources = context.resources
-            val conf = resources.configuration
-
-            @Suppress("DEPRECATION")
-            val savedLocale = conf.locale
-            @Suppress("DEPRECATION")
-            conf.locale = locale
-            @Suppress("DEPRECATION")
-            resources.updateConfiguration(conf, null)
-
-            // retrieve resources from desired locale
-            result = resources.getString(resourceId)
-
-            // restore original locale
-            @Suppress("DEPRECATION")
-            conf.locale = savedLocale
-            @Suppress("DEPRECATION")
-            resources.updateConfiguration(conf, null)
+        val config = Configuration(context.resources.configuration)
+        config.setLocale(locale)
+        return try {
+            context.createConfigurationContext(config).getText(resourceId).toString()
+        } catch (e: Exception) {
+            Timber.e(e, "## getString() failed")
+            // use the default one
+            context.getString(resourceId)
         }
-
-        return result
     }
 
     /**
@@ -194,22 +166,18 @@ object VectorLocale {
         }
 
         val list = knownLocalesSet.mapNotNull { (language, country, script) ->
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                try {
-                    Locale.Builder()
-                            .setLanguage(language)
-                            .setRegion(country)
-                            .setScript(script)
-                            .build()
-                } catch (exception: IllformedLocaleException) {
-                    if (BuildConfig.DEBUG) {
-                        throw exception
-                    }
-                    // Ignore this locale in production
-                    null
+            try {
+                Locale.Builder()
+                        .setLanguage(language)
+                        .setRegion(country)
+                        .setScript(script)
+                        .build()
+            } catch (exception: IllformedLocaleException) {
+                if (BuildConfig.DEBUG) {
+                    throw exception
                 }
-            } else {
-                Locale(language, country)
+                // Ignore this locale in production
+                null
             }
         }
                 // sort by human display names
@@ -229,9 +197,7 @@ object VectorLocale {
         return buildString {
             append(locale.getDisplayLanguage(locale))
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-                    && locale.script != ISO_15924_LATN
-                    && locale.getDisplayScript(locale).isNotEmpty()) {
+            if (locale.script != ISO_15924_LATN && locale.getDisplayScript(locale).isNotEmpty()) {
                 append(" - ")
                 append(locale.getDisplayScript(locale))
             }
@@ -254,7 +220,7 @@ object VectorLocale {
         return buildString {
             append("[")
             append(locale.displayLanguage)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && locale.script != ISO_15924_LATN) {
+            if (locale.script != ISO_15924_LATN) {
                 append(" - ")
                 append(locale.displayScript)
             }
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 45558abe69..69f8540a1d 100755
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.content.Context
 import android.media.RingtoneManager
@@ -24,11 +24,11 @@ import android.provider.MediaStore
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.squareup.seismic.ShakeDetector
-import im.vector.matrix.android.api.extensions.tryThis
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.R
-import im.vector.riotx.features.homeserver.ServerUrlsRepository
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.features.homeserver.ServerUrlsRepository
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.extensions.tryThis
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -110,6 +110,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         // notifications
         const val SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY = "SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
         const val SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY = "SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
+
         //    public static final String SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY = "SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY";
         const val SETTINGS_SYSTEM_CALL_NOTIFICATION_PREFERENCE_KEY = "SETTINGS_SYSTEM_CALL_NOTIFICATION_PREFERENCE_KEY"
         const val SETTINGS_SYSTEM_NOISY_NOTIFICATION_PREFERENCE_KEY = "SETTINGS_SYSTEM_NOISY_NOTIFICATION_PREFERENCE_KEY"
@@ -130,6 +131,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         const val SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY = "SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY"
 
         // Calls
+        const val SETTINGS_CALL_PREVENT_ACCIDENTAL_CALL_KEY = "SETTINGS_CALL_PREVENT_ACCIDENTAL_CALL_KEY"
         const val SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY = "SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY"
         const val SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY = "SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY"
 
@@ -147,6 +149,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         private const val SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY = "SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
         private const val SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY = "SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY"
         private const val SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY"
+
         // SETTINGS_LABS_HIDE_TECHNICAL_E2E_ERRORS
         private const val SETTINGS_LABS_MERGE_E2E_ERRORS = "SETTINGS_LABS_MERGE_E2E_ERRORS"
         const val SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB = "SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
@@ -160,6 +163,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
 
         // Security
         const val SETTINGS_SECURITY_USE_FLAG_SECURE = "SETTINGS_SECURITY_USE_FLAG_SECURE"
+        const val SETTINGS_SECURITY_USE_PIN_CODE_FLAG = "SETTINGS_SECURITY_USE_PIN_CODE_FLAG"
 
         // other
         const val SETTINGS_MEDIA_SAVING_PERIOD_KEY = "SETTINGS_MEDIA_SAVING_PERIOD_KEY"
@@ -643,6 +647,13 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         }
     }
 
+    /**
+     * Tells if a confirmation dialog should be displayed before staring a call
+     */
+    fun preventAccidentalCall(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_CALL_PREVENT_ACCIDENTAL_CALL_KEY, false)
+    }
+
     /**
      * Tells if the read receipts should be shown
      *
@@ -812,4 +823,11 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     fun useFlagSecure(): Boolean {
         return defaultPrefs.getBoolean(SETTINGS_SECURITY_USE_FLAG_SECURE, false)
     }
+
+    /**
+     * The user enable protecting app access with pin code
+     */
+    fun useFlagPinCode(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_SECURITY_USE_PIN_CODE_FLAG, false)
+    }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
index b92ee316ee..dda1579db4 100755
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.content.Context
 import android.content.Intent
 import androidx.fragment.app.FragmentManager
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import im.vector.matrix.android.api.failure.GlobalError
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.settings.devices.VectorSettingsDevicesFragment
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment
 import kotlinx.android.synthetic.main.activity_vector_settings.*
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
index 95901de471..27160ba234 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import androidx.preference.Preference
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.matrix.android.api.pushrules.rest.PushRuleAndKind
-import im.vector.riotx.R
-import im.vector.riotx.core.preference.PushRulePreference
-import im.vector.riotx.core.preference.VectorPreference
-import im.vector.riotx.core.utils.toast
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.pushrules.rest.PushRuleAndKind
+import im.vector.app.R
+import im.vector.app.core.preference.PushRulePreference
+import im.vector.app.core.preference.VectorPreference
+import im.vector.app.core.utils.toast
 import javax.inject.Inject
 
 class VectorSettingsAdvancedNotificationPreferenceFragment @Inject constructor()
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedSettingsFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
index 43adcf6335..919122efb8 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import androidx.preference.Preference
 import androidx.preference.SeekBarPreference
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.preference.VectorSwitchPreference
-import im.vector.riotx.features.rageshake.RageShake
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.preference.VectorSwitchPreference
+import im.vector.app.features.rageshake.RageShake
 
 class VectorSettingsAdvancedSettingsFragment : VectorSettingsBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
similarity index 80%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
index c43a6ab40d..512545afe2 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
@@ -14,21 +14,23 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.CallSuper
 import androidx.preference.PreferenceFragmentCompat
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.R
-import im.vector.riotx.core.di.DaggerScreenComponent
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.utils.toast
+import im.vector.app.R
+import im.vector.app.core.di.DaggerScreenComponent
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.toast
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
+import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber
 
 abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), HasScreenInjector {
@@ -74,10 +76,31 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), HasScree
         mLoadingView = vectorActivity.findViewById(R.id.vector_settings_spinner_views)
     }
 
+    @CallSuper
+    override fun onDestroyView() {
+        super.onDestroyView()
+        uiDisposables.clear()
+    }
+
+    override fun onDestroy() {
+        uiDisposables.dispose()
+        super.onDestroy()
+    }
+
     abstract fun bindPref()
 
     abstract var titleRes: Int
 
+    /* ==========================================================================================
+     * Disposable
+     * ========================================================================================== */
+
+    private val uiDisposables = CompositeDisposable()
+
+    protected fun Disposable.disposeOnDestroyView() {
+        uiDisposables.add(this)
+    }
+
     /* ==========================================================================================
      * Protected
      * ========================================================================================== */
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFlairFragment.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsFlairFragment.kt
index 11a448b4b7..ec65e7d004 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFlairFragment.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import androidx.preference.PreferenceCategory
-import im.vector.riotx.R
-import im.vector.riotx.core.preference.ProgressBarPreference
+import im.vector.app.R
+import im.vector.app.core.preference.ProgressBarPreference
 
 class VectorSettingsFlairFragment : VectorSettingsBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFragmentInteractionListener.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsFragmentInteractionListener.kt
index 026e451fea..b815ce653d 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFragmentInteractionListener.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 interface VectorSettingsFragmentInteractionListener {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index 209cedda2c..fbeb5b954d 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -16,11 +16,12 @@
 
 @file:Suppress("UNUSED_VARIABLE", "UNUSED_ANONYMOUS_PARAMETER", "UNUSED_PARAMETER")
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
+import android.os.Bundle
 import android.text.Editable
 import android.util.Patterns
 import android.view.View
@@ -40,38 +41,41 @@ import com.bumptech.glide.load.engine.cache.DiskCache
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.yalantis.ucrop.UCrop
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.failure.isInvalidPassword
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerConfig
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.intent.getFilenameFromUri
-import im.vector.riotx.core.platform.SimpleTextWatcher
-import im.vector.riotx.core.preference.UserAvatarPreference
-import im.vector.riotx.core.preference.VectorPreference
-import im.vector.riotx.core.preference.VectorSwitchPreference
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.riotx.core.utils.TextUtils
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.core.utils.copyToClipboard
-import im.vector.riotx.core.utils.getSizeOfFiles
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.MainActivity
-import im.vector.riotx.features.MainActivityArgs
-import im.vector.riotx.features.media.createUCropWithDefaultSettings
-import im.vector.riotx.features.themes.ThemeUtils
-import im.vector.riotx.features.workers.signout.SignOutUiWorker
-import im.vector.riotx.multipicker.MultiPicker
-import im.vector.riotx.multipicker.entity.MultiPickerImageType
+import im.vector.app.R
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.intent.getFilenameFromUri
+import im.vector.app.core.platform.SimpleTextWatcher
+import im.vector.app.core.preference.UserAvatarPreference
+import im.vector.app.core.preference.VectorPreference
+import im.vector.app.core.preference.VectorSwitchPreference
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
+import im.vector.app.core.utils.TextUtils
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.core.utils.copyToClipboard
+import im.vector.app.core.utils.getSizeOfFiles
+import im.vector.app.core.utils.toast
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
+import im.vector.app.features.media.createUCropWithDefaultSettings
+import im.vector.app.features.themes.ThemeUtils
+import im.vector.app.features.workers.signout.SignOutUiWorker
+import im.vector.lib.multipicker.MultiPicker
+import im.vector.lib.multipicker.entity.MultiPickerImageType
+import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.failure.isInvalidPassword
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
 import java.io.File
 import java.util.UUID
 
@@ -120,10 +124,25 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         }
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        observeUserAvatar()
+    }
+
+    private fun observeUserAvatar() {
+        session.rx()
+                .liveUser(session.myUserId)
+                .unwrap()
+                .distinctUntilChanged { user -> user.avatarUrl }
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { mUserAvatarPreference.refreshAvatar(it) }
+                .disposeOnDestroyView()
+    }
+
     override fun bindPref() {
         // Avatar
         mUserAvatarPreference.let {
-            it.setSession(session)
             it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
                 onUpdateAvatarClick()
                 false
@@ -447,8 +466,6 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         session.updateAvatar(session.myUserId, uri, getFilenameFromUri(context, uri) ?: UUID.randomUUID().toString(), object : MatrixCallback<Unit> {
             override fun onSuccess(data: Unit) {
                 if (!isAdded) return
-
-                mUserAvatarPreference.refreshAvatar()
                 onCommonDone(null)
             }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
index a8c2569c40..129e057148 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.content.Intent
 import android.net.Uri
 import android.provider.Settings
 import androidx.preference.Preference
-import im.vector.matrix.android.api.Matrix
-import im.vector.riotx.R
-import im.vector.riotx.core.preference.VectorPreference
-import im.vector.riotx.core.utils.copyToClipboard
-import im.vector.riotx.core.utils.displayInWebView
-import im.vector.riotx.core.utils.openUrlInChromeCustomTab
-import im.vector.riotx.features.version.VersionProvider
-import im.vector.riotx.openOssLicensesMenuActivity
+import org.matrix.android.sdk.api.Matrix
+import im.vector.app.R
+import im.vector.app.core.preference.VectorPreference
+import im.vector.app.core.utils.copyToClipboard
+import im.vector.app.core.utils.displayInWebView
+import im.vector.app.core.utils.openUrlInChromeCustomTab
+import im.vector.app.features.version.VersionProvider
+import im.vector.app.openOssLicensesMenuActivity
 import javax.inject.Inject
 
 class VectorSettingsHelpAboutFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
index 1ffd80a591..c8cf44778c 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
-import im.vector.riotx.R
-import im.vector.riotx.core.preference.VectorSwitchPreference
+import im.vector.app.R
+import im.vector.app.core.preference.VectorSwitchPreference
 import javax.inject.Inject
 
 class VectorSettingsLabsFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
index 6f731711db..1cf9b0dcfa 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.app.Activity
 import android.content.Context
@@ -25,16 +25,16 @@ import android.os.Parcelable
 import android.widget.Toast
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.pushrules.RuleIds
-import im.vector.matrix.android.api.pushrules.RuleKind
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.preference.VectorPreference
-import im.vector.riotx.core.preference.VectorSwitchPreference
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.features.notifications.NotificationUtils
-import im.vector.riotx.push.fcm.FcmHelper
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.pushrules.RuleKind
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.preference.VectorPreference
+import im.vector.app.core.preference.VectorSwitchPreference
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.push.fcm.FcmHelper
 import javax.inject.Inject
 
 // Referenced in vector_settings_preferences_root.xml
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
index 3ac097abfe..f07d6471c9 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.app.Activity
 import android.content.Context
@@ -28,14 +28,14 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionManager
 import butterknife.BindView
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.rageshake.BugReporter
-import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
-import im.vector.riotx.push.fcm.NotificationTroubleshootTestManagerFactory
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.rageshake.BugReporter
+import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.push.fcm.NotificationTroubleshootTestManagerFactory
 import javax.inject.Inject
 
 class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index 5848caacdb..0d29137289 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.app.Activity
 import android.content.Context
@@ -23,12 +23,12 @@ import android.widget.LinearLayout
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.restart
-import im.vector.riotx.core.preference.VectorListPreference
-import im.vector.riotx.core.preference.VectorPreference
-import im.vector.riotx.features.configuration.VectorConfiguration
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.extensions.restart
+import im.vector.app.core.preference.VectorListPreference
+import im.vector.app.core.preference.VectorPreference
+import im.vector.app.features.configuration.VectorConfiguration
+import im.vector.app.features.themes.ThemeUtils
 import javax.inject.Inject
 
 class VectorSettingsPreferencesFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
index a50e0e9ad0..d2ec1a1543 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
-import im.vector.riotx.R
+import im.vector.app.R
 import javax.inject.Inject
 
 class VectorSettingsRootFragment @Inject constructor() : VectorSettingsBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
similarity index 71%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index b60c2cb3a7..7f6dd7b05f 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -28,43 +28,54 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.SwitchPreference
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.textfield.TextInputEditText
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.internal.crypto.crosssigning.isVerified
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse
-import im.vector.matrix.rx.SecretsSynchronisationInfo
-import im.vector.matrix.rx.rx
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.dialogs.ExportKeysDialog
-import im.vector.riotx.core.extensions.queryExportKeys
-import im.vector.riotx.core.intent.ExternalIntentData
-import im.vector.riotx.core.intent.analyseIntent
-import im.vector.riotx.core.intent.getFilenameFromUri
-import im.vector.riotx.core.platform.SimpleTextWatcher
-import im.vector.riotx.core.preference.VectorPreference
-import im.vector.riotx.core.preference.VectorPreferenceCategory
-import im.vector.riotx.core.utils.openFileSelection
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.crypto.keys.KeysExporter
-import im.vector.riotx.features.crypto.keys.KeysImporter
-import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
-import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.dialogs.ExportKeysDialog
+import im.vector.app.core.extensions.queryExportKeys
+import im.vector.app.core.intent.ExternalIntentData
+import im.vector.app.core.intent.analyseIntent
+import im.vector.app.core.intent.getFilenameFromUri
+import im.vector.app.core.platform.SimpleTextWatcher
+import im.vector.app.core.preference.VectorPreference
+import im.vector.app.core.preference.VectorPreferenceCategory
+import im.vector.app.core.utils.copyToClipboard
+import im.vector.app.core.utils.openFileSelection
+import im.vector.app.core.utils.toast
+import im.vector.app.features.crypto.keys.KeysExporter
+import im.vector.app.features.crypto.keys.KeysImporter
+import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity
+import im.vector.app.features.crypto.recover.BootstrapBottomSheet
+import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.pin.PinActivity
+import im.vector.app.features.pin.PinCodeStore
+import im.vector.app.features.pin.PinLocker
+import im.vector.app.features.pin.PinMode
+import im.vector.app.features.themes.ThemeUtils
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import me.gujun.android.span.span
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.extensions.getFingerprintHumanReadable
+import org.matrix.android.sdk.internal.crypto.crosssigning.isVerified
+import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DevicesListResponse
+import org.matrix.android.sdk.rx.SecretsSynchronisationInfo
+import org.matrix.android.sdk.rx.rx
 import javax.inject.Inject
 
 class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         private val vectorPreferences: VectorPreferences,
-        private val activeSessionHolder: ActiveSessionHolder
+        private val pinLocker: PinLocker,
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val pinCodeStore: PinCodeStore,
+        private val navigator: Navigator
 ) : VectorSettingsBaseFragment() {
 
     override var titleRes = R.string.settings_security_and_privacy
@@ -76,6 +87,18 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         findPreference<PreferenceCategory>(VectorPreferences.SETTINGS_CRYPTOGRAPHY_PREFERENCE_KEY)!!
     }
 
+    private val cryptoInfoDeviceNamePreference by lazy {
+        findPreference<VectorPreference>("SETTINGS_ENCRYPTION_INFORMATION_DEVICE_NAME_PREFERENCE_KEY")!!
+    }
+
+    private val cryptoInfoDeviceIdPreference by lazy {
+        findPreference<VectorPreference>("SETTINGS_ENCRYPTION_INFORMATION_DEVICE_ID_PREFERENCE_KEY")!!
+    }
+
+    private val cryptoInfoDeviceKeyPreference by lazy {
+        findPreference<VectorPreference>("SETTINGS_ENCRYPTION_INFORMATION_DEVICE_KEY_PREFERENCE_KEY")!!
+    }
+
     private val mCrossSigningStatePreference by lazy {
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_ENCRYPTION_CROSS_SIGNING_PREFERENCE_KEY)!!
     }
@@ -101,6 +124,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         findPreference<SwitchPreference>(VectorPreferences.SETTINGS_ENCRYPTION_NEVER_SENT_TO_PREFERENCE_KEY)!!
     }
 
+    private val usePinCodePref by lazy {
+        findPreference<SwitchPreference>(VectorPreferences.SETTINGS_SECURITY_USE_PIN_CODE_FLAG)!!
+    }
+
     override fun onCreateRecyclerView(inflater: LayoutInflater?, parent: ViewGroup?, savedInstanceState: Bundle?): RecyclerView {
         return super.onCreateRecyclerView(inflater, parent, savedInstanceState).also {
             // Insert animation are really annoying the first time the list is shown
@@ -212,9 +239,6 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
     }
 
     override fun bindPref() {
-        // Push target
-        refreshPushersList()
-
         // Refresh Key Management section
         refreshKeysManagementSection()
 
@@ -231,6 +255,8 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
             }
         }
 
+        refreshPinCodeStatus()
+
         refreshXSigningStatus()
 
         secureBackupPreference.icon = activity?.let {
@@ -279,6 +305,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         }
 
         mCrossSigningStatePreference.isVisible = true
+        if (!vectorPreferences.developerMode()) {
+            // When not in developer mode, intercept click on this preference
+            mCrossSigningStatePreference.onPreferenceClickListener = Preference.OnPreferenceClickListener { true }
+        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -313,10 +343,28 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
                     })
                 }
             }
+        } else if (requestCode == PinActivity.PIN_REQUEST_CODE) {
+            pinLocker.unlock()
+            refreshPinCodeStatus()
+        } else if (requestCode == REQUEST_E2E_FILE_REQUEST_CODE) {
+            if (resultCode == Activity.RESULT_OK) {
+                importKeys(data)
+            }
         }
-        if (resultCode == Activity.RESULT_OK) {
-            when (requestCode) {
-                REQUEST_E2E_FILE_REQUEST_CODE -> importKeys(data)
+    }
+
+    private fun refreshPinCodeStatus() {
+        lifecycleScope.launchWhenResumed {
+            val hasPinCode = pinCodeStore.hasEncodedPin()
+            usePinCodePref.isChecked = hasPinCode
+            usePinCodePref.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                val pinMode = if (hasPinCode) {
+                    PinMode.DELETE
+                } else {
+                    PinMode.CREATE
+                }
+                navigator.openPinCode(this@VectorSettingsSecurityPrivacyFragment, pinMode)
+                true
             }
         }
     }
@@ -368,7 +416,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
             val sharedDataItem = sharedDataItems[0]
 
             val uri = when (sharedDataItem) {
-                is ExternalIntentData.IntentDataUri      -> sharedDataItem.uri
+                is ExternalIntentData.IntentDataUri -> sharedDataItem.uri
                 is ExternalIntentData.IntentDataClipData -> sharedDataItem.clipDataItem.uri
                 else                                     -> null
             }
@@ -431,7 +479,8 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
                                         hideLoadingView()
 
                                         AlertDialog.Builder(thisActivity)
-                                                .setMessage(getString(R.string.encryption_import_room_keys_success,
+                                                .setMessage(resources.getQuantityString(R.plurals.encryption_import_room_keys_success,
+                                                        data.successfullyNumberOfImportedKeys,
                                                         data.successfullyNumberOfImportedKeys,
                                                         data.totalNumberOfKeys))
                                                 .setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
@@ -455,58 +504,48 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
 
     /**
      * Build the cryptography preference section.
-     *
-     * @param aMyDeviceInfo the device info
      */
     private fun refreshCryptographyPreference(devices: List<DeviceInfo>) {
         showDeviceListPref.isEnabled = devices.isNotEmpty()
         showDeviceListPref.summary = resources.getQuantityString(R.plurals.settings_active_sessions_count, devices.size, devices.size)
-//        val userId = session.myUserId
-//        val deviceId = session.sessionParams.deviceId
 
-        // device name
-//        if (null != aMyDeviceInfo) {
-//            cryptoInfoDeviceNamePreference.summary = aMyDeviceInfo.displayName
-//
-//            cryptoInfoDeviceNamePreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-//                // TODO device can be rename only from the device list screen for the moment
-//                // displayDeviceRenameDialog(aMyDeviceInfo)
-//                true
-//            }
-//
-//            cryptoInfoDeviceNamePreference.onPreferenceLongClickListener = object : VectorPreference.OnPreferenceLongClickListener {
-//                override fun onPreferenceLongClick(preference: Preference): Boolean {
-//                    activity?.let { copyToClipboard(it, aMyDeviceInfo.displayName!!) }
-//                    return true
-//                }
-//            }
-//        }
-//
-//        // crypto section: device ID
-//        if (!deviceId.isNullOrEmpty()) {
-//            cryptoInfoDeviceIdPreference.summary = deviceId
-//
-//            cryptoInfoDeviceIdPreference.setOnPreferenceClickListener {
-//                activity?.let { copyToClipboard(it, deviceId) }
-//                true
-//            }
-//        }
-//
-//        // crypto section: device key (fingerprint)
-//        if (!deviceId.isNullOrEmpty() && userId.isNotEmpty()) {
-//            val deviceInfo = session.getDeviceInfo(userId, deviceId)
-//
-//            if (null != deviceInfo && !deviceInfo.fingerprint().isNullOrEmpty()) {
-//                cryptoInfoTextPreference.summary = deviceInfo.getFingerprintHumanReadable()
-//
-//                cryptoInfoTextPreference.setOnPreferenceClickListener {
-//                    deviceInfo.fingerprint()?.let {
-//                        copyToClipboard(requireActivity(), it)
-//                    }
-//                    true
-//                }
-//            }
-//        }
+        val userId = session.myUserId
+        val deviceId = session.sessionParams.deviceId
+
+        val aMyDeviceInfo = devices.find { it.deviceId == deviceId }
+
+        // crypto section: device name
+        if (aMyDeviceInfo != null) {
+            cryptoInfoDeviceNamePreference.summary = aMyDeviceInfo.displayName
+
+            cryptoInfoDeviceNamePreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                copyToClipboard(requireActivity(), aMyDeviceInfo.displayName ?: "")
+                true
+            }
+        }
+
+        // crypto section: device ID
+        if (!deviceId.isNullOrEmpty()) {
+            cryptoInfoDeviceIdPreference.summary = deviceId
+
+            cryptoInfoDeviceIdPreference.setOnPreferenceClickListener {
+                copyToClipboard(requireActivity(), deviceId)
+                true
+            }
+        }
+
+        // crypto section: device key (fingerprint)
+        val deviceInfo = session.cryptoService().getDeviceInfo(userId, deviceId)
+
+        val fingerprint = deviceInfo?.fingerprint()
+        if (fingerprint?.isNotEmpty() == true) {
+            cryptoInfoDeviceKeyPreference.summary = deviceInfo.getFingerprintHumanReadable()
+
+            cryptoInfoDeviceKeyPreference.setOnPreferenceClickListener {
+                copyToClipboard(requireActivity(), fingerprint)
+                true
+            }
+        }
 
         sendToUnverifiedDevicesPref.isChecked = session.cryptoService().getGlobalBlacklistUnverifiedDevices()
 
@@ -547,103 +586,8 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         })
     }
 
-    // ==============================================================================================================
-    // pushers list management
-    // ==============================================================================================================
-
-    /**
-     * Refresh the pushers list
-     */
-    private fun refreshPushersList() {
-        activity?.let { _ ->
-            /* TODO
-            val pushManager = Matrix.getInstance(activity).pushManager
-            val pushersList = ArrayList(pushManager.mPushersList)
-
-            if (pushersList.isEmpty()) {
-                preferenceScreen.removePreference(mPushersSettingsCategory)
-                preferenceScreen.removePreference(mPushersSettingsDivider)
-                return
-            }
-
-            // check first if there is an update
-            var isNewList = true
-            if (pushersList.size == mDisplayedPushers.size) {
-                isNewList = !mDisplayedPushers.containsAll(pushersList)
-            }
-
-            if (isNewList) {
-                // remove the displayed one
-                mPushersSettingsCategory.removeAll()
-
-                // add new emails list
-                mDisplayedPushers = pushersList
-
-                var index = 0
-
-                for (pushRule in mDisplayedPushers) {
-                    if (null != pushRule.lang) {
-                        val isThisDeviceTarget = TextUtils.equals(pushManager.currentRegistrationToken, pushRule.pushkey)
-
-                        val preference = VectorPreference(activity).apply {
-                            mTypeface = if (isThisDeviceTarget) Typeface.BOLD else Typeface.NORMAL
-                        }
-                        preference.title = pushRule.deviceDisplayName
-                        preference.summary = pushRule.appDisplayName
-                        preference.key = PUSHER_PREFERENCE_KEY_BASE + index
-                        index++
-                        mPushersSettingsCategory.addPreference(preference)
-
-                        // the user cannot remove the self device target
-                        if (!isThisDeviceTarget) {
-                            preference.onPreferenceLongClickListener = object : VectorPreference.OnPreferenceLongClickListener {
-                                override fun onPreferenceLongClick(preference: Preference): Boolean {
-                                    AlertDialog.Builder(activity)
-                                            .setTitle(R.string.dialog_title_confirmation)
-                                            .setMessage(R.string.settings_delete_notification_targets_confirmation)
-                                            .setPositiveButton(R.string.remove)
-                                            { _, _ ->
-                                                displayLoadingView()
-                                                pushManager.unregister(session, pushRule, object : MatrixCallback<Unit> {
-                                                    override fun onSuccess(info: Void?) {
-                                                        refreshPushersList()
-                                                        onCommonDone(null)
-                                                    }
-
-                                                    override fun onNetworkError(e: Exception) {
-                                                        onCommonDone(e.localizedMessage)
-                                                    }
-
-                                                    override fun onMatrixError(e: MatrixError) {
-                                                        onCommonDone(e.localizedMessage)
-                                                    }
-
-                                                    override fun onUnexpectedError(e: Exception) {
-                                                        onCommonDone(e.localizedMessage)
-                                                    }
-                                                })
-                                            }
-                                            .setNegativeButton(R.string.cancel, null)
-                                            .show()
-                                    return true
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        */
-        }
-    }
-
     companion object {
         private const val REQUEST_E2E_FILE_REQUEST_CODE = 123
         private const val REQUEST_CODE_SAVE_MEGOLM_EXPORT = 124
-
-        private const val PUSHER_PREFERENCE_KEY_BASE = "PUSHER_PREFERENCE_KEY_BASE"
-        private const val DEVICES_PREFERENCE_KEY_BASE = "DEVICES_PREFERENCE_KEY_BASE"
-
-        // TODO i18n
-        const val LABEL_UNAVAILABLE_DATA = "none"
     }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
index 3bd24b6e08..c5088aac6d 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 object VectorSettingsUrls {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt
index 740401a5e0..dba3c78220 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings
+package im.vector.app.features.settings
 
 import android.app.Activity
 import android.content.Intent
@@ -22,12 +22,12 @@ import android.media.RingtoneManager
 import android.net.Uri
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
-import im.vector.riotx.R
-import im.vector.riotx.core.preference.VectorPreference
-import im.vector.riotx.core.utils.getCallRingtoneName
-import im.vector.riotx.core.utils.getCallRingtoneUri
-import im.vector.riotx.core.utils.setCallRingtoneUri
-import im.vector.riotx.core.utils.setUseRiotDefaultRingtone
+import im.vector.app.R
+import im.vector.app.core.preference.VectorPreference
+import im.vector.app.core.utils.getCallRingtoneName
+import im.vector.app.core.utils.getCallRingtoneUri
+import im.vector.app.core.utils.setCallRingtoneUri
+import im.vector.app.core.utils.setUseRiotDefaultRingtone
 
 class VectorSettingsVoiceVideoFragment : VectorSettingsBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
index eb0adf1f17..e48ab337d6 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.account.deactivation
+package im.vector.app.features.settings.account.deactivation
 
 import android.content.Context
 import android.os.Bundle
@@ -22,14 +22,14 @@ import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.MainActivity
-import im.vector.riotx.features.MainActivityArgs
-import im.vector.riotx.features.settings.VectorSettingsActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
+import im.vector.app.features.settings.VectorSettingsActivity
 import kotlinx.android.synthetic.main.fragment_deactivate_account.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt
index 4e7f7252e2..46acb4aee4 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.account.deactivation
+package im.vector.app.features.settings.account.deactivation
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for deactivate account settings screen
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
index adfc9ff5ae..56bd50d057 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.account.deactivation
+package im.vector.app.features.settings.account.deactivation
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxState
@@ -21,12 +21,12 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.failure.isInvalidPassword
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.failure.isInvalidPassword
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
 
 data class DeactivateAccountViewState(
         val passwordShown: Boolean = false
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt
new file mode 100644
index 0000000000..af6ca9f4b7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.crosssigning
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class CrossSigningSettingsAction : VectorViewModelAction
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt
similarity index 65%
rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsController.kt
rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt
index 5f0fb912cf..82279a3906 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.crosssigning
+package im.vector.app.features.settings.crosssigning
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericItem
-import im.vector.riotx.core.ui.list.genericItemWithValue
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import im.vector.app.R
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericItem
+import im.vector.app.core.ui.list.genericItemWithValue
+import im.vector.app.core.utils.DimensionConverter
 import me.gujun.android.span.span
 import javax.inject.Inject
 
@@ -32,11 +31,7 @@ class CrossSigningSettingsController @Inject constructor(
         private val dimensionConverter: DimensionConverter
 ) : TypedEpoxyController<CrossSigningSettingsViewState>() {
 
-    interface InteractionListener {
-        fun setupRecovery()
-        fun verifySession()
-        fun initCrossSigning()
-    }
+    interface InteractionListener
 
     var interactionListener: InteractionListener? = null
 
@@ -72,45 +67,6 @@ class CrossSigningSettingsController @Inject constructor(
             }
         }
 
-        if (data.recoveryHasToBeSetUp) {
-            if (data.xSigningIsEnableInAccount) {
-                bottomSheetVerificationActionItem {
-                    id("setup_recovery")
-                    title(stringProvider.getString(R.string.settings_setup_secure_backup))
-                    titleColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
-                    iconRes(R.drawable.ic_arrow_right)
-                    listener {
-                        interactionListener?.setupRecovery()
-                    }
-                }
-            } else {
-                // Propose to setup cross signing
-                bottomSheetVerificationActionItem {
-                    id("setup_xSgning")
-                    title(stringProvider.getString(R.string.setup_cross_signing))
-                    titleColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
-                    subTitle(stringProvider.getString(R.string.security_prompt_text))
-                    iconRes(R.drawable.ic_arrow_right)
-                    listener {
-                        interactionListener?.initCrossSigning()
-                    }
-                }
-            }
-        }
-
-        if (data.deviceHasToBeVerified) {
-            bottomSheetVerificationActionItem {
-                id("verify")
-                title(stringProvider.getString(R.string.crosssigning_verify_this_session))
-                titleColor(colorProvider.getColor(R.color.riotx_positive_accent))
-                iconRes(R.drawable.ic_arrow_right)
-                iconColor(colorProvider.getColor(R.color.riotx_positive_accent))
-                listener {
-                    interactionListener?.verifySession()
-                }
-            }
-        }
-
         val crossSigningKeys = data.crossSigningInfo
 
         crossSigningKeys?.masterKey()?.let {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
similarity index 68%
rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
index 5778d05d1c..711819f764 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
@@ -13,22 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.crosssigning
+package im.vector.app.features.settings.crosssigning
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import javax.inject.Inject
 
+/**
+ * This Fragment is only used when user activates developer mode from the settings
+ */
 class CrossSigningSettingsFragment @Inject constructor(
         private val controller: CrossSigningSettingsController,
         val viewModelFactory: CrossSigningSettingsViewModel.Factory
@@ -42,7 +45,7 @@ class CrossSigningSettingsFragment @Inject constructor(
         super.onActivityCreated(savedInstanceState)
         viewModel.observeViewEvents {
             when (it) {
-                is CrossSigningSettingsViewEvents.Failure    -> {
+                is CrossSigningSettingsViewEvents.Failure -> {
                     AlertDialog.Builder(requireContext())
                             .setTitle(R.string.dialog_title_error)
                             .setMessage(errorFormatter.toHumanReadable(it.throwable))
@@ -50,15 +53,6 @@ class CrossSigningSettingsFragment @Inject constructor(
                             .show()
                     Unit
                 }
-                CrossSigningSettingsViewEvents.VerifySession -> {
-                    navigator.requestSelfSessionVerification(requireActivity())
-                }
-                CrossSigningSettingsViewEvents.SetUpRecovery -> {
-                    navigator.upgradeSessionSecurity(requireActivity(), false)
-                }
-                CrossSigningSettingsViewEvents.SetupCrossSigning -> {
-                    navigator.upgradeSessionSecurity(requireActivity(), true)
-                }
             }.exhaustive
         }
     }
@@ -87,16 +81,4 @@ class CrossSigningSettingsFragment @Inject constructor(
         controller.interactionListener = null
         super.onDestroyView()
     }
-
-    override fun setupRecovery() {
-        viewModel.handle(CrossSigningSettingsAction.SetUpRecovery)
-    }
-
-    override fun verifySession() {
-        viewModel.handle(CrossSigningSettingsAction.VerifySession)
-    }
-
-    override fun initCrossSigning() {
-        viewModel.handle(CrossSigningSettingsAction.SetupCrossSigning)
-    }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt
similarity index 73%
rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt
index 584116239a..b81a321f3f 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt
@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.crosssigning
+package im.vector.app.features.settings.crosssigning
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for cross signing settings screen
  */
 sealed class CrossSigningSettingsViewEvents : VectorViewEvents {
     data class Failure(val throwable: Throwable) : CrossSigningSettingsViewEvents()
-
-    object SetUpRecovery : CrossSigningSettingsViewEvents()
-    object VerifySession : CrossSigningSettingsViewEvents()
-    object SetupCrossSigning : CrossSigningSettingsViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
similarity index 66%
rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
index 29c1ed3371..3f70ac1fd7 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
@@ -13,23 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.crosssigning
+package im.vector.app.features.settings.crosssigning
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.crypto.crosssigning.isVerified
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModel
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.crypto.crosssigning.isVerified
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.rx.rx
 
 class CrossSigningSettingsViewModel @AssistedInject constructor(@Assisted private val initialState: CrossSigningSettingsViewState,
                                                                 private val session: Session)
@@ -37,10 +36,10 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(@Assisted privat
 
     init {
         Observable.combineLatest<List<DeviceInfo>, Optional<MXCrossSigningInfo>, Pair<List<DeviceInfo>, Optional<MXCrossSigningInfo>>>(
-                session.rx().liveMyDeviceInfo(),
+                session.rx().liveMyDevicesInfo(),
                 session.rx().liveCrossSigningInfo(session.myUserId),
-                BiFunction { myDeviceInfo, mxCrossSigningInfo ->
-                    (myDeviceInfo to mxCrossSigningInfo)
+                BiFunction { myDevicesInfo, mxCrossSigningInfo ->
+                    myDevicesInfo to mxCrossSigningInfo
                 }
         )
                 .execute { data ->
@@ -48,15 +47,12 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(@Assisted privat
                     val xSigningIsEnableInAccount = crossSigningKeys != null
                     val xSigningKeysAreTrusted = session.cryptoService().crossSigningService().checkUserTrust(session.myUserId).isVerified()
                     val xSigningKeyCanSign = session.cryptoService().crossSigningService().canCrossSign()
-                    val hasSeveralDevices = data.invoke()?.first?.size ?: 0 > 1
 
                     copy(
                             crossSigningInfo = crossSigningKeys,
                             xSigningIsEnableInAccount = xSigningIsEnableInAccount,
                             xSigningKeysAreTrusted = xSigningKeysAreTrusted,
-                            xSigningKeyCanSign = xSigningKeyCanSign,
-                            deviceHasToBeVerified = hasSeveralDevices && (xSigningIsEnableInAccount && !xSigningKeyCanSign),
-                            recoveryHasToBeSetUp = !session.sharedSecretStorageService.isRecoverySetup()
+                            xSigningKeyCanSign = xSigningKeyCanSign
                     )
                 }
     }
@@ -67,17 +63,9 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(@Assisted privat
     }
 
     override fun handle(action: CrossSigningSettingsAction) {
-        when (action) {
-            CrossSigningSettingsAction.SetUpRecovery -> {
-                _viewEvents.post(CrossSigningSettingsViewEvents.SetUpRecovery)
-            }
-            CrossSigningSettingsAction.VerifySession -> {
-                _viewEvents.post(CrossSigningSettingsViewEvents.VerifySession)
-            }
-            CrossSigningSettingsAction.SetupCrossSigning -> {
-                _viewEvents.post(CrossSigningSettingsViewEvents.SetupCrossSigning)
-            }
-        }.exhaustive
+        // No op for the moment
+        // when (action) {
+        // }.exhaustive
     }
 
     companion object : MvRxViewModelFactory<CrossSigningSettingsViewModel, CrossSigningSettingsViewState> {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewState.kt
similarity index 74%
rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewState.kt
rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewState.kt
index d48ee8923f..8a371ada68 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewState.kt
@@ -14,17 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.crosssigning
+package im.vector.app.features.settings.crosssigning
 
 import com.airbnb.mvrx.MvRxState
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
 
 data class CrossSigningSettingsViewState(
         val crossSigningInfo: MXCrossSigningInfo? = null,
         val xSigningIsEnableInAccount: Boolean = false,
         val xSigningKeysAreTrusted: Boolean = false,
-        val xSigningKeyCanSign: Boolean = true,
-
-        val deviceHasToBeVerified: Boolean = false,
-        val recoveryHasToBeSetUp: Boolean = false
+        val xSigningKeyCanSign: Boolean = true
 ) : MvRxState
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt
index 0f58360dbd..6025ea03b2 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devices
+package im.vector.app.features.settings.devices
 
 import android.graphics.Typeface
 import android.view.ViewGroup
@@ -23,13 +23,13 @@ import android.widget.TextView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.DimensionConverter
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.DimensionConverter
 import me.gujun.android.span.span
 import java.text.DateFormat
 import java.text.SimpleDateFormat
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
index 8e18472499..6a334898c0 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.devices
+package im.vector.app.features.settings.devices
 
 import android.os.Bundle
 import android.os.Parcelable
@@ -24,11 +24,11 @@ import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
index 02209a4cb2..6f5bd909c7 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.devices
+package im.vector.app.features.settings.devices
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -24,13 +24,13 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.rx.rx
 
 data class DeviceVerificationInfoBottomSheetViewState(
         val cryptoDeviceInfo: Async<CryptoDeviceInfo?> = Uninitialized,
@@ -81,7 +81,7 @@ class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@As
             copy(deviceInfo = Loading())
         }
 
-        session.rx().liveMyDeviceInfo()
+        session.rx().liveMyDevicesInfo()
                 .map { devices ->
                     devices.firstOrNull { it.deviceId == deviceId } ?: DeviceInfo(deviceId = deviceId)
                 }
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt
index ddec06b9a2..bae31124ed 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.devices
+package im.vector.app.features.settings.devices
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.GenericItem
-import im.vector.riotx.core.ui.list.genericFooterItem
-import im.vector.riotx.core.ui.list.genericItem
-import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericItem
+import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesAction.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt
index 854f5ea895..98fed61340 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devices
+package im.vector.app.features.settings.devices
 
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.riotx.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class DevicesAction : VectorViewModelAction {
     object Refresh : DevicesAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesController.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt
index 1b08f23996..5d0c9fb1b0 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devices
+package im.vector.app.features.settings.devices
 
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.errorWithRetryItem
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericItemHeader
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.features.settings.VectorPreferences
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericItemHeader
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.settings.VectorPreferences
 import javax.inject.Inject
 
 class DevicesController @Inject constructor(private val errorFormatter: ErrorFormatter,
@@ -111,7 +111,7 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
 //                            id("complete_security")
 //                            iconRes(R.drawable.ic_shield_warning)
 //                            text(stringProvider.getString(R.string.complete_security))
-//                            itemClickAction(DebouncedClickListener(View.OnClickListener { _ ->
+//                            buttonClickAction(DebouncedClickListener(View.OnClickListener { _ ->
 //                                callback?.completeSecurity()
 //                            }))
 //                        }
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt
index 2cbdbe9485..14a4b32be2 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt
@@ -15,12 +15,12 @@
  *
  */
 
-package im.vector.riotx.features.settings.devices
+package im.vector.app.features.settings.devices
 
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.riotx.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for Ignored users screen
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 8022b8988c..237c8c218d 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devices
+package im.vector.app.features.settings.devices
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Async
@@ -28,25 +28,25 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
-import im.vector.matrix.android.api.failure.Failure
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
-import im.vector.matrix.android.api.session.crypto.verification.VerificationService
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import org.matrix.android.sdk.internal.util.awaitCallback
+import im.vector.app.core.platform.VectorViewModel
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import io.reactivex.subjects.PublishSubject
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
@@ -103,7 +103,7 @@ class DevicesViewModel @AssistedInject constructor(
 
         Observable.combineLatest<List<CryptoDeviceInfo>, List<DeviceInfo>, List<DeviceFullInfo>>(
                 session.rx().liveUserCryptoDevices(session.myUserId),
-                session.rx().liveMyDeviceInfo(),
+                session.rx().liveMyDevicesInfo(),
                 BiFunction { cryptoList, infoList ->
                     infoList
                             .sortedByDescending { it.lastSeenTs }
@@ -113,7 +113,7 @@ class DevicesViewModel @AssistedInject constructor(
                             }
                 }
         )
-                .distinct()
+                .distinctUntilChanged()
                 .execute { async ->
                     copy(
                             devices = async
@@ -137,12 +137,14 @@ class DevicesViewModel @AssistedInject constructor(
 //                }
 
         session.rx().liveUserCryptoDevices(session.myUserId)
-                .distinct()
+                .map { it.size }
+                .distinctUntilChanged()
                 .throttleLast(5_000, TimeUnit.MILLISECONDS)
                 .subscribe {
                     // If we have a new crypto device change, we might want to trigger refresh of device info
                     session.cryptoService().fetchDevicesList(NoOpMatrixCallback())
-                }.disposeOnClear()
+                }
+                .disposeOnClear()
 
 //        session.rx().liveUserCryptoDevices(session.myUserId)
 //                .execute {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/TrustUtils.kt b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/settings/devices/TrustUtils.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
index 7f987b327b..54a81883f3 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/TrustUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devices
+package im.vector.app.features.settings.devices
 
 import androidx.annotation.DrawableRes
-import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel
-import im.vector.riotx.R
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import im.vector.app.R
 
 object TrustUtils {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/settings/devices/VectorSettingsDevicesFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
index 46ab694248..b33a0cb5d8 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devices
+package im.vector.app.features.settings.devices
 
 import android.os.Bundle
 import android.view.View
@@ -25,16 +25,16 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import im.vector.riotx.R
-import im.vector.riotx.core.dialogs.ManuallyVerifyDialog
-import im.vector.riotx.core.dialogs.PromptPasswordDialog
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.crypto.verification.VerificationBottomSheet
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+import im.vector.app.R
+import im.vector.app.core.dialogs.ManuallyVerifyDialog
+import im.vector.app.core.dialogs.PromptPasswordDialog
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import kotlinx.android.synthetic.main.merge_overlay_waiting_view.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt
index bc3a3eb13d..673c38932a 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericFooterItem
-import im.vector.riotx.core.ui.list.genericItemWithValue
-import im.vector.riotx.core.utils.DebouncedClickListener
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import im.vector.app.R
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericItemWithValue
+import im.vector.app.core.utils.DebouncedClickListener
 import javax.inject.Inject
 
 class AccountDataEpoxyController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt
index 4f9cf827cc..855c1d668f 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.internal.di.MoshiProvider
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.createJSonViewerStyleProvider
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.createJSonViewerStyleProvider
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import org.billcarsonfr.jsonviewer.JSonViewerDialog
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
index 825af6e397..4cac55cb84 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -24,12 +24,12 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.rx.rx
 
 data class AccountDataViewState(
         val accountData: Async<List<UserAccountDataEvent>> = Uninitialized
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsEpoxyController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsEpoxyController.kt
index 722115adf3..2acfff2463 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsEpoxyController.kt
@@ -14,33 +14,33 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.internal.crypto.model.event.OlmEventContent
-import im.vector.matrix.android.internal.crypto.model.event.SecretSendEventContent
-import im.vector.matrix.android.internal.crypto.model.rest.ForwardedRoomKeyContent
-import im.vector.matrix.android.internal.crypto.model.rest.GossipingToDeviceObject
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyShareRequest
-import im.vector.matrix.android.internal.crypto.model.rest.SecretShareRequest
-import im.vector.riotx.R
-import im.vector.riotx.core.date.VectorDateFormatter
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.DateProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.GenericItem
-import im.vector.riotx.core.ui.list.genericFooterItem
-import im.vector.riotx.core.ui.list.genericItem
-import im.vector.riotx.core.ui.list.genericItemHeader
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.internal.crypto.model.event.OlmEventContent
+import org.matrix.android.sdk.internal.crypto.model.event.SecretSendEventContent
+import org.matrix.android.sdk.internal.crypto.model.rest.ForwardedRoomKeyContent
+import org.matrix.android.sdk.internal.crypto.model.rest.GossipingToDeviceObject
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyShareRequest
+import org.matrix.android.sdk.internal.crypto.model.rest.SecretShareRequest
+import im.vector.app.R
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DateProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericItem
+import im.vector.app.core.ui.list.genericItemHeader
 import me.gujun.android.span.span
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
index 9489fb8506..f105a35021 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.utils.createJSonViewerStyleProvider
+import org.matrix.android.sdk.api.session.events.model.Event
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.createJSonViewerStyleProvider
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import org.billcarsonfr.jsonviewer.JSonViewerDialog
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
index 1f667d6993..7a2700abb7 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Async
@@ -27,11 +27,11 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.Event
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
 
 data class GossipingEventsPaperTrailState(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/IncomingKeyRequestListFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/IncomingKeyRequestListFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt
index 7a5b08752e..c7b95ddf78 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/IncomingKeyRequestListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestEpoxyController.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestEpoxyController.kt
index 7721b67118..5907b55b31 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestEpoxyController.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericFooterItem
-import im.vector.riotx.core.ui.list.genericItem
-import im.vector.riotx.core.ui.list.genericItemHeader
+import im.vector.app.R
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericItem
+import im.vector.app.core.ui.list.genericItemHeader
 import me.gujun.android.span.span
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestListViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestListViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt
index db4b4f7d60..3a6382a023 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Async
@@ -26,12 +26,12 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
-import im.vector.matrix.android.internal.crypto.OutgoingRoomKeyRequest
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.OutgoingRoomKeyRequest
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
 
 data class KeyRequestListViewState(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt
index 76174558b5..08016c66ac 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import android.os.Bundle
 import android.view.View
@@ -23,9 +23,9 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import androidx.viewpager2.widget.ViewPager2.SCROLL_STATE_IDLE
 import com.google.android.material.tabs.TabLayoutMediator
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_devtool_keyrequests.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/OutgoingKeyRequestListFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/OutgoingKeyRequestListFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt
index 658497c23d..60e73fb74d 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/OutgoingKeyRequestListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.devtools
+package im.vector.app.features.settings.devtools
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.ColorProvider
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersController.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersController.kt
rename to vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
index 5f4158b542..2a2fb21a7d 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.ignored
+package im.vector.app.features.settings.ignored
 
 import com.airbnb.epoxy.EpoxyController
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.noResultItem
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.AvatarRenderer
 import javax.inject.Inject
 
 class IgnoredUsersController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewEvents.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewEvents.kt
index 3b98159d1a..2b2c3eb49d 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewEvents.kt
@@ -15,9 +15,9 @@
  *
  */
 
-package im.vector.riotx.features.settings.ignored
+package im.vector.app.features.settings.ignored
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for Ignored users screen
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
index e9c02618b0..cc5c8b436c 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.ignored
+package im.vector.app.features.settings.ignored
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
@@ -27,12 +27,12 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.user.model.User
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.rx.rx
 
 data class IgnoredUsersViewState(
         val ignoredUsers: List<User> = emptyList(),
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/UserItem.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/UserItem.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/settings/ignored/UserItem.kt
rename to vector/src/main/java/im/vector/app/features/settings/ignored/UserItem.kt
index 7182dd0bda..3349acef10 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/UserItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/UserItem.kt
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.ignored
+package im.vector.app.features.settings.ignored
 
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.home.AvatarRenderer
 
 /**
  * A list item for User.
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
index c211d14edc..2588eef59b 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.ignored
+package im.vector.app.features.settings.ignored
 
 import android.os.Bundle
 import android.view.View
@@ -24,12 +24,12 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import kotlinx.android.synthetic.main.merge_overlay_waiting_view.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocaleItem.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocaleItem.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocaleItem.kt
rename to vector/src/main/java/im/vector/app/features/settings/locale/LocaleItem.kt
index 18c5cb2aae..7462200197 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocaleItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocaleItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.locale
+package im.vector.app.features.settings.locale
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.ClickListener
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.epoxy.onClick
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_locale)
 abstract class LocaleItem : VectorEpoxyModel<LocaleItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerAction.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerAction.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerAction.kt
rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerAction.kt
index 0bfc203159..4d55dfd2f7 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.locale
+package im.vector.app.features.settings.locale
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 import java.util.Locale
 
 sealed class LocalePickerAction : VectorViewModelAction {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerController.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerController.kt
rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
index 5e6704818f..9654eb2190 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.locale
+package im.vector.app.features.settings.locale
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.epoxy.noResultItem
-import im.vector.riotx.core.epoxy.profiles.profileSectionItem
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.VectorLocale
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.epoxy.profiles.profileSectionItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorPreferences
 import java.util.Locale
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerFragment.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt
index 75d758aafa..e156528d3d 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.locale
+package im.vector.app.features.settings.locale
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.restart
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.restart
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_locale_picker.*
 import java.util.Locale
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewEvents.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewEvents.kt
index e007f5f036..1a2cdcfaec 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.locale
+package im.vector.app.features.settings.locale
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class LocalePickerViewEvents : VectorViewEvents {
     object RestartActivity : LocalePickerViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt
index e4cc64733c..fd20007c99 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.locale
+package im.vector.app.features.settings.locale
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
@@ -24,9 +24,9 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.settings.VectorLocale
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.settings.VectorLocale
 import kotlinx.coroutines.launch
 
 class LocalePickerViewModel @AssistedInject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewState.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewState.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewState.kt
rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewState.kt
index 416350d827..64c95468f0 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewState.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.locale
+package im.vector.app.features.settings.locale
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.riotx.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorLocale
 import java.util.Locale
 
 data class LocalePickerViewState(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/SystemLocaleProvider.kt b/vector/src/main/java/im/vector/app/features/settings/locale/SystemLocaleProvider.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/settings/locale/SystemLocaleProvider.kt
rename to vector/src/main/java/im/vector/app/features/settings/locale/SystemLocaleProvider.kt
index d3265f3179..03d3b0623a 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/locale/SystemLocaleProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/SystemLocaleProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.locale
+package im.vector.app.features.settings.locale
 
 import android.content.Context
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGateWayController.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushGateWayController.kt
rename to vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt
index d8d23fbaf4..2d111e4424 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGateWayController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.push
+package im.vector.app.features.settings.push
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericFooterItem
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
 import javax.inject.Inject
 
 class PushGateWayController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayAction.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayAction.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayAction.kt
rename to vector/src/main/java/im/vector/app/features/settings/push/PushGatewayAction.kt
index ab79d2e23b..566a068a7d 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.push
+package im.vector.app.features.settings.push
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class PushGatewayAction : VectorViewModelAction {
     object Refresh : PushGatewayAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt
rename to vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
index 6873330271..266bcc39c6 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.push
+package im.vector.app.features.settings.push
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.matrix.android.api.session.pushers.Pusher
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import org.matrix.android.sdk.api.session.pushers.Pusher
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
 
 @EpoxyModelClass(layout = R.layout.item_pushgateway)
 abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
index 92f1c9ce72..e6e9ce3753 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.push
+package im.vector.app.features.settings.push
 
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
index 8b1a551c13..b1b2c43f4e 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.push
+package im.vector.app.features.settings.push
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -24,12 +24,12 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.pushers.Pusher
-import im.vector.matrix.rx.RxSession
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.pushers.Pusher
+import org.matrix.android.sdk.rx.RxSession
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
 
 data class PushGatewayViewState(
         val pushGateways: Async<List<Pusher>> = Uninitialized
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt
rename to vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
index b00159d1e2..9799b32c38 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.settings.push
+package im.vector.app.features.settings.push
 
 import android.annotation.SuppressLint
 import android.graphics.Color
@@ -26,11 +26,11 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.matrix.android.api.pushrules.getActions
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.features.notifications.toNotificationAction
+import org.matrix.android.sdk.api.pushrules.getActions
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.features.notifications.toNotificationAction
 
 @EpoxyModelClass(layout = R.layout.item_pushrule_raw)
 abstract class PushRuleItem : EpoxyModelWithHolder<PushRuleItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt
rename to vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt
index bee9cf54d9..44cb5d8ea2 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.push
+package im.vector.app.features.settings.push
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericFooterItem
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 
 // Referenced in vector_settings_notifications.xml
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt
rename to vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt
index 43854af666..ce42cbb12f 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.push
+package im.vector.app.features.settings.push
 
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
-import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.riotx.core.di.HasScreenInjector
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import im.vector.app.core.di.HasScreenInjector
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
 
 data class PushRulesViewState(
         val rules: List<PushRule> = emptyList()
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
index a650702bcb..1ccd7b6735 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.troubleshoot
+package im.vector.app.features.settings.troubleshoot
 
-import android.os.Build
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -27,8 +26,8 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.features.themes.ThemeUtils
 
 class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<TroubleshootTest>)
     : RecyclerView.Adapter<NotificationTroubleshootRecyclerViewAdapter.ViewHolder>() {
@@ -87,9 +86,7 @@ class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<Troublesh
                     statusIconImage.visibility = View.VISIBLE
                     statusIconImage.setImageResource(R.drawable.unit_test_ko)
 
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        statusIconImage.imageTintList = null
-                    }
+                    statusIconImage.imageTintList = null
 
                     descriptionText.setTextColor(ContextCompat.getColor(context, R.color.riotx_notice))
                 }
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
index a0a54a8e82..92e8eecb4d 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.troubleshoot
+package im.vector.app.features.settings.troubleshoot
 
 import android.os.Handler
 import android.os.Looper
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt
rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
index d89bd15e14..df1ff80b31 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.troubleshoot
+package im.vector.app.features.settings.troubleshoot
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.pushrules.RuleIds
-import im.vector.matrix.android.api.pushrules.RuleKind
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.resources.StringProvider
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.pushrules.RuleKind
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.resources.StringProvider
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt
rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
index 8344211a2c..61c2fb120e 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.troubleshoot
+package im.vector.app.features.settings.troubleshoot
 
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.VectorPreferences
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestPushRulesSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestPushRulesSettings.kt
rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
index bbdf8fa62c..22b2331449 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestPushRulesSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.troubleshoot
+package im.vector.app.features.settings.troubleshoot
 
-import im.vector.matrix.android.api.pushrules.RuleIds
-import im.vector.matrix.android.api.pushrules.getActions
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.notifications.toNotificationAction
+import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.pushrules.getActions
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.notifications.toNotificationAction
 import javax.inject.Inject
 
 class TestPushRulesSettings @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt
rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
index 1c01d3ee73..92eae017f9 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.troubleshoot
+package im.vector.app.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.NotificationManagerCompat
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.startNotificationSettingsIntent
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.startNotificationSettingsIntent
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt
rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
index 6d2c1b09dd..7abec31ae4 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.settings.troubleshoot
+package im.vector.app.features.settings.troubleshoot
 
 import androidx.annotation.StringRes
 import kotlin.properties.Delegates
diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareAction.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareAction.kt
rename to vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt
index 0379c4980f..eef4e32dff 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareAction.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.share
+package im.vector.app.features.share
 
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class IncomingShareAction : VectorViewModelAction {
     data class SelectRoom(val roomSummary: RoomSummary, val enableMultiSelect: Boolean) : IncomingShareAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt
rename to vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt
index 5948ea089d..3977dfb990 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.share
+package im.vector.app.features.share
 
 import androidx.appcompat.widget.Toolbar
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
 
 class IncomingShareActivity : VectorBaseActivity(), ToolbarConfigurable {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareController.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareController.kt
rename to vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
index 4e7f585458..912f4c50d7 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareController.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.share
+package im.vector.app.features.share
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Incomplete
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.epoxy.noResultItem
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.room.list.RoomSummaryItemFactory
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import im.vector.app.R
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.room.list.RoomSummaryItemFactory
 import javax.inject.Inject
 
 class IncomingShareController @Inject constructor(private val roomSummaryItemFactory: RoomSummaryItemFactory,
diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareFragment.kt
rename to vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
index aa665b5653..b1fc96605e 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.share
+package im.vector.app.features.share
 
 import android.app.Activity
 import android.content.ClipDescription
@@ -28,22 +28,22 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_WRITING_FILES
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_PICK_ATTACHMENT
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.features.attachments.AttachmentsHelper
-import im.vector.riotx.features.attachments.preview.AttachmentsPreviewActivity
-import im.vector.riotx.features.attachments.preview.AttachmentsPreviewArgs
-import im.vector.riotx.features.login.LoginActivity
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_PICK_ATTACHMENT
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.features.attachments.AttachmentsHelper
+import im.vector.app.features.attachments.preview.AttachmentsPreviewActivity
+import im.vector.app.features.attachments.preview.AttachmentsPreviewArgs
+import im.vector.app.features.login.LoginActivity
 import kotlinx.android.synthetic.main.fragment_incoming_share.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewEvents.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt
similarity index 81%
rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt
index 2940a1e750..8b42384ec6 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.share
+package im.vector.app.features.share
 
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotx.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class IncomingShareViewEvents : VectorViewEvents {
     data class ShareToRoom(val roomSummary: RoomSummary,
diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewModel.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewModel.kt
rename to vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
index c135460ee4..aa4d8ad03e 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.share
+package im.vector.app.features.share
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
@@ -22,18 +22,18 @@ import com.airbnb.mvrx.ViewModelContext
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.roomSummaryQueryParams
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.toggle
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.attachments.isPreviewable
-import im.vector.riotx.features.attachments.toGroupedContentAttachmentData
-import im.vector.riotx.features.home.room.list.BreadcrumbsRoomComparator
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.toggle
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.attachments.isPreviewable
+import im.vector.app.features.attachments.toGroupedContentAttachmentData
+import im.vector.app.features.home.room.list.BreadcrumbsRoomComparator
+import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
 
 class IncomingShareViewModel @AssistedInject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewState.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewState.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewState.kt
rename to vector/src/main/java/im/vector/app/features/share/IncomingShareViewState.kt
index 71b416ef7e..751dc999a2 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewState.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.share
+package im.vector.app.features.share
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 data class IncomingShareViewState(
         val sharedData: SharedData? = null,
diff --git a/vector/src/main/java/im/vector/riotx/features/share/SharedData.kt b/vector/src/main/java/im/vector/app/features/share/SharedData.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/share/SharedData.kt
rename to vector/src/main/java/im/vector/app/features/share/SharedData.kt
index 741d7b0eb3..56932d45ab 100644
--- a/vector/src/main/java/im/vector/riotx/features/share/SharedData.kt
+++ b/vector/src/main/java/im/vector/app/features/share/SharedData.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.share
+package im.vector.app.features.share
 
 import android.os.Parcelable
-import im.vector.matrix.android.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import kotlinx.android.parcel.Parcelize
 
 sealed class SharedData: Parcelable {
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/hard/SignedOutActivity.kt b/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotx/features/signout/hard/SignedOutActivity.kt
rename to vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt
index f3d81c8010..03fafe1e47 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/hard/SignedOutActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.hard
+package im.vector.app.features.signout.hard
 
 import android.content.Context
 import android.content.Intent
 import butterknife.OnClick
-import im.vector.matrix.android.api.failure.GlobalError
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.MainActivity
-import im.vector.riotx.features.MainActivityArgs
+import org.matrix.android.sdk.api.failure.GlobalError
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutAction.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutAction.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutAction.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutAction.kt
index 5916c59c55..b9f485ebbc 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutAction.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutAction.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft
+package im.vector.app.features.signout.soft
 
-import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.riotx.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.auth.data.Credentials
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class SoftLogoutAction : VectorViewModelAction {
     // In case of failure to get the login flow
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
index 88ddc85ac1..8a1c14f4f6 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft
+package im.vector.app.features.signout.soft
 
 import android.content.Context
 import android.content.Intent
@@ -23,15 +23,15 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.viewModel
-import im.vector.matrix.android.api.failure.GlobalError
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.features.MainActivity
-import im.vector.riotx.features.MainActivityArgs
-import im.vector.riotx.features.login.LoginActivity
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
+import im.vector.app.features.login.LoginActivity
 import kotlinx.android.synthetic.main.activity_login.*
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
index fc428cf0ac..b6f4e13a91 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft
+package im.vector.app.features.signout.soft
 
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.extensions.toReducedUrl
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.login.LoginMode
-import im.vector.riotx.features.signout.soft.epoxy.loginCenterButtonItem
-import im.vector.riotx.features.signout.soft.epoxy.loginErrorWithRetryItem
-import im.vector.riotx.features.signout.soft.epoxy.loginPasswordFormItem
-import im.vector.riotx.features.signout.soft.epoxy.loginRedButtonItem
-import im.vector.riotx.features.signout.soft.epoxy.loginTextItem
-import im.vector.riotx.features.signout.soft.epoxy.loginTitleItem
-import im.vector.riotx.features.signout.soft.epoxy.loginTitleSmallItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.toReducedUrl
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.login.LoginMode
+import im.vector.app.features.signout.soft.epoxy.loginCenterButtonItem
+import im.vector.app.features.signout.soft.epoxy.loginErrorWithRetryItem
+import im.vector.app.features.signout.soft.epoxy.loginPasswordFormItem
+import im.vector.app.features.signout.soft.epoxy.loginRedButtonItem
+import im.vector.app.features.signout.soft.epoxy.loginTextItem
+import im.vector.app.features.signout.soft.epoxy.loginTitleItem
+import im.vector.app.features.signout.soft.epoxy.loginTitleSmallItem
 import javax.inject.Inject
 
 class SoftLogoutController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
index fadcaa8055..64b71356ec 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft
+package im.vector.app.features.signout.soft
 
 import android.content.DialogInterface
 import android.os.Bundle
@@ -22,15 +22,15 @@ import android.view.View
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.dialogs.withColoredButton
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.features.login.AbstractLoginFragment
-import im.vector.riotx.features.login.LoginAction
-import im.vector.riotx.features.login.LoginMode
-import im.vector.riotx.features.login.LoginViewEvents
+import im.vector.app.R
+import im.vector.app.core.dialogs.withColoredButton
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.features.login.AbstractLoginFragment
+import im.vector.app.features.login.LoginAction
+import im.vector.app.features.login.LoginMode
+import im.vector.app.features.login.LoginViewEvents
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewEvents.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewEvents.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewEvents.kt
index 314d6b0747..df4d556a48 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewEvents.kt
@@ -15,9 +15,9 @@
  *
  */
 
-package im.vector.riotx.features.signout.soft
+package im.vector.app.features.signout.soft
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for SoftLogout
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewModel.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewModel.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
index b1d5cb85c1..94caf70a11 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft
+package im.vector.app.features.signout.soft
 
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.Fail
@@ -25,16 +25,16 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.auth.AuthenticationService
-import im.vector.matrix.android.api.auth.data.LoginFlowResult
-import im.vector.matrix.android.api.auth.data.LoginFlowTypes
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.util.Cancelable
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.extensions.hasUnsavedKeys
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.login.LoginMode
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.auth.data.LoginFlowResult
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.Cancelable
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.hasUnsavedKeys
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.login.LoginMode
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewState.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewState.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewState.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewState.kt
index 775558499b..50b576e920 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewState.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft
+package im.vector.app.features.signout.soft
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.riotx.features.login.LoginMode
+import im.vector.app.features.login.LoginMode
 
 data class SoftLogoutViewState(
         val asyncHomeServerLoginFlowRequest: Async<LoginMode> = Uninitialized,
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginCenterButtonItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginCenterButtonItem.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginCenterButtonItem.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginCenterButtonItem.kt
index d73955787c..a0e409ed02 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginCenterButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginCenterButtonItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft.epoxy
+package im.vector.app.features.signout.soft.epoxy
 
 import android.widget.Button
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_login_centered_button)
 abstract class LoginCenterButtonItem : VectorEpoxyModel<LoginCenterButtonItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt
index 593695bbd6..47d4617271 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft.epoxy
+package im.vector.app.features.signout.soft.epoxy
 
 import android.widget.Button
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass(layout = R.layout.item_login_error_retry)
 abstract class LoginErrorWithRetryItem : VectorEpoxyModel<LoginErrorWithRetryItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt
index 17eee6b378..32f296385f 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft.epoxy
+package im.vector.app.features.signout.soft.epoxy
 
 import android.os.Build
 import android.text.Editable
@@ -25,12 +25,12 @@ import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.showPassword
-import im.vector.riotx.core.platform.SimpleTextWatcher
-import im.vector.riotx.core.resources.StringProvider
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.showPassword
+import im.vector.app.core.platform.SimpleTextWatcher
+import im.vector.app.core.resources.StringProvider
 
 @EpoxyModelClass(layout = R.layout.item_login_password_form)
 abstract class LoginPasswordFormItem : VectorEpoxyModel<LoginPasswordFormItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginRedButtonItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginRedButtonItem.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginRedButtonItem.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginRedButtonItem.kt
index 142d6efea1..7a9f6eea6e 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginRedButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginRedButtonItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft.epoxy
+package im.vector.app.features.signout.soft.epoxy
 
 import android.widget.Button
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_login_red_button)
 abstract class LoginRedButtonItem : VectorEpoxyModel<LoginRedButtonItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTextItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTextItem.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTextItem.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTextItem.kt
index 28aa70922b..f2727379ab 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTextItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft.epoxy
+package im.vector.app.features.signout.soft.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_login_text)
 abstract class LoginTextItem : VectorEpoxyModel<LoginTextItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleItem.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleItem.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleItem.kt
index 8b30be6a56..dcb565b490 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleItem.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft.epoxy
+package im.vector.app.features.signout.soft.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_login_title)
 abstract class LoginTitleItem : VectorEpoxyModel<LoginTitleItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleSmallItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleSmallItem.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleSmallItem.kt
rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleSmallItem.kt
index 572eb09ee8..04f5ca0a78 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleSmallItem.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleSmallItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.signout.soft.epoxy
+package im.vector.app.features.signout.soft.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_login_title_small)
 abstract class LoginTitleSmallItem : VectorEpoxyModel<LoginTitleSmallItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/sync/widget/SyncStateView.kt b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/sync/widget/SyncStateView.kt
rename to vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
index fa392a10ad..6a524dba5d 100755
--- a/vector/src/main/java/im/vector/riotx/features/sync/widget/SyncStateView.kt
+++ b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.sync.widget
+package im.vector.app.features.sync.widget
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
 import androidx.core.view.isVisible
-import im.vector.matrix.android.api.session.sync.SyncState
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.isAirplaneModeOn
+import org.matrix.android.sdk.api.session.sync.SyncState
+import im.vector.app.R
+import im.vector.app.core.utils.isAirplaneModeOn
 import kotlinx.android.synthetic.main.view_sync_state.view.*
 
 class SyncStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsAction.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsAction.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsAction.kt
rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsAction.kt
index 852a4c3301..d3d14e4d80 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.terms
+package im.vector.app.features.terms
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class ReviewTermsAction : VectorViewModelAction {
     data class LoadTerms(val preferredLanguageCode: String) : ReviewTermsAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsActivity.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsActivity.kt
rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
index dd7e742bd2..4fea176249 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.terms
+package im.vector.app.features.terms
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.viewModel
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.replaceFragment
-import im.vector.riotx.core.platform.SimpleFragmentActivity
+import org.matrix.android.sdk.api.session.terms.TermsService
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.core.platform.SimpleFragmentActivity
 import javax.inject.Inject
 
 class ReviewTermsActivity : SimpleFragmentActivity() {
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsFragment.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsFragment.kt
rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt
index 0adfa049fe..9f7b6cdeb0 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.terms
+package im.vector.app.features.terms
 
 import android.os.Bundle
 import android.view.View
@@ -22,15 +22,15 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.onClick
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.openUrlInChromeCustomTab
+import org.matrix.android.sdk.api.session.terms.TermsService
+import im.vector.app.R
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.openUrlInChromeCustomTab
 import kotlinx.android.synthetic.main.fragment_review_terms.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewEvents.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewEvents.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewEvents.kt
index e10966ce92..c65045a8c8 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.terms
+package im.vector.app.features.terms
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class ReviewTermsViewEvents : VectorViewEvents {
     data class Loading(val message: CharSequence? = null) : ReviewTermsViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewModel.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewModel.kt
rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
index e19b8e7675..6458646643 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.terms
+package im.vector.app.features.terms
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
@@ -24,11 +24,11 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.terms.GetTermsResponse
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.terms.GetTermsResponse
+import org.matrix.android.sdk.internal.util.awaitCallback
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewState.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewState.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewState.kt
rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewState.kt
index 9583a8f5de..20b09f0cd7 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.terms
+package im.vector.app.features.terms
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ServiceTermsArgs.kt b/vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/terms/ServiceTermsArgs.kt
rename to vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt
index 663b1a9050..ec97c98627 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/ServiceTermsArgs.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.terms
+package im.vector.app.features.terms
 
 import android.os.Parcelable
-import im.vector.matrix.android.api.session.terms.TermsService
+import org.matrix.android.sdk.api.session.terms.TermsService
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/Term.kt b/vector/src/main/java/im/vector/app/features/terms/Term.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/terms/Term.kt
rename to vector/src/main/java/im/vector/app/features/terms/Term.kt
index 29fae43c64..e54a7f70aa 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/Term.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/Term.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.terms
+package im.vector.app.features.terms
 
 data class Term(
         val url: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/TermItem.kt b/vector/src/main/java/im/vector/app/features/terms/TermItem.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/terms/TermItem.kt
rename to vector/src/main/java/im/vector/app/features/terms/TermItem.kt
index 91be50d2b8..87b54adc14 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/TermItem.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/TermItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.terms
+package im.vector.app.features.terms
 
 import android.view.View
 import android.widget.CheckBox
@@ -23,8 +23,8 @@ import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
 
 @EpoxyModelClass(layout = R.layout.item_tos)
 abstract class TermItem : EpoxyModelWithHolder<TermItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/TermsController.kt b/vector/src/main/java/im/vector/app/features/terms/TermsController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotx/features/terms/TermsController.kt
rename to vector/src/main/java/im/vector/app/features/terms/TermsController.kt
index a5518b5f15..0b0088e05e 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/TermsController.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/TermsController.kt
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.terms
+package im.vector.app.features.terms
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.errorWithRetryItem
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.features.discovery.settingsSectionTitleItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.features.discovery.settingsSectionTitleItem
 import javax.inject.Inject
 
 class TermsController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt
rename to vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
index b29e60784e..3aba6a4dad 100644
--- a/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.themes
+package im.vector.app.features.themes
 
 import androidx.annotation.StyleRes
-import im.vector.riotx.R
+import im.vector.app.R
 
 /**
  * Class to manage Activity other possible themes.
diff --git a/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
similarity index 76%
rename from vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
rename to vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index 35f7e37f41..ef806b55b4 100644
--- a/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.themes
+package im.vector.app.features.themes
 
 import android.app.Activity
 import android.content.Context
@@ -26,7 +26,7 @@ import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.preference.PreferenceManager
-import im.vector.riotx.R
+import im.vector.app.R
 import timber.log.Timber
 
 /**
@@ -164,50 +164,6 @@ object ThemeUtils {
         return null
     }
 
-    /**
-     * Get the resource Id applied to the current theme
-     *
-     * @param c          the context
-     * @param resourceId the resource id in the light theme
-     * @return the resource Id for the current theme
-     */
-    // TODO Now that we are API 21, this is not necessary anymore
-    fun getResourceId(c: Context, resourceId: Int): Int {
-        val theme = getApplicationTheme(c)
-
-        return when (theme) {
-            THEME_LIGHT_VALUE -> resourceId
-            THEME_DARK_VALUE  -> {
-                return when (resourceId) {
-                    R.drawable.bg_search_edit_text_light     -> R.drawable.bg_search_edit_text_dark
-                    R.drawable.bg_unread_notification_light  -> R.drawable.bg_unread_notification_dark
-                    R.drawable.vector_label_background_light -> R.drawable.vector_label_background_dark
-                    R.drawable.divider_horizontal_light      -> R.drawable.divider_horizontal_dark
-                    else                                     -> {
-                        Timber.w("Warning, missing case for wanted drawable in dark theme")
-                        resourceId
-                    }
-                }
-            }
-            THEME_BLACK_VALUE -> {
-                return when (resourceId) {
-                    R.drawable.bg_search_edit_text_light     -> R.drawable.bg_search_edit_text_black
-                    R.drawable.bg_unread_notification_light  -> R.drawable.bg_unread_notification_black
-                    R.drawable.vector_label_background_light -> R.drawable.vector_label_background_black
-                    R.drawable.divider_horizontal_light      -> R.drawable.divider_horizontal_black
-                    else                                     -> {
-                        Timber.w("Warning, missing case for wanted drawable in black theme")
-                        resourceId
-                    }
-                }
-            }
-            else              -> {
-                Timber.w("Warning, missing theme: $theme")
-                resourceId
-            }
-        }
-    }
-
     /**
      * Update the menu icons colors
      *
diff --git a/vector/src/main/java/im/vector/riotx/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/ui/SharedPreferencesUiStateRepository.kt
rename to vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
index ec1f8e5131..d550329189 100644
--- a/vector/src/main/java/im/vector/riotx/features/ui/SharedPreferencesUiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.ui
+package im.vector.app.features.ui
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import im.vector.riotx.features.home.RoomListDisplayMode
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.features.settings.VectorPreferences
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotx/features/ui/UiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/ui/UiStateRepository.kt
rename to vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
index c3ecd456e5..3223bf6028 100644
--- a/vector/src/main/java/im/vector/riotx/features/ui/UiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.ui
+package im.vector.app.features.ui
 
-import im.vector.riotx.features.home.RoomListDisplayMode
+import im.vector.app.features.home.RoomListDisplayMode
 
 /**
  * This interface is used to persist UI state across application restart
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/DirectoryUsersController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/DirectoryUsersController.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/DirectoryUsersController.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/DirectoryUsersController.kt
index d5fc34728a..1ade177010 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/DirectoryUsersController.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/DirectoryUsersController.kt
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.MatrixPatterns
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.errorWithRetryItem
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.epoxy.noResultItem
-import im.vector.riotx.core.error.ErrorFormatter
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.AvatarRenderer
 import javax.inject.Inject
 
 class DirectoryUsersController @Inject constructor(private val session: Session,
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersController.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersController.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersController.kt
index c78368f01b..f0bd4e67cf 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersController.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersController.kt
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.paging.PagedListEpoxyController
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.EmptyItem_
-import im.vector.riotx.core.epoxy.loadingItem
-import im.vector.riotx.core.epoxy.noResultItem
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.createUIHandler
-import im.vector.riotx.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.EmptyItem_
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.createUIHandler
+import im.vector.app.features.home.AvatarRenderer
 import javax.inject.Inject
 
 class KnownUsersController @Inject constructor(private val session: Session,
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragment.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragment.kt
index e4f08758b2..07c77bfdd4 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
 import android.os.Bundle
 import android.view.Menu
@@ -29,15 +29,15 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.chip.Chip
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.setupAsSearch
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.DimensionConverter
-import im.vector.riotx.features.homeserver.HomeServerCapabilitiesViewModel
+import org.matrix.android.sdk.api.session.user.model.User
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.setupAsSearch
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.homeserver.HomeServerCapabilitiesViewModel
 import kotlinx.android.synthetic.main.fragment_known_users.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragmentArgs.kt b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragmentArgs.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragmentArgs.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragmentArgs.kt
index 9e87633608..65fd6681bf 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragmentArgs.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragmentArgs.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/PendingInvitee.kt b/vector/src/main/java/im/vector/app/features/userdirectory/PendingInvitee.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/PendingInvitee.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/PendingInvitee.kt
index c9aad1cf65..f7213497fa 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/PendingInvitee.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/PendingInvitee.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
-import im.vector.matrix.android.api.session.identity.ThreePid
-import im.vector.matrix.android.api.session.user.model.User
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.user.model.User
 
 sealed class PendingInvitee {
     data class UserPendingInvitee(val user: User) : PendingInvitee()
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryAction.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryAction.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryAction.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryAction.kt
index fde71cff5c..f4f3fb8cd4 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryAction.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class UserDirectoryAction : VectorViewModelAction {
     data class FilterKnownUsers(val value: String) : UserDirectoryAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryFragment.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryFragment.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryFragment.kt
index a6d22dfbe3..f2e090d966 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryFragment.kt
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.textChanges
-import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.setupAsSearch
-import im.vector.riotx.core.extensions.showKeyboard
-import im.vector.riotx.core.platform.VectorBaseFragment
+import org.matrix.android.sdk.api.session.user.model.User
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.setupAsSearch
+import im.vector.app.core.extensions.showKeyboard
+import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_create_direct_room_directory_users.recyclerView
 import kotlinx.android.synthetic.main.fragment_user_directory.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryLetterHeaderItem.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryLetterHeaderItem.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryLetterHeaderItem.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryLetterHeaderItem.kt
index 5fa490b0d7..63f68a1f8b 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryLetterHeaderItem.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryLetterHeaderItem.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass(layout = R.layout.item_user_directory_letter_header)
 abstract class UserDirectoryLetterHeaderItem : VectorEpoxyModel<UserDirectoryLetterHeaderItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedAction.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedAction.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedAction.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedAction.kt
index 14270f31a7..a4ae0d1be2 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
-import im.vector.riotx.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedAction
 
 sealed class UserDirectorySharedAction : VectorSharedAction {
     object OpenUsersDirectory : UserDirectorySharedAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedActionViewModel.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedActionViewModel.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedActionViewModel.kt
index e7081ea969..b63682e57a 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedActionViewModel.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
-import im.vector.riotx.core.platform.VectorSharedActionViewModel
+import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 class UserDirectorySharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<UserDirectorySharedAction>()
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryUserItem.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryUserItem.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
index 86d240eb02..c78dc7518d 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryUserItem.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
 import android.view.View
 import android.widget.ImageView
@@ -23,11 +23,11 @@ import androidx.core.content.ContextCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.amulyakhare.textdrawable.TextDrawable
-import im.vector.matrix.android.api.util.MatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_known_user)
 abstract class UserDirectoryUserItem : VectorEpoxyModel<UserDirectoryUserItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewEvents.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewEvents.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewEvents.kt
index 435fce8b16..bfbdc657ef 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for invite users to room screen
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewModel.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewModel.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewModel.kt
index 57ebe408c7..fb84daecee 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
 import androidx.fragment.app.FragmentActivity
 import arrow.core.Option
@@ -25,16 +25,16 @@ import com.airbnb.mvrx.ViewModelContext
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.extensions.toggle
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.features.createdirect.CreateDirectRoomActivity
-import im.vector.riotx.features.invite.InviteUsersToRoomActivity
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.toggle
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.createdirect.CreateDirectRoomActivity
+import im.vector.app.features.invite.InviteUsersToRoomActivity
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
 
 private typealias KnowUsersFilter = String
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewState.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewState.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewState.kt
rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewState.kt
index 4d99a75fde..8bb555e0fa 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewState.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.userdirectory
+package im.vector.app.features.userdirectory
 
 import androidx.paging.PagedList
 import arrow.core.Option
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.user.model.User
+import org.matrix.android.sdk.api.session.user.model.User
 
 data class UserDirectoryViewState(
         val excludedUserIds: Set<String>? = null,
diff --git a/vector/src/main/java/im/vector/riotx/features/version/VersionProvider.kt b/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/version/VersionProvider.kt
rename to vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
index c751c018d0..96a7d917e5 100644
--- a/vector/src/main/java/im/vector/riotx/features/version/VersionProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.version
+package im.vector.app.features.version
 
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.core.resources.VersionCodeProvider
+import im.vector.app.BuildConfig
+import im.vector.app.core.resources.VersionCodeProvider
 import javax.inject.Inject
 
 class VersionProvider @Inject constructor(private val versionCodeProvider: VersionCodeProvider) {
diff --git a/vector/src/main/java/im/vector/riotx/features/webview/ConsentWebViewEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/webview/ConsentWebViewEventListener.kt
rename to vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
index 4ecd7e30e4..7ac6a3344b 100644
--- a/vector/src/main/java/im/vector/riotx/features/webview/ConsentWebViewEventListener.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.webview
+package im.vector.app.features.webview
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.utils.weak
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.weak
 import timber.log.Timber
 
 private const val SUCCESS_URL_SUFFIX = "/_matrix/consent"
diff --git a/vector/src/main/java/im/vector/riotx/features/webview/DefaultWebViewEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/DefaultWebViewEventListener.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/webview/DefaultWebViewEventListener.kt
rename to vector/src/main/java/im/vector/app/features/webview/DefaultWebViewEventListener.kt
index b3e3389d5c..ae5805fc47 100644
--- a/vector/src/main/java/im/vector/riotx/features/webview/DefaultWebViewEventListener.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/DefaultWebViewEventListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.webview
+package im.vector.app.features.webview
 
 import timber.log.Timber
 
diff --git a/vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewActivity.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewActivity.kt
rename to vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
index d42746ade9..e49109b1d6 100644
--- a/vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
@@ -14,18 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.webview
+package im.vector.app.features.webview
 
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.annotation.CallSuper
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.platform.VectorBaseActivity
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.platform.VectorBaseActivity
 import kotlinx.android.synthetic.main.activity_vector_web_view.*
 import javax.inject.Inject
 
@@ -70,10 +69,8 @@ class VectorWebViewActivity : VectorBaseActivity() {
             displayZoomControls = false
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val cookieManager = android.webkit.CookieManager.getInstance()
-            cookieManager.setAcceptThirdPartyCookies(simple_webview, true)
-        }
+        val cookieManager = android.webkit.CookieManager.getInstance()
+        cookieManager.setAcceptThirdPartyCookies(simple_webview, true)
 
         val url = intent.extras?.getString(EXTRA_URL)
         val title = intent.extras?.getString(EXTRA_TITLE, USE_TITLE_FROM_WEB_PAGE)
diff --git a/vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewClient.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewClient.kt
rename to vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt
index 3ffbe8c949..597486491c 100644
--- a/vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewClient.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt
@@ -16,7 +16,7 @@
 
 @file:Suppress("DEPRECATION")
 
-package im.vector.riotx.features.webview
+package im.vector.app.features.webview
 
 import android.annotation.TargetApi
 import android.graphics.Bitmap
@@ -26,7 +26,6 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import androidx.annotation.RequiresApi
 
 /**
  * This class inherits from WebViewClient. It has to be used with a WebView.
@@ -58,7 +57,6 @@ class VectorWebViewClient(private val eventListener: WebViewEventListener) : Web
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     override fun onReceivedHttpError(view: WebView, request: WebResourceRequest, errorResponse: WebResourceResponse) {
         super.onReceivedHttpError(view, request, errorResponse)
         eventListener.onHttpError(request.url.toString(),
diff --git a/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/WebViewEventListener.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListener.kt
rename to vector/src/main/java/im/vector/app/features/webview/WebViewEventListener.kt
index 92d9fedf94..897c913257 100644
--- a/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListener.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/WebViewEventListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.webview
+package im.vector.app.features.webview
 
 interface WebViewEventListener {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListenerFactory.kt b/vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListenerFactory.kt
rename to vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt
index 23e52fe910..412f2e5033 100644
--- a/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListenerFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.webview
+package im.vector.app.features.webview
 
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.core.platform.VectorBaseActivity
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.core.platform.VectorBaseActivity
 
 interface WebViewEventListenerFactory {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/webview/WebViewMode.kt b/vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/webview/WebViewMode.kt
rename to vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt
index 1ae6c3ae1d..742302c61e 100644
--- a/vector/src/main/java/im/vector/riotx/features/webview/WebViewMode.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.webview
+package im.vector.app.features.webview
 
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.core.platform.VectorBaseActivity
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.core.platform.VectorBaseActivity
 
 /**
  * This enum indicates the WebView mode. It's responsible for creating a WebViewEventListener
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetAPICallback.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt
similarity index 78%
rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetAPICallback.kt
rename to vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt
index 3549ce979c..3eaedd9f4d 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetAPICallback.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets
+package im.vector.app.features.widgets
 
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.widgets.WidgetPostAPIMediator
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.widgets.WidgetPostAPIMediator
+import org.matrix.android.sdk.api.util.JsonDict
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
 
 class WidgetAPICallback(private val postAPIMediator: WidgetPostAPIMediator,
                         private val eventData: JsonDict,
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetAction.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetAction.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetAction.kt
rename to vector/src/main/java/im/vector/app/features/widgets/WidgetAction.kt
index 06a27a7084..b72ea68b7f 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetAction.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetAction.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets
+package im.vector.app.features.widgets
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class WidgetAction : VectorViewModelAction {
     data class OnWebViewStartedToLoad(val url: String) : WidgetAction()
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetActivity.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetActivity.kt
rename to vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
index a8153a65d8..37f1d3a192 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets
+package im.vector.app.features.widgets
 
 import android.app.Activity
 import android.content.Context
@@ -23,16 +23,16 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionBottomSheet
-import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionViewEvents
-import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionViewModel
-import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionViewState
+import org.matrix.android.sdk.api.session.events.model.Content
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.widgets.permissions.RoomWidgetPermissionBottomSheet
+import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewEvents
+import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewModel
+import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewState
 import kotlinx.android.synthetic.main.activity_widget.*
 import java.io.Serializable
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetArgsBuilder.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetArgsBuilder.kt
rename to vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
index 6cbf1f29a1..badec16a27 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetArgsBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets
+package im.vector.app.features.widgets
 
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.riotx.core.di.ActiveSessionHolder
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import im.vector.app.core.di.ActiveSessionHolder
 import javax.inject.Inject
 
 class WidgetArgsBuilder @Inject constructor(private val sessionHolder: ActiveSessionHolder) {
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt
rename to vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
index b162149ffe..37ae89ab36 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets
+package im.vector.app.features.widgets
 
 import android.app.Activity
 import android.content.Intent
@@ -35,16 +35,16 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.session.terms.TermsService
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.OnBackPressed
-import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.openUrlInExternalBrowser
-import im.vector.riotx.features.home.room.detail.widget.WidgetRequestCodes
-import im.vector.riotx.features.terms.ReviewTermsActivity
-import im.vector.riotx.features.webview.WebViewEventListener
-import im.vector.riotx.features.widgets.webview.clearAfterWidget
-import im.vector.riotx.features.widgets.webview.setupForWidget
+import org.matrix.android.sdk.api.session.terms.TermsService
+import im.vector.app.R
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.openUrlInExternalBrowser
+import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
+import im.vector.app.features.terms.ReviewTermsActivity
+import im.vector.app.features.webview.WebViewEventListener
+import im.vector.app.features.widgets.webview.clearAfterWidget
+import im.vector.app.features.widgets.webview.setupForWidget
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_room_widget.*
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt
rename to vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index ce3ad466e2..69c907b4e2 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets
+package im.vector.app.features.widgets
 
 import android.text.TextUtils
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toContent
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.android.api.session.widgets.WidgetPostAPIMediator
-import im.vector.matrix.android.api.util.JsonDict
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataTypes
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.widgets.WidgetPostAPIMediator
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
 import timber.log.Timber
 import java.util.ArrayList
 import java.util.HashMap
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewEvents.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt
index 5b40e0441d..a6a20a6717 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets
+package im.vector.app.features.widgets
 
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.riotx.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.session.events.model.Content
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class WidgetViewEvents : VectorViewEvents {
     data class Failure(val throwable: Throwable): WidgetViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt
rename to vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
index 89d597c4dc..9ecafb1020 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets
+package im.vector.app.features.widgets
 
 import android.net.Uri
 import androidx.lifecycle.viewModelScope
@@ -27,22 +27,22 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.events.model.Content
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService
-import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
-import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
-import im.vector.matrix.android.api.session.widgets.WidgetManagementFailure
-import im.vector.matrix.android.internal.util.awaitCallback
-import im.vector.matrix.rx.mapOptional
-import im.vector.matrix.rx.rx
-import im.vector.matrix.rx.unwrap
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.widgets.permissions.WidgetPermissionsHelper
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.widgets.WidgetManagementFailure
+import org.matrix.android.sdk.internal.util.awaitCallback
+import org.matrix.android.sdk.rx.mapOptional
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.widgets.permissions.WidgetPermissionsHelper
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.net.ssl.HttpsURLConnection
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewState.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewState.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewState.kt
rename to vector/src/main/java/im/vector/app/features/widgets/WidgetViewState.kt
index 2242efc82f..3289ee8b54 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewState.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets
+package im.vector.app.features.widgets
 
 import androidx.annotation.StringRes
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.matrix.android.api.session.widgets.model.WidgetType
-import im.vector.riotx.R
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import im.vector.app.R
 
 enum class WidgetStatus {
     UNKNOWN,
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionActions.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionActions.kt
rename to vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt
index 280da5a757..38344b80ae 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionActions.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets.permissions
+package im.vector.app.features.widgets.permissions
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomWidgetPermissionActions : VectorViewModelAction {
     object AllowWidget: RoomWidgetPermissionActions()
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
similarity index 75%
rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
index f3a9e5fda6..2c0aff3289 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.widgets.permissions
+package im.vector.app.features.widgets.permissions
 
 import android.content.DialogInterface
-import android.os.Build
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.style.BulletSpan
@@ -24,13 +23,13 @@ import butterknife.OnClick
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.extensions.withArgs
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.riotx.features.home.AvatarRenderer
-import im.vector.riotx.features.widgets.WidgetArgs
+import org.matrix.android.sdk.api.util.toMatrixItem
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.withArgs
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.widgets.WidgetArgs
 import kotlinx.android.synthetic.main.bottom_sheet_room_widget_permission.*
 import javax.inject.Inject
 
@@ -48,6 +47,9 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
         injector.inject(this)
     }
 
+    // Use this if you don't need the full activity view model
+    var directListener: ((Boolean) -> Unit)? = null
+
     override fun invalidate() = withState(viewModel) { state ->
         super.invalidate()
         val permissionData = state.permissionData() ?: return@withState
@@ -68,18 +70,7 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
         permissionData.permissionsList.forEach {
             infoBuilder.append("\n")
             val bulletPoint = getString(it)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                infoBuilder.append(bulletPoint, BulletSpan(resources.getDimension(R.dimen.quote_gap).toInt()), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-            } else {
-                val start = infoBuilder.length
-                infoBuilder.append(bulletPoint)
-                infoBuilder.setSpan(
-                        BulletSpan(resources.getDimension(R.dimen.quote_gap).toInt()),
-                        start,
-                        bulletPoint.length,
-                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-                )
-            }
+            infoBuilder.append(bulletPoint, BulletSpan(resources.getDimension(R.dimen.quote_gap).toInt()), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         }
         infoBuilder.append("\n")
         widgetPermissionSharedInfo.text = infoBuilder
@@ -88,6 +79,7 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
     @OnClick(R.id.widgetPermissionDecline)
     fun doDecline() {
         viewModel.handle(RoomWidgetPermissionActions.BlockWidget)
+        directListener?.invoke(false)
         // optimistic dismiss
         dismiss()
     }
@@ -95,6 +87,7 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
     @OnClick(R.id.widgetPermissionContinue)
     fun doAccept() {
         viewModel.handle(RoomWidgetPermissionActions.AllowWidget)
+        directListener?.invoke(true)
         // optimistic dismiss
         dismiss()
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt
index c3138d082a..b7dc4a14a3 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets.permissions
+package im.vector.app.features.widgets.permissions
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class RoomWidgetPermissionViewEvents : VectorViewEvents {
     object Close : RoomWidgetPermissionViewEvents()
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
similarity index 62%
rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
rename to vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
index 8e52a0c7d3..ea55e04103 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.widgets.permissions
+package im.vector.app.features.widgets.permissions
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
@@ -22,13 +22,15 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.rx.rx
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import im.vector.app.R
+import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import org.matrix.android.sdk.internal.util.awaitCallback
+import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import java.net.URL
 
@@ -57,20 +59,33 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in
                     }
                     // TODO check from widget urls the perms that should be shown?
                     // For now put all
-                    val infoShared = listOf(
-                            R.string.room_widget_permission_display_name,
-                            R.string.room_widget_permission_avatar_url,
-                            R.string.room_widget_permission_user_id,
-                            R.string.room_widget_permission_theme,
-                            R.string.room_widget_permission_widget_id,
-                            R.string.room_widget_permission_room_id
-                    )
-                    RoomWidgetPermissionViewState.WidgetPermissionData(
-                            widget = widget,
-                            isWebviewWidget = true,
-                            permissionsList = infoShared,
-                            widgetDomain = domain
-                    )
+                    if (widget.type == WidgetType.Jitsi) {
+                        val infoShared = listOf(
+                                R.string.room_widget_permission_display_name,
+                                R.string.room_widget_permission_avatar_url
+                        )
+                        RoomWidgetPermissionViewState.WidgetPermissionData(
+                                widget = widget,
+                                isWebviewWidget = false,
+                                permissionsList = infoShared,
+                                widgetDomain = widget.widgetContent.data["domain"] as? String
+                        )
+                    } else {
+                        val infoShared = listOf(
+                                R.string.room_widget_permission_display_name,
+                                R.string.room_widget_permission_avatar_url,
+                                R.string.room_widget_permission_user_id,
+                                R.string.room_widget_permission_theme,
+                                R.string.room_widget_permission_widget_id,
+                                R.string.room_widget_permission_room_id
+                        )
+                        RoomWidgetPermissionViewState.WidgetPermissionData(
+                                widget = widget,
+                                isWebviewWidget = true,
+                                permissionsList = infoShared,
+                                widgetDomain = domain
+                        )
+                    }
                 }
                 .execute {
                     copy(permissionData = it)
@@ -91,7 +106,14 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in
                 if (state.permissionData()?.isWebviewWidget.orFalse()) {
                     WidgetPermissionsHelper(integrationManagerService, widgetService).changePermission(state.roomId, widgetId, false)
                 } else {
-                    // TODO JITSI
+                    awaitCallback<Unit> {
+                        session.integrationManagerService().setNativeWidgetDomainAllowed(
+                                state.permissionData.invoke()?.widget?.type?.preferred ?: "",
+                                state.permissionData.invoke()?.widgetDomain ?: "",
+                                false,
+                                it
+                        )
+                    }
                 }
             } catch (failure: Throwable) {
                 Timber.v("Failure revoking widget: ${state.widgetId}")
@@ -109,7 +131,14 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in
                 if (state.permissionData()?.isWebviewWidget.orFalse()) {
                     WidgetPermissionsHelper(integrationManagerService, widgetService).changePermission(state.roomId, widgetId, true)
                 } else {
-                    // TODO JITSI
+                    awaitCallback<Unit> {
+                        session.integrationManagerService().setNativeWidgetDomainAllowed(
+                                state.permissionData.invoke()?.widget?.type?.preferred ?: "",
+                                state.permissionData.invoke()?.widgetDomain ?: "",
+                                true,
+                                it
+                        )
+                    }
                 }
             } catch (failure: Throwable) {
                 Timber.v("Failure allowing widget: ${state.widgetId}")
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewState.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt
rename to vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewState.kt
index 8daef86324..8d2e9b95b8 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewState.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets.permissions
+package im.vector.app.features.widgets.permissions
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import im.vector.riotx.features.widgets.WidgetArgs
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import im.vector.app.features.widgets.WidgetArgs
 
 data class RoomWidgetPermissionViewState(
         val roomId: String,
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/WidgetPermissionsHelper.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt
similarity index 79%
rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/WidgetPermissionsHelper.kt
rename to vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt
index bcf5f2c541..871e73592d 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/WidgetPermissionsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets.permissions
+package im.vector.app.features.widgets.permissions
 
-import im.vector.matrix.android.api.query.QueryStringValue
-import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService
-import im.vector.matrix.android.api.session.widgets.WidgetService
-import im.vector.matrix.android.internal.util.awaitCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.api.session.widgets.WidgetService
+import org.matrix.android.sdk.internal.util.awaitCallback
 
 class WidgetPermissionsHelper(private val integrationManagerService: IntegrationManagerService,
                               private val widgetService: WidgetService) {
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt b/vector/src/main/java/im/vector/app/features/widgets/webview/WebviewPermissionUtils.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt
rename to vector/src/main/java/im/vector/app/features/widgets/webview/WebviewPermissionUtils.kt
index fa0f4e0a97..eaffa147d5 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/webview/WebviewPermissionUtils.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.features.widgets.webview
+package im.vector.app.features.widgets.webview
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.webkit.PermissionRequest
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
-import im.vector.riotx.R
+import im.vector.app.R
 
 object WebviewPermissionUtils {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt
rename to vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
index 8fb1f63e65..446bc1663f 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
@@ -14,20 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.widgets.webview
+package im.vector.app.features.widgets.webview
 
 import android.annotation.SuppressLint
-import android.os.Build
 import android.view.ViewGroup
 import android.webkit.CookieManager
 import android.webkit.PermissionRequest
 import android.webkit.WebChromeClient
 import android.webkit.WebSettings
 import android.webkit.WebView
-import im.vector.riotx.R
-import im.vector.riotx.features.themes.ThemeUtils
-import im.vector.riotx.features.webview.VectorWebViewClient
-import im.vector.riotx.features.webview.WebViewEventListener
+import im.vector.app.R
+import im.vector.app.features.themes.ThemeUtils
+import im.vector.app.features.webview.VectorWebViewClient
+import im.vector.app.features.webview.WebViewEventListener
 
 @SuppressLint("NewApi")
 fun WebView.setupForWidget(webViewEventListener: WebViewEventListener) {
@@ -68,10 +67,8 @@ fun WebView.setupForWidget(webViewEventListener: WebViewEventListener) {
     }
     webViewClient = VectorWebViewClient(webViewEventListener)
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        val cookieManager = CookieManager.getInstance()
-        cookieManager.setAcceptThirdPartyCookies(this, false)
-    }
+    val cookieManager = CookieManager.getInstance()
+    cookieManager.setAcceptThirdPartyCookies(this, false)
 }
 
 fun WebView.clearAfterWidget() {
diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/ServerBackupStatusViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotx/features/workers/signout/ServerBackupStatusViewModel.kt
rename to vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
index 35dff87ecb..1c887f91be 100644
--- a/vector/src/main/java/im/vector/riotx/features/workers/signout/ServerBackupStatusViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.workers.signout
+package im.vector.app.features.workers.signout
 
 import androidx.lifecycle.MutableLiveData
 import com.airbnb.mvrx.ActivityViewModelContext
@@ -26,24 +26,24 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent
-import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo
-import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
-import im.vector.matrix.android.api.util.Optional
-import im.vector.matrix.android.internal.crypto.store.PrivateKeysInfo
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.platform.EmptyAction
-import im.vector.riotx.core.platform.EmptyViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
 import io.reactivex.Observable
 import io.reactivex.functions.Function4
 import io.reactivex.subjects.PublishSubject
+import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
 
 data class ServerBackupStatusViewState(
diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt
rename to vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
index 2ebf086796..c17c1a1cf8 100644
--- a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.workers.signout
+package im.vector.app.features.workers.signout
 
 import android.app.Activity
 import android.app.Dialog
@@ -35,15 +35,15 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import im.vector.matrix.android.api.MatrixCallback
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.dialogs.ExportKeysDialog
-import im.vector.riotx.core.extensions.queryExportKeys
-import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity
-import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.dialogs.ExportKeysDialog
+import im.vector.app.core.extensions.queryExportKeys
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity
+import im.vector.app.features.crypto.recover.BootstrapBottomSheet
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt
rename to vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt
index e06a47d3d4..d78b652113 100644
--- a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.workers.signout
+package im.vector.app.features.workers.signout
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.FragmentActivity
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.extensions.cannotLogoutSafely
-import im.vector.riotx.core.extensions.vectorComponent
-import im.vector.riotx.features.MainActivity
-import im.vector.riotx.features.MainActivityArgs
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.cannotLogoutSafely
+import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
 
 class SignOutUiWorker(private val activity: FragmentActivity) {
 
diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutBottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutBottomSheetActionButton.kt
rename to vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt
index cd5e4ed9da..02ea2569e8 100644
--- a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutBottomSheetActionButton.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.workers.signout
+package im.vector.app.features.workers.signout
 
 import android.content.Context
 import android.content.res.ColorStateList
@@ -27,9 +27,9 @@ import android.widget.TextView
 import androidx.core.view.isVisible
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.setTextOrHide
-import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.themes.ThemeUtils
 
 class SignoutBottomSheetActionButton @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutCheckViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutCheckViewModel.kt
rename to vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
index 47da7d4edc..5fd2f7c838 100644
--- a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutCheckViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.workers.signout
+package im.vector.app.features.workers.signout
 
 import android.net.Uri
 import com.airbnb.mvrx.ActivityViewModelContext
@@ -28,18 +28,18 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
-import im.vector.matrix.rx.rx
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewEvents
-import im.vector.riotx.core.platform.VectorViewModel
-import im.vector.riotx.core.platform.VectorViewModelAction
-import im.vector.riotx.features.crypto.keys.KeysExporter
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.features.crypto.keys.KeysExporter
+import org.matrix.android.sdk.rx.rx
 
 data class SignoutCheckViewState(
         val userId: String = "",
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt
deleted file mode 100644
index ca418737b9..0000000000
--- a/vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2018 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.riotx.core.preference
-
-import android.content.Context
-import android.util.AttributeSet
-import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.room.Room
-
-/**
- * Specialized class to target a Room avatar preference.
- * Based don the avatar preference class it redefines refreshAvatar() and
- * add the new method  setConfiguration().
- */
-class RoomAvatarPreference : UserAvatarPreference {
-
-    private var mRoom: Room? = null
-
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
-
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
-
-    override fun refreshAvatar() {
-        if (null != mAvatarView && null != mRoom) {
-            // TODO
-            // VectorUtils.loadRoomAvatar(context, session, mAvatarView, mRoom)
-        }
-    }
-
-    fun setConfiguration(aSession: Session, aRoom: Room) {
-        mSession = aSession
-        mRoom = aRoom
-        refreshAvatar()
-    }
-}
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetController.kt
deleted file mode 100644
index 1fe85d0264..0000000000
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetController.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.riotx.features.home.room.detail.widget
-
-import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.widgets.model.Widget
-import javax.inject.Inject
-
-/**
- * Epoxy controller for room widgets list
- */
-class RoomWidgetController @Inject constructor() : TypedEpoxyController<List<Widget>>() {
-
-    var listener: Listener? = null
-
-    override fun buildModels(widget: List<Widget>) {
-        widget.forEach {
-            RoomWidgetItem_()
-                    .id(it.widgetId)
-                    .widget(it)
-                    .widgetClicked { listener?.didSelectWidget(it) }
-                    .addTo(this)
-        }
-    }
-
-    interface Listener {
-        fun didSelectWidget(widget: Widget)
-    }
-}
diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListController.kt b/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListController.kt
deleted file mode 100644
index 51801af187..0000000000
--- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListController.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.riotx.features.roomprofile.banned
-
-import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
-import im.vector.matrix.android.api.util.toMatrixItem
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.dividerItem
-import im.vector.riotx.core.epoxy.profiles.buildProfileSection
-import im.vector.riotx.core.epoxy.profiles.profileMatrixItemWithProgress
-import im.vector.riotx.core.extensions.join
-import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.ui.list.genericFooterItem
-import im.vector.riotx.features.home.AvatarRenderer
-import javax.inject.Inject
-
-class RoomBannedMemberListController @Inject constructor(
-        private val avatarRenderer: AvatarRenderer,
-        private val stringProvider: StringProvider,
-        colorProvider: ColorProvider
-) : TypedEpoxyController<RoomBannedMemberListViewState>() {
-
-    interface Callback {
-        fun onUnbanClicked(roomMember: RoomMemberSummary)
-    }
-
-    private val dividerColor = colorProvider.getColorFromAttribute(R.attr.vctr_list_divider_color)
-
-    var callback: Callback? = null
-
-    init {
-        setData(null)
-    }
-
-    override fun buildModels(data: RoomBannedMemberListViewState?) {
-        val bannedList = data?.bannedMemberSummaries?.invoke() ?: return
-
-        buildProfileSection(
-                stringProvider.getString(R.string.room_settings_banned_users_title)
-        )
-
-        bannedList.join(
-                each = { _, roomMember ->
-                    val actionInProgress = data.onGoingModerationAction.contains(roomMember.userId)
-                    profileMatrixItemWithProgress {
-                        id(roomMember.userId)
-                        matrixItem(roomMember.toMatrixItem())
-                        avatarRenderer(avatarRenderer)
-                        apply {
-                            if (actionInProgress) {
-                                inProgress(true)
-                                editable(false)
-                            } else {
-                                inProgress(false)
-                                editable(true)
-                                clickListener { _ ->
-                                    callback?.onUnbanClicked(roomMember)
-                                }
-                            }
-                        }
-                    }
-                },
-                between = { _, roomMemberBefore ->
-                    dividerItem {
-                        id("divider_${roomMemberBefore.userId}")
-                        color(dividerColor)
-                    }
-                }
-        )
-
-        genericFooterItem {
-            id("footer")
-            text(stringProvider.getQuantityString(R.plurals.room_settings_banned_users_count, bannedList.size, bannedList.size))
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsAction.kt b/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsAction.kt
deleted file mode 100644
index fbc5ba05cc..0000000000
--- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsAction.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.riotx.features.settings.crosssigning
-
-import im.vector.riotx.core.platform.VectorViewModelAction
-
-sealed class CrossSigningSettingsAction : VectorViewModelAction {
-    object SetUpRecovery : CrossSigningSettingsAction()
-    object VerifySession : CrossSigningSettingsAction()
-    object SetupCrossSigning : CrossSigningSettingsAction()
-}
diff --git a/vector/src/main/play/listings/de/full_description.txt b/vector/src/main/play/listings/de/full_description.txt
new file mode 100644
index 0000000000..e06205f89f
--- /dev/null
+++ b/vector/src/main/play/listings/de/full_description.txt
@@ -0,0 +1,30 @@
+Element ist eine neuartige Messaging- und Kollaborationsapp:
+
+1. Volle Kontrolle über deine Privatssphäre
+2. Kommuniziere mit jedem aus dem Matrix-Netzwerk und mit der Integration von z.B. Slack sogar über Matrix hinaus
+3. Schutz vor Werbung, Datamining und geschlossenen Platformen
+4. Absicherung durch Ende-zu-Ende-Verschlüsselung, und Cross Signing um andere zu verifizieren
+
+Element unterscheidet sich durch Dezentralität und Open Source deutlich von anderen Messaging- und Kollaborationsapps.
+
+Element ermöglicht es einen eigenen Server zu betreiben - oder einen beliebigen auszuwählen, sodass du nicht nur Privatssphäre gewinnst, sondern auch deine Daten und Konversationen in deiner Hand sind und du sie kontrollieren kannst. Du hast Zugriff auf ein offenes Netzwerk, und kannst daher nicht nur mit Element-Nutzern schreiben. Und es ist sehr sicher.
+
+Element ist zu all diesem in der Lage, weil es Matrix nutzt - einen Standard für offene, dezentrale Kommunikation.
+
+Element gibt dir die Kontrolle, indem es dir die Wahl darüber lässt, wer deine Konversationen hostet. In der Element App kannst du zwischen verschiedenen Möglichkeiten auswählen:
+
+1. Kostenlos auf dem öffentlichen matrix.org Server registrieren
+2. Einen Account auf einem eigenen Server auf eigener Hardware betreiben
+3. Einen Account auf einem benutzerdefinierten Server erstellen, zum Beispiel durch ein Abonnment bei der Element Matrix Services Hosting-Platform
+
+<b>Wieso Element nutzen?</b>
+
+<b>BESITZE DEINE DATEN</b>: Du entscheidest wo deine Daten und Nachrichten gespeichert werden. Du besitzt und kontrollierst sie, anstatt ein Großkonzern, der deine Daten analysiert und Dritten Zugriff gibt.
+
+<b>OFFENE KOMMUNIKATION UND KOLLABORATION</b>: Du kannst mit jedem im Matrix-Netzwerk schreiben, ob sie nun Element oder eine andere Matrix-App nutzen, oder gar ein anderes Kommunikationssystem wie z.B. Slack, IRC oder XMPP.
+
+<b>SUPER SICHER</b>: Echte Ende-zu-Ende-Verschlüsselung (nur Personen in der Konversation können die Nachrichten entschlüsseln), und Cross Signing um die Geräte der anderen Personen zu verifizieren.
+
+<b>VOLLSTÄNDIGE KOMMUNIKATION</b>: Nachrichten, Telefonate und Videoanrufe, Teilen von Dateien oder dem eigenen Bildschirm und viele andere Integrationen, Bots und Widgets. Erstelle Räume, Communities, bleib in Kontakt und sei produktiv.
+
+<b>ÜBERALL WO DU BIST</b>: Bleib in Kontakt wo auch immer du bist - mit einem vollständig synchronisierten Nachrichtenverlauf über alle Geräte und im Web auf https://app.element.io.
diff --git a/vector/src/main/play/listings/de/short_description.txt b/vector/src/main/play/listings/de/short_description.txt
new file mode 100644
index 0000000000..0ffacfd8d9
--- /dev/null
+++ b/vector/src/main/play/listings/de/short_description.txt
@@ -0,0 +1 @@
+Sicherer dezentraler Chat & Telefonie. Schütze deine Daten vor Dritten.
diff --git a/vector/src/main/play/listings/de/title.txt b/vector/src/main/play/listings/de/title.txt
new file mode 100644
index 0000000000..ec25e8a631
--- /dev/null
+++ b/vector/src/main/play/listings/de/title.txt
@@ -0,0 +1 @@
+Element (zuvor Riot.im)
diff --git a/vector/src/main/play/listings/en-US/full_description.txt b/vector/src/main/play/listings/en-US/full_description.txt
new file mode 100644
index 0000000000..e2164a786f
--- /dev/null
+++ b/vector/src/main/play/listings/en-US/full_description.txt
@@ -0,0 +1,30 @@
+Element is a new type of messenger and collaboration app that:
+
+1. Puts you in control to preserve your privacy
+2. Lets you communicate with anyone in the Matrix network, and even beyond by integrating with apps such as Slack
+3. Protects you from advertising, datamining and walled gardens
+4. Secures you through end-to-end encryption, with cross-signing to verify others
+
+Element is completely different from other messaging and collaboration apps because it is decentralised and open source.
+
+Element lets you self-host - or choose a host - so that you have privacy, ownership and control of your data and conversations. It gives you access to an open network; so you’re not just stuck speaking to other Element users only. And it is very secure.
+
+Element is able to do all this because it operates on Matrix - the standard for open, decentralised communication.
+
+Element puts you in control by letting you choose who hosts your conversations. From the Element app, you can choose to host in different ways:
+
+1. Get a free account on the matrix.org public server
+2. Self-host your account by running a server on your own hardware
+3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform
+
+<b>Why choose Element?</b>
+
+<b>OWN YOUR DATA</b>: You decide where to keep your data and messages. You own it and control it, not some MEGACORP that mines your data or gives access to third parties.
+
+<b>OPEN MESSAGING AND COLLABORATION</b>: You can chat with anyone else in the Matrix network, whether they’re using Element or another Matrix app, and even if they are using a different messaging system of the likes of Slack, IRC or XMPP.
+
+<b>SUPER-SECURE</b>: Real end-to-end encryption (only those in the conversation can decrypt messages), and cross-signing to verify the devices of conversation participants.
+
+<b>COMPLETE COMMUNICATION</b>: Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.
+
+<b>EVERYWHERE YOU ARE</b>: Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io.
\ No newline at end of file
diff --git a/vector/src/main/play/listings/en-US/short_description.txt b/vector/src/main/play/listings/en-US/short_description.txt
new file mode 100644
index 0000000000..023b366c9a
--- /dev/null
+++ b/vector/src/main/play/listings/en-US/short_description.txt
@@ -0,0 +1 @@
+Secure decentralised chat & VoIP. Keep your data safe from third parties.
\ No newline at end of file
diff --git a/vector/src/main/play/listings/en-US/title.txt b/vector/src/main/play/listings/en-US/title.txt
new file mode 100644
index 0000000000..039da1fc3b
--- /dev/null
+++ b/vector/src/main/play/listings/en-US/title.txt
@@ -0,0 +1 @@
+Element (previously Riot.im)
\ No newline at end of file
diff --git a/vector/src/main/play/listings/fi/short_description.txt b/vector/src/main/play/listings/fi/short_description.txt
new file mode 100644
index 0000000000..64f35a7dff
--- /dev/null
+++ b/vector/src/main/play/listings/fi/short_description.txt
@@ -0,0 +1 @@
+Turvallista, hajautettua keskustelua ja VoIP-puheluita. Pidä tietosi turvassa.
diff --git a/vector/src/main/play/listings/fi/title.txt b/vector/src/main/play/listings/fi/title.txt
new file mode 100644
index 0000000000..8cda14e3c8
--- /dev/null
+++ b/vector/src/main/play/listings/fi/title.txt
@@ -0,0 +1 @@
+Element (aiemmin Riot.im)
diff --git a/vector/src/main/play/listings/fr/title.txt b/vector/src/main/play/listings/fr/title.txt
new file mode 100644
index 0000000000..87cbc3b858
--- /dev/null
+++ b/vector/src/main/play/listings/fr/title.txt
@@ -0,0 +1 @@
+Element (anciennement Riot.im)
diff --git a/vector/src/main/play/listings/hu/full_description.txt b/vector/src/main/play/listings/hu/full_description.txt
new file mode 100644
index 0000000000..ac113d4f10
--- /dev/null
+++ b/vector/src/main/play/listings/hu/full_description.txt
@@ -0,0 +1,30 @@
+Az Element egy új üzenetküldő, és csapatmunka alkalmazás, amivel
+
+1. A te kezedben van az irányítás a saját adataid fölött, hogy megőrizhesd a magánszférádat
+2. Akárkivel beszélgethetsz a Matrix hálózatban, sőt még azon kívül is, például olyan alkalmazások integrálásával, mint a Slack
+3. Megvédheted magad a hirdetésektől, adatbányászattól, és a nagy cégek megoldásaiba való bezártságtól
+4. Biztonságosan beszélgethetsz, a végpontok közötti titkosításnak köszönhetően, az eszközök megbízhatóságát az eszköz-közti hitelesítéssel garantálva
+
+Az Element teljesen más, mint a többi üzenetküldő és csapatmunka alkalmazás, mert nyílt forráskódú, és decentralizált (nem központilag irányított).
+
+Az Element lehetővé teszi, hogy saját szervert futtass - vagy válassz egy szolgáltatót - így te birtoklod az adataidat, ezáltal megőrizve a magánszférád és a biztonságod. Egy nyitott hálózathoz ad hozzáférést, így nem csak a többi Element felhasználóval tudsz beszélgetni, hanem másokkal is. Ráadásul nagyon biztonságos.
+
+Az Element-tel azért válik mindez lehetővé, mert a Matrix hálózatra épül - egy nyílt, decentralizált kommunikációs szabványra.
+
+Az Element a te kezedbe adja az irányítást azáltal, hogy eldöntheted, ki tárolja a beszélgetéseidet. Az Element alkalmazásból több féle szolgáltatót is választhatsz:
+
+1. Regisztrálhatsz ingyen egy fiókot a matrix.org nyilvános szerveren
+2. A saját számítógépeden is futtathatsz szervert
+3. Előfizethetsz egy saját szerverre az Element Matrix Szolgáltatások platformon
+
+<b>Miért válaszd az Element-et?</b>
+
+<b>ADATAID MEGVÉDÉSE</b>: Eldöntheted, hol tárold az adataid és üzeneteid. A te tulajdonodban van, nem valami megacégnél, ami bányássza az adataid, vagy továbbadja másoknak.
+
+<b>NYÍLT BESZÉLGETÉS, ÉS CSAPATMUNKA</b>: Akárkivel cseveghetsz a Matrix hálózatban, akár az Element-et használják, akár valamilyen másik Matrix alkalmazást, de még akkor is, ha egy másik csevegő hálózatot használnak, olyat, mint például a Slack, IRC, vagy az XMPP.
+
+<b>SZUPER-BIZTONSÁGOS</b>: Valódi, végpontok közötti titkosítás (csak a beszélgetés résztvevői tudják elolvasni az üzeneteket), és eszköz-közti hitelesítés, hogy ellenőrizhesd a résztvevők eszközeit.
+
+<b>TELJES KOMMUNIKÁCIÓ</b>: Üzenetküldés, hang- és videóhívások, fájlmegosztás, képernyőmegosztás, és egy rakás integráció, bot, és widget. Hozz létre szobákat, közösségeket, maradj elérhető, és végezzétek el a feladatokat.
+
+<b>AKÁRHOL, AHOL CSAK SZÜKSÉG VAN RÁ</b>: Akárhol is vagy, maradj elérhető, a teljes mértékben szinkronizált beszélgetésekkel az összes eszközödön, és a weben a https://app.element.io oldalon.
diff --git a/vector/src/main/play/listings/hu/short_description.txt b/vector/src/main/play/listings/hu/short_description.txt
new file mode 100644
index 0000000000..89f7c13f54
--- /dev/null
+++ b/vector/src/main/play/listings/hu/short_description.txt
@@ -0,0 +1 @@
+Biztonságos, decentralizált chat és VoIP. Tartsd az adataid biztonságban.
diff --git a/vector/src/main/play/listings/hu/title.txt b/vector/src/main/play/listings/hu/title.txt
new file mode 100644
index 0000000000..cc39ddefdd
--- /dev/null
+++ b/vector/src/main/play/listings/hu/title.txt
@@ -0,0 +1 @@
+Element (előzőleg Riot.im)
diff --git a/vector/src/main/play/listings/pt_BR/full_description.txt b/vector/src/main/play/listings/pt_BR/full_description.txt
new file mode 100644
index 0000000000..a3b5dda311
--- /dev/null
+++ b/vector/src/main/play/listings/pt_BR/full_description.txt
@@ -0,0 +1,30 @@
+Element é um novo tipo de aplicativo de mensagens e colaboração que:
+
+1. Coloca você no controle de sua privacidade;
+2. Permite que você se comunique com qualquer pessoa na rede Matrix e, através de integrações, outros aplicativos como o Slack;
+3. Protege você de anúncios, mineração de dados e de ecossistemas fechados;
+4. Faz uso da criptografia de ponta-a-ponta, com assinatura cruzada para verificar outros.
+
+Element é completamente diferente de outros aplicativos de mensagem e colaboração porque é descentralizado e código aberto.
+
+É possível hospedar um servidor ou escolher um servidor hospedeiro, para que você tenha privacidade, controle e que você seja o dono de seus dados e conversas. Com o Element, você possui acesso a uma rede aberta; então você não está preso falando somente com outros usuários no Element. O Element também é muito seguro.
+
+Element é capaz de fazer tudo isso porque ele opera no Matrix, o padrão para comunicação aberta e descentralizada.
+
+Element coloca você no controle ao permitir quem hospeda suas conversas. Neste aplicativo, você pode escolher hospedar de maneiras diferentes:
+
+1. Crie uma conta gratuita no servidor público matrix.org;
+2. Hospede sua conta no seu servidor;
+3. Entre em uma conta em um servidor customizado ao simplesmente se inscrever na plataforma de hospedagem Serviços Matrix Element.
+
+<b>Por que escolher o Element?</b>
+
+<b>SEJA O DONO DE SEUS DADOS</b>: Você decide onde manter seus dados e mensagens. Você é o dono deles e também os controla, não alguma mega corporação que minera os seus dados ou compartilha eles com terceiros.
+
+<b>COLABORAÇÃO E MENSAGENS ABERTAS</b>: Você pode falar com qualquer outra pessoa na rede Matrix, não importa se ela está usando o Element ou algum outro aplicativo Matrix, ou até mesmo se ela está utilizando um sistema de mensagens diferente como o Slack, IRC ou XMPP.
+
+<b>SUPER-SEGURO</b>: Criptografia de ponta-a-ponta verdadeira (apenas aqueles na conversa podem descriptografar mensagens), e assinatura cruzada para verificar os dispositivos de participantes de conversas.
+
+<b>COMUNICAÇÃO COMPLETA</b>: Mensagens, chamadas de voz, chamadas de vídeo, compartilhamento de arquivos, compartilhamento de tela e um monte de integrações, robôs e widgets. Construa salas, comunidades, mantenha contato e faça seus projetos.
+
+<b>NÃO IMPORTA ONDE VOCÊ ESTEJA</b>: Mantenha contato não importa onde você esteja com o histórico sincronizado de mensagens em todos os seus dispositivos e no navegador em https://app.element.io.
diff --git a/vector/src/main/play/listings/pt_BR/short_description.txt b/vector/src/main/play/listings/pt_BR/short_description.txt
new file mode 100644
index 0000000000..7dd54cd2fd
--- /dev/null
+++ b/vector/src/main/play/listings/pt_BR/short_description.txt
@@ -0,0 +1 @@
+Bate-papo seguro descentralizado e voz sobre IP. Mantenha seus dados seguros.
diff --git a/vector/src/main/play/listings/pt_BR/title.txt b/vector/src/main/play/listings/pt_BR/title.txt
new file mode 100644
index 0000000000..70c9f7030b
--- /dev/null
+++ b/vector/src/main/play/listings/pt_BR/title.txt
@@ -0,0 +1 @@
+Element (antigo Riot.im)
diff --git a/vector/src/main/play/listings/ru/full_description.txt b/vector/src/main/play/listings/ru/full_description.txt
new file mode 100644
index 0000000000..c0ab718630
--- /dev/null
+++ b/vector/src/main/play/listings/ru/full_description.txt
@@ -0,0 +1,30 @@
+Element - это новый тип приложения для обмена сообщениями и совместной работы, которое:
+
+1. Позволяет вам контролировать вашу конфиденциальность
+2. Позволяет общаться с кем угодно в сети Matrix и даже за ее пределами за счет интеграции с такими приложениями, как Slack
+3. Защищает вас от рекламы, данных и огороженных стеной садов
+4. Обеспечивает безопасность с помощью сквозного шифрования с перекрестной подписью для проверки других пользователей
+
+Element полностью отличается от других приложений для обмена сообщениями и совместной работы, потому что он децентрализован и имеет открытый исходный код.
+
+Element позволяет вам самостоятельно размещать или выбирать хост-узел, чтобы у вас была конфиденциальность, право собственности и контроль над своими данными и разговорами. Он предоставляет вам доступ к открытой сети, поэтому вы не ограничены общением исключительно с пользователями Element. И он очень надежен и безопаснен.
+
+Element может делать все это, потому что он работает на Matrix - стандарте открытого, децентрализованного общения.
+
+Element предоставляет вам полный контроль, позволяя выбрать поставщиков услуг, обслуживающих серверы с вашими беседами. Вы свободны выбрать любой способ размещения прямо из приложения Element:
+
+1. Получить бесплатную учетную запись на общедоступном сервере matrix.org
+2. Разместить свою учетную запись на собственном сервере
+3. Зарегистрироваться на индивидуальном сервере, просто подписавшись на услуги платформы Element Matrix Services
+
+<b>Почему выбирают Element?</b>
+
+<b>СОБСТВЕННЫЕ ДАННЫЕ</b>: Вы решаете, где хранить свои данные и сообщения. Вы владеете ими и контролируете их, а не какая-то мегакорпорация, что собирает ваши данные и предоставляет сторонним лицам доступ к ним.
+
+<b>ОТКРЫТОЕ ОБЩЕНИЕ И СОТРУДНИЧЕСТВО</b>: Вы можете общаться с кем угодно в сети Matrix, независимо от того, используют ли они приложение Element или другое приложение Matrix, и даже если они используют другую систему обмена сообщениями, такую как Slack, IRC или XMPP.
+
+<b>СУПЕР-БЕЗОПАСНОСТЬ</b>: Настоящее сквозное шифрование (только участники разговора могут расшифровывать сообщения) и перекрестная подпись для проверки устройств участников разговора.
+
+<b>ПОЛНАЯ КОММУНИКАЦИЯ</b>: Обмен сообщениями, голосовые и видеозвонки, совместное использование файлов, совместное использование экрана и целый ряд интеграций, ботов и виджетов. Создавайте комнаты, сообщества, оставайтесь на связи и добивайтесь результатов.
+
+<b>ВЫ ВЕЗДЕ</b>: Оставайтесь на связи, где бы вы ни находились, благодаря полностью синхронизированной истории сообщений на всех ваших устройствах и в Интернете по адресу https://app.element.io.
diff --git a/vector/src/main/play/listings/ru/short_description.txt b/vector/src/main/play/listings/ru/short_description.txt
new file mode 100644
index 0000000000..64452ed22d
--- /dev/null
+++ b/vector/src/main/play/listings/ru/short_description.txt
@@ -0,0 +1 @@
+Защищённый децентрализованный чат и звонки. Держите ваши данные в безопасности.
diff --git a/vector/src/main/play/listings/ru/title.txt b/vector/src/main/play/listings/ru/title.txt
new file mode 100644
index 0000000000..00e488e69f
--- /dev/null
+++ b/vector/src/main/play/listings/ru/title.txt
@@ -0,0 +1 @@
+Element (ранее Riot.im)
diff --git a/vector/src/main/play/listings/sk/full_description.txt b/vector/src/main/play/listings/sk/full_description.txt
new file mode 100644
index 0000000000..6e3bff2fb5
--- /dev/null
+++ b/vector/src/main/play/listings/sk/full_description.txt
@@ -0,0 +1,31 @@
+Element je inovatívny kolaboračný komunikátor ktorý:
+
+1. Ponecháva kontrolu nad zachovaním vašeho súkromia
+2. Umožňuje komunikovať s kýmkoľvek v sieti Matrix a vďaka integráciám s aplikáciami napríklad Slack aj s mnohými ďalšími
+3. Chráni vás pred reklamami, zhromažďovaním údajov a nedostatkami uzavretých platforiem
+4. Posilňuje vašu bezpečnosť vďaka E2E šifrovaniu a krížovému podpisovaniu určenému na overovanie ostatných
+
+
+Element sa od ostatných komunikačných a kolaboračných aplikácií odlišuje tým, že je decentralizovaný a open-source.
+
+S elementom sa môžete pripojiť k vlastnému serveru alebo si môžete vybrať dôveryhodného poskytovateľa servera, čím si zachováte súkromie, vlastníctvo a kontrolu nad vašimi konverzáciami a údajmi. Získavate vlastne prístup do otvorenej siete a teda nie ste limitovaní na komunikáciu len s ostatnými Element používateľmi. A samozrejme komunikácia je veľmi bezpečná.
+
+Element všetko toto dokáže vďaka tomu, že pracuje podľa protokolu Matrix - štandardu na otvorenú, decentralizovanú komunikáciu.
+
+Element vám dáva kontrolu tým, že si samy vyberiete, ako budete hostovať vaše konverzácie. Priamo v aplikácii Element si môžete vybrať z rôznych spôsobov hostovania:
+
+1. Získajte účet zdarma na verejnom servery matrix.org
+2. Hostujte si účet spustením vlastného servera použitím vlastného hardvéru
+3. Prihláste sa k účtu na vlastnom servery objednaním služieb na platforme Element Matrix Services
+
+<b>Prečo si vybrať element?</b>
+
+<b>PONECHAJTE SI VAŠE ÚDAJE</b>: Len vy sa rozhodujete o tom, kde si budete uchovávať vaše správy a ostatné údaje. Len vy vlastníte vaše údaje a riadite zaobchádzanie s nimi, nie nejaká obrovská korporácia, ktorá z nich ťaží alebo k nim poskytuje prístup tretím stranám.
+
+<b>OTVORENÁ KOMUNIKÁCIA a KOLABORÁCIA</b>: Konverzovať môžete s kýmkoľvek v otvorenej sieti Matrix nezávisle na tom, či používa Element alebo inú kompatibilnú aplikáciu, alebo dokonca aj s tými, ktorí používajú iný systém určený na okamžitú komunikáciu ako sú Slack, IRC alebo XMPP.
+
+<b>VEĽMI VYSOKÉ ZABEZPEČENIE</b>: Skutočné šifrovanie od zariadenia k zariadeniu (len diskutujúci môžu dešifrovať správy) a krížové podpisovanie určené na overovanie jednotlivých zariadení členov konverzácií.
+
+<b>KOMPLETNÁ KOMUNIKÁCIA</b>: Okamžité správy, telefonáty a video hovory, zdieľanie súborov, zdieľanie obrazovky a veľké množstvo integrácií, botov a widgetov. Vytvorte si vlastné miestnosti, založte komunity, ostante v kontakte a vyriešte úlohy.
+
+<b>KDEKOĽVEK SA NACHÁDZATE</b>: Ostante v kontakte kdekoľvek práve ste s plne synchronizovanou históriou konverzácií naprieč všetkými vašimi zariadeniami aj cez web na adrese https://app.element.io.
diff --git a/vector/src/main/play/listings/sk/short_description.txt b/vector/src/main/play/listings/sk/short_description.txt
new file mode 100644
index 0000000000..171222982d
--- /dev/null
+++ b/vector/src/main/play/listings/sk/short_description.txt
@@ -0,0 +1 @@
+Zabezpečené konverzácie a VoIP. Ochráňte vaše údaje pred zhromažďovaním
diff --git a/vector/src/main/play/listings/sk/title.txt b/vector/src/main/play/listings/sk/title.txt
new file mode 100644
index 0000000000..dd02c784e8
--- /dev/null
+++ b/vector/src/main/play/listings/sk/title.txt
@@ -0,0 +1 @@
+Element (kedysi Riot.im)
diff --git a/vector/src/main/play/listings/sv/full_description.txt b/vector/src/main/play/listings/sv/full_description.txt
new file mode 100644
index 0000000000..c446568483
--- /dev/null
+++ b/vector/src/main/play/listings/sv/full_description.txt
@@ -0,0 +1,30 @@
+Element är en ny sorts meddelande- och samarbetsapp som:
+
+1. Sätter dig i kontroll för att kunna säkerställa ditt privatliv
+2. Låter dig kommunicera med vem som helst i Matrix-nätverket, och till och med bortom det genom integrationer med appar som Slack
+3. Skyddar dig från reklam, datainsamling och inlåsning
+4. Säkrar dig genom totalsträckskryptering, med korssingering för att verifiera andra
+
+Element skiljer sig helt från andra meddelande- och samarbetsappar genom att vara decentraliserad och öppen källkod.
+
+Element låter dig driva en egen server - eller välja en värd - så att du har sekretess, ägande och kontroll över din data och dina konversationer. Den ger dig tillgång till ett öppet nätverk; så att du inte kan prata bara med Element-användare. Och den är väldigt säker.
+
+Element kan göra allt detta för att den använder Matrix - standarden för öppen decentraliserad kommunikation.
+
+Element sätter dig i kontroll genom att låta dig välja att vara värd för dina konversationer. Från appen Element kan du välja att ansluta på följande sätt:
+
+1. Skaffa ett gratis konto på den publika servern på matrix.org
+2. Var värd för ditt eget konto genom att driva en server på din egen hårdvara
+3. Skapa ett konto på en anpassad server genom att registrera dig på värdplattformen Element Matrix Services
+
+<b>Varför välja Element?</b>
+
+<b>ÄG DIN DATA</b>: Du väljer var du vill ha din data och dina meddelanden. Du äger den och kontrollerar den, inte nåt stort företag som samlar in din data och ger den till tredje parter.
+
+<b>ÖPPEN KOMMUNIKATION OCH ÖPPET SAMARBETE</b>: Du kan chatta med med vem som helst på Matrix-nätverket, oavsett om de använder Element eller en annan Matrix-app, och till och med om de använder ett annat meddelandesystem som Slack, IRC eller XMPP.
+
+<b>SUPERSÄKER</b>: Riktig totalsträckskryptering (bara de in konversationen kan avkryptera meddelandena), och korssingering för att verifiera konversationsmedlemmars enheter.
+
+<b>Komplett kommunikation</b>: Meddelanden, röst- och videosamtal, fildelning, skärmdelning och massa integrationer, bottar och widgets. Skapa rum och gemenskaper, håll kontakten och få saker gjorda.
+
+<b>ÖVERALLT DÄR DU ÄR</b>: Håll kontakten vart du än befinner dig med fullständigt synkroniserad meddelandehistorik på alla dina enheter och på webben på https://app.element.io.
diff --git a/vector/src/main/play/listings/sv/short_description.txt b/vector/src/main/play/listings/sv/short_description.txt
new file mode 100644
index 0000000000..ddfc5dcbfb
--- /dev/null
+++ b/vector/src/main/play/listings/sv/short_description.txt
@@ -0,0 +1 @@
+Säker decentraliserad chatt och VoIP. Håll din data säker från tredje parter.
diff --git a/vector/src/main/play/listings/sv/title.txt b/vector/src/main/play/listings/sv/title.txt
new file mode 100644
index 0000000000..573e27fab9
--- /dev/null
+++ b/vector/src/main/play/listings/sv/title.txt
@@ -0,0 +1 @@
+Element (före detta Riot.im)
diff --git a/vector/src/main/play/listings/tr/short_description.txt b/vector/src/main/play/listings/tr/short_description.txt
new file mode 100644
index 0000000000..f730519d33
--- /dev/null
+++ b/vector/src/main/play/listings/tr/short_description.txt
@@ -0,0 +1 @@
+Güvenli ve merkezsiz sohbet ve VoIP. Verilerinizi üçüncü taraflardan sakının.
diff --git a/vector/src/main/play/listings/tr/title.txt b/vector/src/main/play/listings/tr/title.txt
new file mode 100644
index 0000000000..28088f3da4
--- /dev/null
+++ b/vector/src/main/play/listings/tr/title.txt
@@ -0,0 +1 @@
+Element (eskiden Riot.im)
diff --git a/vector/src/main/play/listings/uk/full_description.txt b/vector/src/main/play/listings/uk/full_description.txt
new file mode 100644
index 0000000000..f0e53e4a0f
--- /dev/null
+++ b/vector/src/main/play/listings/uk/full_description.txt
@@ -0,0 +1,30 @@
+Element — це застосунок для спілкування та співпраці нового типу, який:
+
+1. Надає вам повний контроль за своєю конфіденційністю
+2. Дозволяє спілкування з будь-ким у мережі Matrix та поза нею, інтегруючись із такими застосунками, як Slack
+3. Убезпечує вас від реклами, збору даних та штучних обмежень
+4. Захищає ваше спілкування наскрізним шифруванням із перехресним підписуванням для звірення інших осіб
+
+Element ґрунтовно відрізняється від інших застосунків для спілкування та співпраці тому що він є децентралізованим та відкритоджерельним.
+
+Element дозволяє вам розміщувати сервер в себе або обирати будь-якого з надавачів послуг, таким чином забезпечуючи вам конфіденційність і  можливість володіти власними даними й бесідами та контролювати їх. Він надає вам доступ до відкритої мережі, тож ви не є обмеженими спілкуванням виключно з користувачами Element. І він є дуже надійним та безпечним.
+
+Element здатен забезпечити усе завдяки тому, що він заснований на протоколі Matrix — стандарті для відкритого та децентралізованого спілкування.
+
+Element надає вам повний контроль, дозволяючи обирати з-поміж надавачів послуг, що обслуговують сервери з вашими бесідами. Ви вільні обрати будь-який спосіб розміщення прямо з застосунку Element:
+
+1. Отримати безкоштовний обліковий запис на загальнодоступному сервері matrix.org
+2. Розмістити свій обліковий запис на власному сервері
+3. Зареєструватись на індивідуальному сервері, просто підписавшись на послуги платформи Element Matrix Services
+
+<b>Чому я маю обрати Element?</b>
+
+<b>ВОЛОДІЙТЕ ВАШИМИ ДАНИМИ</b>: Ви вирішуєте де тримати ваші дані та повідомлення. Саме ви володієте ними та контролюєте їх, а не якась Мегакорпорація, що збирає ваші дані та надає стороннім особам доступ до них.
+
+<b>ВІДКРИТІ ОБМІН ПОВІДОМЛЕННЯМИ ТА СПІВПРАЦЯ</b>: Ви можете балакати з будь-ким у мережі Matrix, хоч вони користуються Element, хоч іншим застосунком для Matrix, і навіть якщо вони користуються іншою системою обміну повідомленнями на кшталт Slack, IRC чи XMPP.
+
+<b>НАДБЕЗПЕЧНІСТЬ</b>: Справжнє наскрізне шифрування (лише ваші співрозмовники здатні дешифровувати повідомлення) та перехресне підписування для звірення пристроїв інших учасників бесіди.
+
+<b>ДОВЕРШЕНИЙ ЗВʼЯЗОК</b>: Повідомлення, голосові та відеодзвінки, обмін файлами, розподіл екрану та ціла купа інтеграцій, ботів та знадобів. Створюйте кімнати й спільноти, залишайтесь на зв'язку та завершуйте свої справи.
+
+<b>ДЕ Б ВИ НЕ БУЛИ</b>: Залишайтесь на зв'язку де б ви не були, разом з синхронізовною історією листувань на усіх ваших пристроях та в Інтернеті на https://app.element.io.
diff --git a/vector/src/main/play/listings/uk/short_description.txt b/vector/src/main/play/listings/uk/short_description.txt
new file mode 100644
index 0000000000..116f6f95b7
--- /dev/null
+++ b/vector/src/main/play/listings/uk/short_description.txt
@@ -0,0 +1 @@
+Захищене децентралізоване листування та дзвінки. Тримайте ваші дані в безпеці.
diff --git a/vector/src/main/play/listings/uk/title.txt b/vector/src/main/play/listings/uk/title.txt
new file mode 100644
index 0000000000..88e3f7c573
--- /dev/null
+++ b/vector/src/main/play/listings/uk/title.txt
@@ -0,0 +1 @@
+Element (раніше Riot.im)
diff --git a/vector/src/main/play/listings/zh_Hans/full_description.txt b/vector/src/main/play/listings/zh_Hans/full_description.txt
new file mode 100644
index 0000000000..157198a1ac
--- /dev/null
+++ b/vector/src/main/play/listings/zh_Hans/full_description.txt
@@ -0,0 +1,30 @@
+Element 是一种新型消息和协作应用：
+
+1. 使您可以掌控您的隐私
+2. 使您与 Matrix 网络中的任何人交流，甚至可以通过与其他应用如 Slack 集成
+3. 保护您远离广告，数据挖掘和围墙花园
+4. 通过端到端加密保护您，通过交叉签名验证其他人
+
+Element 与其他消息和协作应用完全不同，因为它是去中心化且开源的。
+
+Element 使您可以自托管 - 或选择托管商 - 因此您拥有您的数据和会话的隐私权，所有权和控制权。它使您可以访问开放网络；因此您可以不仅仅与其他 Element 用户交流。并且它非常安全。
+
+Element 可以做到这些因为它在 Matrix 上运行 - 开放，去中心化通信标准。
+
+Element 通过让您选择谁来托管您的会话使您掌控一切。在 Element 应用中，您可以选择不同的托管方式：
+
+1. 在 matrix.org 公共服务器上获取免费帐户
+2. 在您自己的硬件上运行服务器自托管您的会话
+3. 通过简单地订阅 Element Matrix Services 托管平台在自定义服务器上注册账户
+
+<b>为什么选择 Element？</b>
+
+<b>拥有您的数据</b>：您来决定存放您的数据和消息的位置。拥有并控制它的是您，而不是挖掘您的数据或与第三方分享的巨型企业。
+
+<b>开放消息与协作</b>：您可以与 Matrix 网络中的任何人聊天，不论他们使用 Element 还是其他 Matrix 应用，甚至即使他们在使用不同的消息系统例如 Slack，IRC 或 XMPP。
+
+<b>超级安全</b>：真正的端到端加密（仅有会话中的人可以解密消息），及用于验证会话参与方的设备的交叉签名。
+
+<b>丰富的通信方式</b>：消息，语音和视频通话，文件分享，屏幕分享和大量集成，机器人和小部件。建立房间，社区，保持联系并做好工作。
+
+<b>随时随地</b>：通过在您的全部设备和 https://app.element.io 网页上完全同步的消息历史，无论您在哪里都可以保持联系。
diff --git a/vector/src/main/play/listings/zh_Hans/short_description.txt b/vector/src/main/play/listings/zh_Hans/short_description.txt
new file mode 100644
index 0000000000..87d127335b
--- /dev/null
+++ b/vector/src/main/play/listings/zh_Hans/short_description.txt
@@ -0,0 +1 @@
+安全去中心化的聊天和 VoIP。保护您的数据不受第三方的影响。
diff --git a/vector/src/main/play/listings/zh_Hans/title.txt b/vector/src/main/play/listings/zh_Hans/title.txt
new file mode 100644
index 0000000000..03aecdd2cb
--- /dev/null
+++ b/vector/src/main/play/listings/zh_Hans/title.txt
@@ -0,0 +1 @@
+Element（曾为 Riot.im）
diff --git a/vector/src/main/res/color/primary_text_color_selector.xml b/vector/src/main/res/color/primary_text_color_selector.xml
new file mode 100644
index 0000000000..3ad723c976
--- /dev/null
+++ b/vector/src/main/res/color/primary_text_color_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?riot_primary_text_color" android:state_enabled="true" />
+    <item android:color="?riot_primary_text_color_disabled" android:state_enabled="false" />
+</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/color/primary_text_color_selector_dark.xml b/vector/src/main/res/color/primary_text_color_selector_dark.xml
deleted file mode 100644
index 7c4c853b58..0000000000
--- a/vector/src/main/res/color/primary_text_color_selector_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/riot_primary_text_color_dark" android:state_enabled="true" />
-    <item android:color="@color/riot_primary_text_color_disabled_dark" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/color/primary_text_color_selector_light.xml b/vector/src/main/res/color/primary_text_color_selector_light.xml
deleted file mode 100644
index 8d4c0d06c4..0000000000
--- a/vector/src/main/res/color/primary_text_color_selector_light.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/riot_primary_text_color_light" android:state_enabled="true" />
-    <item android:color="@color/riot_secondary_text_color_light" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/color/primary_text_color_selector_status.xml b/vector/src/main/res/color/primary_text_color_selector_status.xml
deleted file mode 100644
index 9bbc84c321..0000000000
--- a/vector/src/main/res/color/primary_text_color_selector_status.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/riot_primary_text_color_status" android:state_enabled="true" />
-    <item android:color="@color/riot_primary_text_color_disabled_status" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable-hdpi/riotx_logo.png b/vector/src/main/res/drawable-hdpi/riotx_logo.png
deleted file mode 100644
index 8d6e3454b8..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/riotx_logo.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/riotx_logo.png b/vector/src/main/res/drawable-mdpi/riotx_logo.png
deleted file mode 100644
index 5c45ebabaf..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/riotx_logo.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xhdpi/riotx_logo.png b/vector/src/main/res/drawable-xhdpi/riotx_logo.png
deleted file mode 100644
index 651ff38e09..0000000000
Binary files a/vector/src/main/res/drawable-xhdpi/riotx_logo.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_file_download_white.png b/vector/src/main/res/drawable-xxhdpi/ic_file_download_white.png
deleted file mode 100755
index 78aa591668..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/ic_file_download_white.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_report_black.png b/vector/src/main/res/drawable-xxhdpi/ic_report_black.png
deleted file mode 100755
index 8ab8241ae1..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/ic_report_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/newmessages.png b/vector/src/main/res/drawable-xxhdpi/newmessages.png
deleted file mode 100755
index 38d861af0a..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/newmessages.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/riotx_logo.png b/vector/src/main/res/drawable-xxhdpi/riotx_logo.png
deleted file mode 100644
index 1652b970e7..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/riotx_logo.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/scrolldown.png b/vector/src/main/res/drawable-xxhdpi/scrolldown.png
deleted file mode 100755
index abeea3f07f..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/scrolldown.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/riotx_logo.png b/vector/src/main/res/drawable-xxxhdpi/riotx_logo.png
deleted file mode 100644
index fd944daf8f..0000000000
Binary files a/vector/src/main/res/drawable-xxxhdpi/riotx_logo.png and /dev/null differ
diff --git a/vector/src/main/res/drawable/bg_pin_key.xml b/vector/src/main/res/drawable/bg_pin_key.xml
new file mode 100644
index 0000000000..d4a54577be
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_pin_key.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item
+        android:gravity="center">
+        <shape android:shape="oval">
+            <solid android:color="#44FFFFFF" />
+            <size
+                android:width="70dp"
+                android:height="70dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_search_edit_text_black.xml b/vector/src/main/res/drawable/bg_search_edit_text_black.xml
deleted file mode 100644
index 741e3c031c..0000000000
--- a/vector/src/main/res/drawable/bg_search_edit_text_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/riotx_search_background_mobile_black" />
-    <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_search_edit_text_dark.xml b/vector/src/main/res/drawable/bg_search_edit_text_dark.xml
deleted file mode 100644
index d65c331ed2..0000000000
--- a/vector/src/main/res/drawable/bg_search_edit_text_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/riotx_search_background_mobile_dark" />
-    <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_search_edit_text_light.xml b/vector/src/main/res/drawable/bg_search_edit_text_light.xml
deleted file mode 100644
index ba0da29660..0000000000
--- a/vector/src/main/res/drawable/bg_search_edit_text_light.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/riotx_search_background_mobile_light" />
-    <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification_dark.xml b/vector/src/main/res/drawable/bg_unread_notification.xml
similarity index 70%
rename from vector/src/main/res/drawable/bg_unread_notification_dark.xml
rename to vector/src/main/res/drawable/bg_unread_notification.xml
index 7f3669c55f..bba5fcdf2e 100644
--- a/vector/src/main/res/drawable/bg_unread_notification_dark.xml
+++ b/vector/src/main/res/drawable/bg_unread_notification.xml
@@ -5,5 +5,5 @@
 
     <corners android:radius="40dp" />
 
-    <solid android:color="@color/riotx_unread_room_badge_dark" />
+    <solid android:color="?riotx_unread_room_badge" />
 </shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification_black.xml b/vector/src/main/res/drawable/bg_unread_notification_black.xml
deleted file mode 100644
index 7059985f47..0000000000
--- a/vector/src/main/res/drawable/bg_unread_notification_black.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="40dp" />
-
-    <solid android:color="@color/riotx_unread_room_badge_black" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification_light.xml b/vector/src/main/res/drawable/bg_unread_notification_light.xml
deleted file mode 100644
index 944af91a10..0000000000
--- a/vector/src/main/res/drawable/bg_unread_notification_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="40dp" />
-
-    <solid android:color="@color/riotx_unread_room_badge_light" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/direct_chat_circle_black.xml b/vector/src/main/res/drawable/direct_chat_circle_black.xml
deleted file mode 100644
index 3c45c0231f..0000000000
--- a/vector/src/main/res/drawable/direct_chat_circle_black.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <!-- required on android < 4.2 devices -->
-    <solid android:color="@android:color/transparent" />
-
-    <stroke
-        android:width="4dp"
-        android:color="@color/direct_chat_ring_color_black" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/direct_chat_circle_dark.xml b/vector/src/main/res/drawable/direct_chat_circle_dark.xml
deleted file mode 100644
index 1e9a4500f4..0000000000
--- a/vector/src/main/res/drawable/direct_chat_circle_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <!-- required on android < 4.2 devices -->
-    <solid android:color="@android:color/transparent" />
-
-    <stroke
-        android:width="4dp"
-        android:color="@color/direct_chat_ring_color_dark" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/direct_chat_circle_light.xml b/vector/src/main/res/drawable/direct_chat_circle_light.xml
deleted file mode 100644
index 88bb178a9b..0000000000
--- a/vector/src/main/res/drawable/direct_chat_circle_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <!-- required on android < 4.2 devices -->
-    <solid android:color="@android:color/transparent" />
-
-    <stroke
-        android:width="4dp"
-        android:color="@color/direct_chat_ring_color_light" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/direct_chat_circle_status.xml b/vector/src/main/res/drawable/direct_chat_circle_status.xml
deleted file mode 100644
index 2d527d0b4d..0000000000
--- a/vector/src/main/res/drawable/direct_chat_circle_status.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <!-- required on android < 4.2 devices -->
-    <solid android:color="@android:color/transparent" />
-
-    <stroke
-        android:width="4dp"
-        android:color="@color/direct_chat_ring_color_status" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/divider_horizontal_dark.xml b/vector/src/main/res/drawable/divider_horizontal.xml
similarity index 62%
rename from vector/src/main/res/drawable/divider_horizontal_dark.xml
rename to vector/src/main/res/drawable/divider_horizontal.xml
index 24a9307799..ae2f61e60a 100644
--- a/vector/src/main/res/drawable/divider_horizontal_dark.xml
+++ b/vector/src/main/res/drawable/divider_horizontal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size android:height="1dp" />
-    <solid android:color="@color/riotx_header_panel_border_mobile_dark" />
+    <solid android:color="?riotx_header_panel_border_mobile" />
 </shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/divider_horizontal_black.xml b/vector/src/main/res/drawable/divider_horizontal_black.xml
deleted file mode 100644
index 43a68bbe2d..0000000000
--- a/vector/src/main/res/drawable/divider_horizontal_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:height="1dp" />
-    <solid android:color="@color/riotx_header_panel_border_mobile_black" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/divider_horizontal_light.xml b/vector/src/main/res/drawable/divider_horizontal_light.xml
deleted file mode 100644
index 4b215ecaa4..0000000000
--- a/vector/src/main/res/drawable/divider_horizontal_light.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:height="1dp" />
-    <solid android:color="@color/riotx_header_panel_border_mobile_light" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/highlighted_message_background_dark.xml b/vector/src/main/res/drawable/highlighted_message_background.xml
similarity index 90%
rename from vector/src/main/res/drawable/highlighted_message_background_dark.xml
rename to vector/src/main/res/drawable/highlighted_message_background.xml
index 4448f01d0e..5975ff06b3 100644
--- a/vector/src/main/res/drawable/highlighted_message_background_dark.xml
+++ b/vector/src/main/res/drawable/highlighted_message_background.xml
@@ -9,7 +9,7 @@
             <item android:left="6dp" android:right="2dp">
                 <shape>
                     <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
-                    <solid android:color="@color/riotx_header_panel_background_dark" />
+                    <solid android:color="?riotx_header_panel_background" />
                 </shape>
             </item>
 
diff --git a/vector/src/main/res/drawable/highlighted_message_background_black.xml b/vector/src/main/res/drawable/highlighted_message_background_black.xml
deleted file mode 100644
index ebb4c81dd9..0000000000
--- a/vector/src/main/res/drawable/highlighted_message_background_black.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true">
-
-        <layer-list>
-
-            <!-- Draw the BG. -->
-            <item android:left="6dp" android:right="2dp">
-                <shape>
-                    <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
-                    <solid android:color="@color/riotx_header_panel_background_black" />
-                </shape>
-            </item>
-
-            <item android:gravity="start" android:left="2dp">
-                <shape>
-                    <size android:width="4dp" />
-                    <corners android:bottomLeftRadius="40dp" android:topLeftRadius="40dp" />
-                    <solid android:color="@color/riotx_accent" />
-                </shape>
-            </item>
-
-        </layer-list>
-
-    </item>
-
-    <item android:state_checked="false">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/highlighted_message_background_light.xml b/vector/src/main/res/drawable/highlighted_message_background_light.xml
deleted file mode 100644
index 7b53b3ffe3..0000000000
--- a/vector/src/main/res/drawable/highlighted_message_background_light.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true">
-
-        <layer-list>
-
-            <!-- Draw the BG. -->
-            <item android:left="6dp" android:right="2dp">
-                <shape>
-                    <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
-                    <solid android:color="@color/riotx_header_panel_background_light" />
-                </shape>
-            </item>
-
-            <item android:gravity="start" android:left="2dp">
-                <shape>
-                    <size android:width="4dp" />
-                    <corners android:bottomLeftRadius="40dp" android:topLeftRadius="40dp" />
-                    <solid android:color="@color/riotx_accent" />
-                </shape>
-            </item>
-
-        </layer-list>
-
-    </item>
-
-    <item android:state_checked="false">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/ic_integrations.xml b/vector/src/main/res/drawable/ic_integrations.xml
new file mode 100644
index 0000000000..938b6f7d79
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_integrations.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M1,5C1,2.7909 2.7909,1 5,1H19C21.2091,1 23,2.7909 23,5V19C23,21.2091 21.2091,23 19,23H5C2.7909,23 1,21.2091 1,19V5ZM11,7.5C11,9.433 9.433,11 7.5,11C5.567,11 4,9.433 4,7.5C4,5.567 5.567,4 7.5,4C9.433,4 11,5.567 11,7.5ZM7.5,20C9.433,20 11,18.433 11,16.5C11,14.567 9.433,13 7.5,13C5.567,13 4,14.567 4,16.5C4,18.433 5.567,20 7.5,20ZM20,16.5C20,18.433 18.433,20 16.5,20C14.567,20 13,18.433 13,16.5C13,14.567 14.567,13 16.5,13C18.433,13 20,14.567 20,16.5ZM16.5,11C18.433,11 20,9.433 20,7.5C20,5.567 18.433,4 16.5,4C14.567,4 13,5.567 13,7.5C13,9.433 14.567,11 16.5,11Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/line_divider_dark.xml b/vector/src/main/res/drawable/line_divider.xml
similarity index 75%
rename from vector/src/main/res/drawable/line_divider_dark.xml
rename to vector/src/main/res/drawable/line_divider.xml
index ee2a3a0972..004243a214 100644
--- a/vector/src/main/res/drawable/line_divider_dark.xml
+++ b/vector/src/main/res/drawable/line_divider.xml
@@ -6,6 +6,6 @@
         android:width="1dp"
         android:height="1dp" />
 
-    <solid android:color="@color/list_divider_color_dark" />
+    <solid android:color="?list_divider_color" />
 
 </shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/line_divider_light.xml b/vector/src/main/res/drawable/line_divider_light.xml
deleted file mode 100644
index cfaebbda7d..0000000000
--- a/vector/src/main/res/drawable/line_divider_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size
-        android:width="1dp"
-        android:height="1dp" />
-
-    <solid android:color="@color/list_divider_color_light" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_background_room_alias_dark.xml b/vector/src/main/res/drawable/pill_background_room_alias_dark.xml
deleted file mode 100644
index b86cbd3b78..0000000000
--- a/vector/src/main/res/drawable/pill_background_room_alias_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="#343a46" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_background_room_alias_light.xml b/vector/src/main/res/drawable/pill_background_room_alias_light.xml
deleted file mode 100644
index 9a67df1182..0000000000
--- a/vector/src/main/res/drawable/pill_background_room_alias_light.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="#1A000000" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_background_room_alias_status.xml b/vector/src/main/res/drawable/pill_background_room_alias_status.xml
deleted file mode 100644
index 9a67df1182..0000000000
--- a/vector/src/main/res/drawable/pill_background_room_alias_status.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="#1A000000" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_background_user_id_light.xml b/vector/src/main/res/drawable/pill_background_user_id_light.xml
deleted file mode 100644
index 9a67df1182..0000000000
--- a/vector/src/main/res/drawable/pill_background_user_id_light.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="#1A000000" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_background_user_id_status.xml b/vector/src/main/res/drawable/pill_background_user_id_status.xml
deleted file mode 100644
index 9a67df1182..0000000000
--- a/vector/src/main/res/drawable/pill_background_user_id_status.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="#1A000000" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_background_user_id_dark.xml b/vector/src/main/res/drawable/pill_receipt.xml
similarity index 70%
rename from vector/src/main/res/drawable/pill_background_user_id_dark.xml
rename to vector/src/main/res/drawable/pill_receipt.xml
index b86cbd3b78..4ee57ebe61 100644
--- a/vector/src/main/res/drawable/pill_background_user_id_dark.xml
+++ b/vector/src/main/res/drawable/pill_receipt.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="10dp" />
-    <solid android:color="#343a46" />
+    <solid android:color="?riotx_header_panel_border_mobile" />
 </shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_receipt_black.xml b/vector/src/main/res/drawable/pill_receipt_black.xml
deleted file mode 100644
index e63903550d..0000000000
--- a/vector/src/main/res/drawable/pill_receipt_black.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/riotx_header_panel_border_mobile_black" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_receipt_dark.xml b/vector/src/main/res/drawable/pill_receipt_dark.xml
deleted file mode 100644
index 5442f13985..0000000000
--- a/vector/src/main/res/drawable/pill_receipt_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/riotx_header_panel_border_mobile_dark" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_receipt_light.xml b/vector/src/main/res/drawable/pill_receipt_light.xml
deleted file mode 100644
index 66875dc1b1..0000000000
--- a/vector/src/main/res/drawable/pill_receipt_light.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/riotx_header_panel_border_mobile_light" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pin_code_dot_empty.xml b/vector/src/main/res/drawable/pin_code_dot_empty.xml
new file mode 100644
index 0000000000..6ee800a07d
--- /dev/null
+++ b/vector/src/main/res/drawable/pin_code_dot_empty.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <stroke
+        android:color="?riotx_text_secondary"
+        android:width="1px"/>
+
+    <size
+        android:width="24dp"
+        android:height="24dp"/>
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pin_code_dot_fill.xml b/vector/src/main/res/drawable/pin_code_dot_fill.xml
new file mode 100644
index 0000000000..799ea30174
--- /dev/null
+++ b/vector/src/main/res/drawable/pin_code_dot_fill.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="?colorPrimary"/>
+
+    <size
+        android:width="24dp"
+        android:height="24dp"/>
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pin_code_dots.xml b/vector/src/main/res/drawable/pin_code_dots.xml
new file mode 100644
index 0000000000..29e445e511
--- /dev/null
+++ b/vector/src/main/res/drawable/pin_code_dots.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- NOTE: order is important (the first matching state(s) is what is rendered) -->
+    <item
+        android:state_checked="true"
+        android:drawable="@drawable/pin_code_dot_fill"/>
+    <item
+        android:drawable="@drawable/pin_code_dot_empty"/>
+</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/shadow_bottom_dark.xml b/vector/src/main/res/drawable/shadow_bottom_dark.xml
deleted file mode 100644
index f56addee06..0000000000
--- a/vector/src/main/res/drawable/shadow_bottom_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <gradient
-        android:angle="90"
-        android:endColor="#1a1a1a"
-        android:startColor="#212121"
-        android:type="linear" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/shadow_bottom_light.xml b/vector/src/main/res/drawable/shadow_bottom_light.xml
deleted file mode 100755
index c86eaf3b3b..0000000000
--- a/vector/src/main/res/drawable/shadow_bottom_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <gradient
-        android:angle="90"
-        android:endColor="#c0c0c0"
-        android:startColor="#e1e1e1"
-        android:type="linear" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/shadow_top_dark.xml b/vector/src/main/res/drawable/shadow_top_dark.xml
deleted file mode 100644
index 7b2d95e2b6..0000000000
--- a/vector/src/main/res/drawable/shadow_top_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <gradient
-        android:angle="90"
-        android:endColor="#212121"
-        android:startColor="#1a1a1a" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/shadow_top_light.xml b/vector/src/main/res/drawable/shadow_top_light.xml
deleted file mode 100755
index 03412fc414..0000000000
--- a/vector/src/main/res/drawable/shadow_top_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <gradient
-        android:angle="90"
-        android:endColor="#e1e1e1"
-        android:startColor="#d3d3d3" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_background_fab_label.xml b/vector/src/main/res/drawable/vector_background_fab_label.xml
deleted file mode 100644
index 2c13ba76ee..0000000000
--- a/vector/src/main/res/drawable/vector_background_fab_label.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#4d4d4d" />
-    <padding
-        android:bottom="4dp"
-        android:left="16dp"
-        android:right="16dp"
-        android:top="4dp" />
-    <corners android:radius="3dp" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_background_fab_label_light.xml b/vector/src/main/res/drawable/vector_background_fab_label_light.xml
deleted file mode 100644
index b65b9b00cf..0000000000
--- a/vector/src/main/res/drawable/vector_background_fab_label_light.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FFF2F2F2" />
-    <padding
-        android:bottom="4dp"
-        android:left="16dp"
-        android:right="16dp"
-        android:top="4dp" />
-    <corners android:radius="3dp" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_label_background_light.xml b/vector/src/main/res/drawable/vector_label_background.xml
similarity index 66%
rename from vector/src/main/res/drawable/vector_label_background_light.xml
rename to vector/src/main/res/drawable/vector_label_background.xml
index b09b0c7d7d..e721c1dd69 100644
--- a/vector/src/main/res/drawable/vector_label_background_light.xml
+++ b/vector/src/main/res/drawable/vector_label_background.xml
@@ -4,10 +4,10 @@
 
     <corners android:radius="3dp" />
 
-    <solid android:color="@color/riotx_fab_label_bg_light" />
+    <solid android:color="?riotx_fab_label_bg" />
 
     <stroke
         android:width="0.5dp"
-        android:color="#1EFFFFFF" />
+        android:color="?riotx_fab_label_stroke" />
 
 </shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_label_background_black.xml b/vector/src/main/res/drawable/vector_label_background_black.xml
deleted file mode 100644
index dc85b06057..0000000000
--- a/vector/src/main/res/drawable/vector_label_background_black.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="3dp" />
-
-    <solid android:color="@color/riotx_fab_label_bg_black" />
-
-    <stroke
-        android:width="0.5dp"
-        android:color="@color/black" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_label_background_dark.xml b/vector/src/main/res/drawable/vector_label_background_dark.xml
deleted file mode 100644
index 1e375fbf90..0000000000
--- a/vector/src/main/res/drawable/vector_label_background_dark.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="3dp" />
-
-    <solid android:color="@color/riotx_fab_label_bg_dark" />
-
-    <stroke
-        android:width="0.5dp"
-        android:color="@color/black" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_background.xml b/vector/src/main/res/drawable/vector_tabbar_background.xml
new file mode 100644
index 0000000000..a1e1e7ae1f
--- /dev/null
+++ b/vector/src/main/res/drawable/vector_tabbar_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Non focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+
+    <!-- Focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+
+    <!-- Pressed -->
+    <!-- Non focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
+    <item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
+
+    <!-- Focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
+    <item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
+
+</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_background_dark.xml b/vector/src/main/res/drawable/vector_tabbar_background_dark.xml
deleted file mode 100644
index 74b4a8c4c3..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_background_dark.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_background_group_light.xml b/vector/src/main/res/drawable/vector_tabbar_background_group_light.xml
deleted file mode 100644
index 3166002c08..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_background_group_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_background_light.xml b/vector/src/main/res/drawable/vector_tabbar_background_light.xml
deleted file mode 100644
index 432be45bbe..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_background_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_background_status.xml b/vector/src/main/res/drawable/vector_tabbar_background_status.xml
deleted file mode 100644
index f0f38a6439..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_background_status.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background.xml
new file mode 100644
index 0000000000..c4a7ae037c
--- /dev/null
+++ b/vector/src/main/res/drawable/vector_tabbar_selected_background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/riotx_accent" />
+            <padding android:bottom="2dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?tab_bar_selected_background_color" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml
deleted file mode 100644
index ce8ba4eb8d..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/list_divider_color_dark" />
-            <padding android:bottom="1dp" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <padding android:bottom="2dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_selected_background_color_dark" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_group_light.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_group_light.xml
deleted file mode 100644
index a46d469734..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_selected_background_group_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/list_divider_color_light" />
-            <padding android:bottom="1dp" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <padding android:bottom="2dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_groups" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml
deleted file mode 100644
index 9625ac483f..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/list_divider_color_light" />
-            <padding android:bottom="1dp" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <padding android:bottom="2dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_selected_background_color_light" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml
deleted file mode 100644
index ee338a5a39..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/list_divider_color_light" />
-            <padding android:bottom="1dp" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <padding android:bottom="2dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_selected_background_color_status" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_group_light.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background.xml
similarity index 68%
rename from vector/src/main/res/drawable/vector_tabbar_unselected_background_group_light.xml
rename to vector/src/main/res/drawable/vector_tabbar_unselected_background.xml
index b2d360f2e0..72fbda740c 100644
--- a/vector/src/main/res/drawable/vector_tabbar_unselected_background_group_light.xml
+++ b/vector/src/main/res/drawable/vector_tabbar_unselected_background.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/tab_groups" />
+            <solid android:color="?tab_bar_unselected_background_color" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_dark.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background_dark.xml
deleted file mode 100644
index cb302f5111..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_unselected_background_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_unselected_background_color_dark" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml
deleted file mode 100644
index a7a286e724..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_unselected_background_color_light" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml
deleted file mode 100644
index e2c7613c50..0000000000
--- a/vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/tab_bar_unselected_background_color_status" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 7156f91314..3bfb1f5429 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -25,10 +25,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
             android:text="@string/send_bug_report_progress"
             android:textColor="?riotx_text_primary"
             android:visibility="gone"
@@ -41,9 +39,7 @@
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
             android:max="100"
             android:visibility="gone"
             tools:progress="70"
@@ -66,9 +62,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:text="@string/send_bug_report_description"
                     android:textColor="?riotx_text_primary" />
 
@@ -78,10 +72,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:hint="@string/send_bug_report_placeholder"
                     android:textColorHint="?attr/vctr_default_text_hint_color"
                     app:counterEnabled="true"
@@ -100,9 +92,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:text="@string/send_bug_report_description_in_english"
                     android:textColor="?riotx_text_secondary"
                     android:textSize="12sp" />
@@ -112,10 +102,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:text="@string/send_bug_report_logs_description"
                     android:textColor="?riotx_text_primary" />
 
@@ -124,9 +112,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:checked="true"
                     android:text="@string/send_bug_report_include_logs" />
 
@@ -135,9 +121,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:checked="true"
                     android:text="@string/send_bug_report_include_crash_logs" />
 
@@ -146,9 +130,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:checked="true"
                     android:text="@string/send_bug_report_include_screenshot" />
 
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index 39d0bef790..b2af9f8a9d 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -28,31 +28,38 @@
 
     <TextView
         android:id="@+id/participantNameText"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:gravity="center"
         android:textColor="?riotx_text_primary"
-        android:textSize="20sp"
+        android:textSize="28sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/callTypeText"
-        tools:text="Joe" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="@sample/matrix.json/data/displayName" />
 
     <TextView
         android:id="@+id/callTypeText"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:gravity="center"
         android:textColor="?riotx_text_secondary"
-        android:textSize="12sp"
+        android:textSize="22sp"
         app:layout_constraintBottom_toTopOf="@id/otherMemberAvatar"
-        tools:text="Video Call" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="@string/action_video_call" />
 
     <ImageView
         android:id="@+id/otherMemberAvatar"
-        android:layout_width="128dp"
-        android:layout_height="128dp"
-        android:layout_centerVertical="true"
+        android:layout_width="160dp"
+        android:layout_height="160dp"
         android:contentDescription="@string/avatar"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -64,21 +71,25 @@
 
     <TextView
         android:id="@+id/callStatusText"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:gravity="center"
         android:textColor="?riotx_text_secondary"
-        android:textSize="12sp"
+        android:textSize="22sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/otherMemberAvatar"
-        tools:text="Connecting..." />
+        tools:text="@string/call_connecting" />
 
     <ProgressBar
         android:id="@+id/callConnectingProgress"
         style="?android:attr/progressBarStyle"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
@@ -91,7 +102,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="visible"
-        app:constraint_referenced_ids="participantNameText, callTypeText, otherMemberAvatar, callStatusText" />
+        app:constraint_referenced_ids="participantNameText,callTypeText,otherMemberAvatar,callStatusText" />
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/callVideoGroup"
@@ -101,8 +112,7 @@
         app:constraint_referenced_ids="pip_video_view, fullscreen_video_view"
         tools:visibility="invisible" />
 
-
-    <im.vector.riotx.features.call.CallControlsView
+    <im.vector.app.features.call.CallControlsView
         android:id="@+id/callControls"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
index 16c0ae3c8b..332810063f 100644
--- a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
+++ b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
@@ -4,11 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="im.vector.riotx.features.reactions.EmojiReactionPickerActivity">
+    tools:context=".features.reactions.EmojiReactionPickerActivity">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/emojiPickerWholeListFragmentContainer"
-        android:name="im.vector.riotx.features.reactions.EmojiChooserFragment"
+        android:name="im.vector.app.features.reactions.EmojiChooserFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
@@ -16,7 +16,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/emojiPickerFilteredListFragmentContainer"
-        android:name="im.vector.riotx.features.reactions.EmojiSearchResultFragment"
+        android:name="im.vector.app.features.reactions.EmojiSearchResultFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/activity_jitsi.xml b/vector/src/main/res/layout/activity_jitsi.xml
new file mode 100644
index 0000000000..e0359d220d
--- /dev/null
+++ b/vector/src/main/res/layout/activity_jitsi.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/jitsi_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black">
+
+    <!-- Note: A org.jitsi.meet.sdk.JitsiMeetView will be added here -->
+
+    <LinearLayout
+        android:id="@+id/jitsi_progress_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ProgressBar
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:indeterminate="true" />
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_vector_web_view.xml b/vector/src/main/res/layout/activity_vector_web_view.xml
index 8a5633acbc..8a0275b721 100644
--- a/vector/src/main/res/layout/activity_vector_web_view.xml
+++ b/vector/src/main/res/layout/activity_vector_web_view.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="im.vector.riotx.features.webview.VectorWebViewActivity">
+    tools:context=".features.webview.VectorWebViewActivity">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/webview_toolbar"
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 7098c3152d..7a2e81a6ce 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -23,11 +23,11 @@
         android:id="@+id/ivIcon"
         android:layout_width="24dp"
         android:layout_height="24dp"
+        android:src="@drawable/ic_shield_warning"
         app:layout_constraintCircle="@+id/ivUserAvatar"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="20dp"
         tools:ignore="MissingConstraints"
-        android:src="@drawable/ic_shield_warning"
         tools:visibility="visible" />
 
     <LinearLayout
@@ -47,7 +47,6 @@
             android:layout_marginStart="@dimen/alerter_padding_half"
             android:layout_marginEnd="@dimen/alerter_padding_half"
             android:paddingStart="@dimen/alerter_padding_small"
-            android:paddingLeft="@dimen/alerter_padding_small"
             android:paddingEnd="@dimen/alerter_padding_small"
             android:textAppearance="@style/AlertTextAppearance.Title"
             android:visibility="gone"
@@ -60,15 +59,14 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/alerter_padding_half"
             android:layout_marginEnd="@dimen/alerter_padding_half"
+            android:maxLines="3"
             android:paddingStart="@dimen/alerter_padding_small"
-            android:paddingLeft="@dimen/alerter_padding_small"
             android:paddingTop="@dimen/alerter_padding_small"
             android:paddingEnd="@dimen/alerter_padding_small"
             android:paddingBottom="@dimen/alerter_padding_small"
             android:textAppearance="@style/AlertTextAppearance.Text"
             android:visibility="gone"
             tools:text="Text"
-            android:maxLines="3"
             tools:visibility="visible" />
 
     </LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_call_controls.xml b/vector/src/main/res/layout/bottom_sheet_call_controls.xml
index c9fc1cdad4..85dee93957 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_controls.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_controls.xml
@@ -8,7 +8,7 @@
     android:background="?riotx_bottom_sheet_background"
     android:orientation="vertical">
 
-    <im.vector.riotx.core.ui.views.BottomSheetActionButton
+    <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/callControlsSoundDevice"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
         app:tint="?attr/riotx_text_primary"
         tools:actionDescription="Speaker" />
 
-    <im.vector.riotx.core.ui.views.BottomSheetActionButton
+    <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/callControlsSwitchCamera"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
         app:tint="?attr/riotx_text_primary"
         tools:actionDescription="Front" />
 
-    <im.vector.riotx.core.ui.views.BottomSheetActionButton
+    <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/callControlsToggleSDHD"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index 6bf5d5d240..c109e821cb 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -64,7 +64,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
             android:textColor="?riotx_text_secondary"
             tools:text="@string/keys_backup_info_keys_all_backup_up" />
 
@@ -82,7 +81,7 @@
             android:layout_height="wrap_content" />
     </LinearLayout>
 
-    <im.vector.riotx.features.workers.signout.SignoutBottomSheetActionButton
+    <im.vector.app.features.workers.signout.SignoutBottomSheetActionButton
         android:id="@+id/setupRecoveryButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -92,7 +91,7 @@
         app:textColor="?riotx_text_secondary" />
 
 
-    <im.vector.riotx.features.workers.signout.SignoutBottomSheetActionButton
+    <im.vector.app.features.workers.signout.SignoutBottomSheetActionButton
         android:id="@+id/setupMegolmBackupButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -101,7 +100,7 @@
         app:leftIcon="@drawable/backup_keys"
         app:textColor="?riotx_text_secondary" />
 
-    <im.vector.riotx.features.workers.signout.SignoutBottomSheetActionButton
+    <im.vector.app.features.workers.signout.SignoutBottomSheetActionButton
         android:id="@+id/exportManuallyButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -110,7 +109,7 @@
         app:leftIcon="@drawable/ic_download"
         app:textColor="?riotx_text_secondary" />
 
-    <im.vector.riotx.features.workers.signout.SignoutBottomSheetActionButton
+    <im.vector.app.features.workers.signout.SignoutBottomSheetActionButton
         android:id="@+id/exitAnywayButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -119,7 +118,7 @@
         app:leftIcon="@drawable/ic_material_leave"
         app:textColor="@color/riotx_destructive_accent" />
 
-    <im.vector.riotx.features.workers.signout.SignoutBottomSheetActionButton
+    <im.vector.app.features.workers.signout.SignoutBottomSheetActionButton
         android:id="@+id/signOutButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index e4df4b5c9a..56459e90d6 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -51,7 +51,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -99,7 +98,6 @@
             android:id="@+id/widgetPermissionDecline"
             style="@style/VectorButtonStyleDestructive"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
-            android:layout_marginRight="@dimen/layout_vertical_margin"
             android:text="@string/decline"
             android:textAllCaps="true" />
 
@@ -107,7 +105,6 @@
             android:id="@+id/widgetPermissionContinue"
             style="@style/VectorButtonStylePositive"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
-            android:layout_marginRight="@dimen/layout_vertical_margin"
             android:minWidth="160dp"
             android:text="@string/_continue"
             android:textAllCaps="true" />
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index b6fb49178d..4f528e6ef4 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -35,9 +35,9 @@
         android:foreground="?attr/selectableItemBackground"
         android:minHeight="50dp"
         android:orientation="horizontal"
-        android:paddingLeft="@dimen/layout_horizontal_margin"
+        android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingTop="8dp"
-        android:paddingRight="@dimen/layout_horizontal_margin"
+        android:paddingEnd="@dimen/layout_horizontal_margin"
         android:paddingBottom="8dp">
 
         <ImageView
@@ -45,7 +45,6 @@
             android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:src="@drawable/ic_material_share"
             android:tint="?colorAccent" />
 
@@ -66,9 +65,9 @@
         android:foreground="?attr/selectableItemBackground"
         android:minHeight="50dp"
         android:orientation="horizontal"
-        android:paddingLeft="@dimen/layout_horizontal_margin"
+        android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingTop="8dp"
-        android:paddingRight="@dimen/layout_horizontal_margin"
+        android:paddingEnd="@dimen/layout_horizontal_margin"
         android:paddingBottom="8dp">
 
         <ImageView
@@ -76,7 +75,6 @@
             android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:src="@drawable/ic_material_save"
             android:tint="?colorAccent" />
 
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
index 070e9ee575..9b84f0292f 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
@@ -156,7 +156,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/attachmentButton" />
 
-    <im.vector.riotx.features.home.room.detail.composer.ComposerEditText
+    <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
         style="@style/ComposerEditTextStyle"
         android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
index f2bf8e177f..00f1830b1d 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
@@ -40,7 +40,6 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toTopOf="@id/composer_related_message_action_image"
@@ -105,11 +104,9 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="4dp"
         app:layout_goneMarginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/composer_shield"
@@ -166,7 +163,7 @@
         app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
         app:layout_constraintVertical_bias="1" />
 
-    <im.vector.riotx.features.home.room.detail.composer.ComposerEditText
+    <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
         style="@style/ComposerEditTextStyle"
         android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/custom_action_item_layout_badge.xml b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
new file mode 100644
index 0000000000..f47eaa5d1a
--- /dev/null
+++ b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="?attr/actionButtonStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    android:focusable="true">
+
+    <ImageView
+        android:id="@+id/action_view_icon_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_integrations"
+        android:tint="@color/riotx_accent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/cart_badge"
+        android:layout_width="12dp"
+        android:layout_height="12dp"
+        android:background="@drawable/bg_unread_highlight"
+        android:gravity="center"
+        android:textColor="@android:color/white"
+        android:textSize="8sp"
+        app:layout_constraintCircle="@+id/action_view_icon_image"
+        app:layout_constraintCircleAngle="45"
+        app:layout_constraintCircleRadius="12dp"
+        tools:ignore="MissingConstraints"
+        tools:text="8" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/dialog_base_edit_text.xml b/vector/src/main/res/layout/dialog_base_edit_text.xml
index 98dc398042..1c4695a815 100644
--- a/vector/src/main/res/layout/dialog_base_edit_text.xml
+++ b/vector/src/main/res/layout/dialog_base_edit_text.xml
@@ -5,10 +5,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
-    android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding">
+    android:paddingEnd="?dialogPreferredPadding">
 
     <EditText
         android:id="@+id/editText"
diff --git a/vector/src/main/res/layout/dialog_change_password.xml b/vector/src/main/res/layout/dialog_change_password.xml
index 840f67c715..c1213aacfd 100644
--- a/vector/src/main/res/layout/dialog_change_password.xml
+++ b/vector/src/main/res/layout/dialog_change_password.xml
@@ -6,10 +6,8 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
-    android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding">
+    android:paddingEnd="?dialogPreferredPadding">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
index 859eda2010..5a4e90be16 100644
--- a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
+++ b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
@@ -6,18 +6,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
     android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding"
     android:paddingBottom="12dp">
 
     <TextView
         android:id="@+id/dialogConfirmationText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:text="@string/delete_event_dialog_content"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/delete_event_dialog_content" />
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/dialogReasonCheck"
@@ -34,12 +32,12 @@
         style="@style/VectorTextInputLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        tools:hint="@string/delete_event_dialog_reason_hint"
         app:counterEnabled="true"
         app:counterMaxLength="240"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/dialogReasonCheck">
+        app:layout_constraintTop_toBottomOf="@+id/dialogReasonCheck"
+        tools:hint="@string/delete_event_dialog_reason_hint">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/dialogReasonInput"
diff --git a/vector/src/main/res/layout/dialog_device_verify.xml b/vector/src/main/res/layout/dialog_device_verify.xml
index a91a6a23f9..75255c05d8 100644
--- a/vector/src/main/res/layout/dialog_device_verify.xml
+++ b/vector/src/main/res/layout/dialog_device_verify.xml
@@ -9,10 +9,8 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingStart="?dialogPreferredPadding"
-        android:paddingLeft="?dialogPreferredPadding"
         android:paddingTop="12dp"
-        android:paddingEnd="?dialogPreferredPadding"
-        android:paddingRight="?dialogPreferredPadding">
+        android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
             android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/dialog_edit_power_level.xml b/vector/src/main/res/layout/dialog_edit_power_level.xml
index 264563746d..e4cdbd9f08 100644
--- a/vector/src/main/res/layout/dialog_edit_power_level.xml
+++ b/vector/src/main/res/layout/dialog_edit_power_level.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
-    android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding">
+    android:paddingEnd="?dialogPreferredPadding">
 
     <RadioGroup
         android:id="@+id/powerLevelRadioGroup"
@@ -50,9 +47,9 @@
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/powerLevelCustomEditLayout"
         style="@style/VectorTextInputLayout"
-        android:hint="@string/power_level_custom_no_value"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:hint="@string/power_level_custom_no_value">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/powerLevelCustomEdit"
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index f0c9438f1a..67ccd89b11 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -6,10 +6,8 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
     android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding"
     android:paddingBottom="12dp">
 
     <TextView
diff --git a/vector/src/main/res/layout/dialog_import_e2e_keys.xml b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
index c42d63719d..56d276f3f0 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -6,10 +6,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
     android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding"
     android:paddingBottom="12dp">
 
     <TextView
diff --git a/vector/src/main/res/layout/dialog_prompt_password.xml b/vector/src/main/res/layout/dialog_prompt_password.xml
index 3fa5f4a867..081ce9cdae 100644
--- a/vector/src/main/res/layout/dialog_prompt_password.xml
+++ b/vector/src/main/res/layout/dialog_prompt_password.xml
@@ -10,10 +10,8 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingStart="?dialogPreferredPadding"
-        android:paddingLeft="?dialogPreferredPadding"
         android:paddingTop="12dp"
-        android:paddingEnd="?dialogPreferredPadding"
-        android:paddingRight="?dialogPreferredPadding">
+        android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
             android:layout_width="match_parent"
@@ -44,7 +42,6 @@
                     android:inputType="textPassword"
                     android:maxLines="1"
                     android:paddingEnd="48dp"
-                    android:paddingRight="48dp"
                     tools:ignore="RtlSymmetry"
                     tools:text="abc" />
 
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index 31a0255848..36c9a68077 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -5,10 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
     android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding"
     android:paddingBottom="12dp">
 
     <LinearLayout
diff --git a/vector/src/main/res/layout/dialog_report_content.xml b/vector/src/main/res/layout/dialog_report_content.xml
index dda84fe02d..c92394e8b5 100644
--- a/vector/src/main/res/layout/dialog_report_content.xml
+++ b/vector/src/main/res/layout/dialog_report_content.xml
@@ -6,10 +6,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
-    android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding">
+    android:paddingEnd="?dialogPreferredPadding">
 
     <com.google.android.material.textfield.TextInputLayout
         style="@style/VectorTextInputLayout"
diff --git a/vector/src/main/res/layout/dialog_select_text_size.xml b/vector/src/main/res/layout/dialog_select_text_size.xml
index 9ab63ca543..1a3bd91485 100644
--- a/vector/src/main/res/layout/dialog_select_text_size.xml
+++ b/vector/src/main/res/layout/dialog_select_text_size.xml
@@ -6,10 +6,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingStart="?dialogPreferredPadding"
-    android:paddingLeft="?dialogPreferredPadding"
     android:paddingTop="12dp"
     android:paddingEnd="?dialogPreferredPadding"
-    android:paddingRight="?dialogPreferredPadding"
     tools:ignore="SpUsage">
 
     <!-- keep the sizes in dp -->
diff --git a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
index 3c1abc11a2..0c6fad871e 100644
--- a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
+++ b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
@@ -9,10 +9,8 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingStart="?dialogPreferredPadding"
-        android:paddingLeft="?dialogPreferredPadding"
         android:paddingTop="12dp"
-        android:paddingEnd="?dialogPreferredPadding"
-        android:paddingRight="?dialogPreferredPadding">
+        android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
             android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/emoji_chooser_fragment.xml b/vector/src/main/res/layout/emoji_chooser_fragment.xml
index 586411f3d5..a1537deb9c 100644
--- a/vector/src/main/res/layout/emoji_chooser_fragment.xml
+++ b/vector/src/main/res/layout/emoji_chooser_fragment.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbars="vertical"
-    tools:context="im.vector.riotx.features.reactions.EmojiChooserFragment"
+    tools:context=".features.reactions.EmojiChooserFragment"
     tools:itemCount="100"
     tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
     tools:listitem="@layout/grid_item_emoji"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
index 37e7292366..d579bab4f3 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
@@ -32,7 +32,7 @@
         android:layout_height="1dp"
         android:background="?attr/vctr_list_divider_color" />
 
-    <im.vector.riotx.core.ui.views.BottomSheetActionButton
+    <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/bootstrapConclusionContinue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index f63a223091..94c8de9650 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -41,7 +41,7 @@
 
         <!-- This is inside the TIL, if not the keyboard will hide it when in bottomsheet -->
 
-        <im.vector.riotx.core.ui.views.PasswordStrengthBar
+        <im.vector.app.core.ui.views.PasswordStrengthBar
             android:id="@+id/ssss_passphrase_security_progress"
             android:layout_width="match_parent"
             android:layout_height="4dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index 140b3a5382..a1669ccd5e 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -38,7 +38,7 @@
         android:layout_height="1dp"
         android:background="?attr/vctr_list_divider_color" />
 
-    <im.vector.riotx.core.ui.views.BottomSheetActionButton
+    <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/recoveryCopy"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
         android:layout_height="1dp"
         android:background="?attr/vctr_list_divider_color" />
 
-    <im.vector.riotx.core.ui.views.BottomSheetActionButton
+    <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/recoverySave"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
         android:layout_height="1dp"
         android:background="?attr/vctr_list_divider_color" />
 
-    <im.vector.riotx.core.ui.views.BottomSheetActionButton
+    <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/recoveryContinue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index 60d20942e1..14a4b45ded 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -25,7 +25,7 @@
         android:layout_marginTop="@dimen/layout_vertical_margin"
         android:background="?attr/vctr_list_divider_color" />
 
-    <im.vector.riotx.core.ui.views.BottomSheetActionButton
+    <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/bootstrapSetupSecureSubmit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
         app:rightIcon="@drawable/ic_arrow_right"
         app:tint="?colorAccent" />
 
-    <im.vector.riotx.core.ui.views.BottomSheetActionButton
+    <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/bootstrapSetupSecureUseSecurityKey"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
-    <im.vector.riotx.core.ui.views.BottomSheetActionButton
+    <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/bootstrapSetupSecureUseSecurityPassphrase"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_create_direct_room.xml b/vector/src/main/res/layout/fragment_create_direct_room.xml
index 10ba583336..8d2bc68fa8 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room.xml
@@ -58,7 +58,7 @@
 
         </androidx.appcompat.widget.Toolbar>
 
-        <im.vector.riotx.core.platform.MaxHeightScrollView
+        <im.vector.app.core.platform.MaxHeightScrollView
             android:id="@+id/chipGroupScrollView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
                 android:layout_height="wrap_content"
                 app:lineSpacing="2dp" />
 
-        </im.vector.riotx.core.platform.MaxHeightScrollView>
+        </im.vector.app.core.platform.MaxHeightScrollView>
 
         <EditText
             android:id="@+id/createDirectRoomFilter"
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index 978921ecc9..a03f4dba00 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -73,7 +73,6 @@
                     android:inputType="textPassword"
                     android:maxLines="1"
                     android:paddingEnd="48dp"
-                    android:paddingRight="48dp"
                     tools:ignore="RtlSymmetry" />
 
             </com.google.android.material.textfield.TextInputLayout>
diff --git a/vector/src/main/res/layout/fragment_generic_state_view_recycler.xml b/vector/src/main/res/layout/fragment_generic_state_view_recycler.xml
index 410373b97f..6809dcee19 100644
--- a/vector/src/main/res/layout/fragment_generic_state_view_recycler.xml
+++ b/vector/src/main/res/layout/fragment_generic_state_view_recycler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<im.vector.riotx.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
+<im.vector.app.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/genericStateViewListStateView"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -10,4 +10,4 @@
         android:layout_height="match_parent"
         android:overScrollMode="always" />
 
-</im.vector.riotx.core.platform.StateView>
+</im.vector.app.core.platform.StateView>
diff --git a/vector/src/main/res/layout/fragment_group_list.xml b/vector/src/main/res/layout/fragment_group_list.xml
index 481c02a323..cdf0ffeb9a 100644
--- a/vector/src/main/res/layout/fragment_group_list.xml
+++ b/vector/src/main/res/layout/fragment_group_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<im.vector.riotx.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
+<im.vector.app.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/stateView"
     android:layout_width="match_parent"
@@ -12,4 +12,4 @@
         android:overScrollMode="always"
         tools:listitem="@layout/item_group" />
 
-</im.vector.riotx.core.platform.StateView>
+</im.vector.app.core.platform.StateView>
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 75843a2ec6..83bb9994f8 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -45,7 +45,7 @@
 
     </androidx.appcompat.widget.Toolbar>
 
-    <im.vector.riotx.features.sync.widget.SyncStateView
+    <im.vector.app.features.sync.widget.SyncStateView
         android:id="@+id/syncStateView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/groupToolbar" />
 
-    <im.vector.riotx.core.ui.views.KeysBackupBanner
+    <im.vector.app.core.ui.views.KeysBackupBanner
         android:id="@+id/homeKeysBackupBanner"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/syncStateView" />
 
-    <im.vector.riotx.core.ui.views.ActiveCallView
+    <im.vector.app.core.ui.views.ActiveCallView
         android:id="@+id/activeCallView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 377c3ed17c..e09e26c575 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -32,7 +32,6 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginLeft="@dimen/layout_horizontal_margin"
             android:layout_marginTop="24dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
index 3592ff074d..cdbc6d11de 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
@@ -42,7 +42,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             app:errorEnabled="true"
             app:layout_constraintEnd_toStartOf="@+id/keys_backup_import"
@@ -91,7 +90,6 @@
             style="@style/VectorButtonStyle"
             android:layout_marginTop="@dimen/layout_vertical_margin_big"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            android:layout_marginRight="@dimen/layout_horizontal_margin"
             android:minWidth="200dp"
             android:text="@string/keys_backup_unlock_button"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index fe1e6efe78..4a963c590e 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -42,7 +42,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             app:errorEnabled="true"
             app:layout_constraintEnd_toStartOf="@id/keys_backup_view_show_password"
@@ -91,7 +90,6 @@
             style="@style/VectorButtonStyle"
             android:layout_marginTop="@dimen/layout_vertical_margin_big"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            android:layout_marginRight="@dimen/layout_horizontal_margin"
             android:layout_marginBottom="@dimen/layout_vertical_margin_big"
             android:minWidth="200dp"
             android:text="@string/keys_backup_unlock_button"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index a46b97537c..9e056aacea 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -42,7 +42,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/keys_backup_restore_success"
-        tools:text="@string/keys_backup_restore_success_description" />
+        tools:text="Restored a backup with 34 keys.\n22 new keys have been added to this session." />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/keys_backup_setup_done_button"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index d690aa777d..d9b6275e61 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -66,7 +66,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginLeft="16dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:text="@string/keys_backup_setup_step1_advanced"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index eb70487220..fe8db20f4e 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -52,7 +52,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             app:errorEnabled="true"
             app:layout_constraintEnd_toStartOf="@id/keys_backup_view_show_password"
@@ -82,7 +81,7 @@
             app:layout_constraintStart_toEndOf="@id/keys_backup_passphrase_enter_til"
             app:layout_constraintTop_toTopOf="@id/keys_backup_passphrase_enter_til" />
 
-        <im.vector.riotx.core.ui.views.PasswordStrengthBar
+        <im.vector.app.core.ui.views.PasswordStrengthBar
             android:id="@+id/keys_backup_passphrase_security_progress"
             android:layout_width="0dp"
             android:layout_height="4dp"
@@ -97,7 +96,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             android:layout_weight="1"
             app:errorEnabled="true"
@@ -120,7 +118,6 @@
             style="@style/VectorButtonStyle"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:text="@string/keys_backup_setup_step2_button_title"
             android:textColor="@android:color/white"
             app:layout_constraintEnd_toEndOf="parent"
@@ -132,10 +129,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:text="@string/keys_backup_setup_step1_recovery_key_alternative"
             android:textAlignment="center"
             android:textColor="?riotx_text_primary"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index bc92335ce0..7d3d821daf 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -26,9 +26,9 @@
             android:id="@+id/keys_backup_setup_step3_success_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/layout_horizontal_margin"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="@dimen/layout_horizontal_margin"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:text="@string/keys_backup_setup_step3_success_title"
             android:textAlignment="center"
             android:textColor="?riotx_text_primary"
@@ -42,9 +42,9 @@
             android:id="@+id/keys_backup_setup_step3_line1_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/layout_horizontal_margin"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="@dimen/layout_horizontal_margin"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:text="@string/keys_backup_setup_step3_text_line1"
             android:textAlignment="center"
             android:textColor="?riotx_text_primary"
@@ -54,9 +54,9 @@
             android:id="@+id/keys_backup_setup_step3_line2_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/layout_horizontal_margin"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="@dimen/layout_horizontal_margin"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:textAlignment="center"
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
diff --git a/vector/src/main/res/layout/fragment_known_users.xml b/vector/src/main/res/layout/fragment_known_users.xml
index 760fd8eb5b..bb8cbd2443 100644
--- a/vector/src/main/res/layout/fragment_known_users.xml
+++ b/vector/src/main/res/layout/fragment_known_users.xml
@@ -58,7 +58,7 @@
 
         </androidx.appcompat.widget.Toolbar>
 
-        <im.vector.riotx.core.platform.MaxHeightScrollView
+        <im.vector.app.core.platform.MaxHeightScrollView
             android:id="@+id/chipGroupScrollView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
                 android:layout_height="wrap_content"
                 app:lineSpacing="2dp" />
 
-        </im.vector.riotx.core.platform.MaxHeightScrollView>
+        </im.vector.app.core.platform.MaxHeightScrollView>
 
         <EditText
             android:id="@+id/knownUsersFilter"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 794048f3b3..608041ec03 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -82,7 +82,6 @@
                         android:inputType="textPassword"
                         android:maxLines="1"
                         android:paddingEnd="48dp"
-                        android:paddingRight="48dp"
                         tools:ignore="RtlSymmetry" />
 
                 </com.google.android.material.textfield.TextInputLayout>
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index e2e908cf29..098bd047a9 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -72,7 +72,6 @@
                         android:inputType="textPassword"
                         android:maxLines="1"
                         android:paddingEnd="48dp"
-                        android:paddingRight="48dp"
                         tools:ignore="RtlSymmetry" />
 
                 </com.google.android.material.textfield.TextInputLayout>
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index b33174bae3..3917dd72dd 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -39,7 +39,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/loginServerTitle" />
 
             <!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
-            <im.vector.riotx.core.platform.CheckableConstraintLayout
+            <im.vector.app.core.platform.CheckableConstraintLayout
                 android:id="@+id/loginServerChoiceMatrixOrg"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -78,10 +78,10 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrgIcon" />
 
-            </im.vector.riotx.core.platform.CheckableConstraintLayout>
+            </im.vector.app.core.platform.CheckableConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/loginServerChoiceEMS"
+                android:id="@+id/loginServerChoiceEms"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -95,19 +95,19 @@
                 app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrg">
 
                 <ImageView
-                    android:id="@+id/loginServerChoiceEMSIcon"
+                    android:id="@+id/loginServerChoiceEmsIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
                     android:src="@drawable/ic_logo_element_matrix_services"
                     android:tint="?riotx_text_primary"
-                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceEMSText"
+                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceEmsText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
 
                 <TextView
-                    android:id="@+id/loginServerChoiceEMSText"
+                    android:id="@+id/loginServerChoiceEmsText"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="7dp"
@@ -115,21 +115,21 @@
                     android:text="@string/login_server_modular_text"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEMSLearnMore"
+                    app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEmsLearnMore"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEMSIcon" />
+                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEmsIcon" />
 
                 <TextView
-                    android:id="@+id/loginServerChoiceEMSLearnMore"
+                    android:id="@+id/loginServerChoiceEmsLearnMore"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
                     android:text="@string/login_server_modular_learn_more"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                     android:textColor="@color/riotx_accent"
-                    app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEMSText"
+                    app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEMSText" />
+                    app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEmsText" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -145,7 +145,7 @@
                 android:paddingEnd="@dimen/layout_horizontal_margin"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEMS">
+                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEms">
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
diff --git a/vector/src/main/res/layout/fragment_pin.xml b/vector/src/main/res/layout/fragment_pin.xml
new file mode 100644
index 0000000000..0672ce4c7e
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_pin.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rootConstraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/pinFragmentContainer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index de448f3b8b..933bcf86aa 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -48,7 +48,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
             android:minHeight="@dimen/layout_touch_size"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index e607c2270d..cc3efbf4f4 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -88,7 +88,7 @@
         app:barrierDirection="top"
         app:constraint_referenced_ids="composerLayout,notificationAreaView" />
 
-    <im.vector.riotx.features.sync.widget.SyncStateView
+    <im.vector.app.features.sync.widget.SyncStateView
         android:id="@+id/syncStateView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/roomToolbar" />
 
-    <im.vector.riotx.core.ui.views.ActiveCallView
+    <im.vector.app.core.ui.views.ActiveCallView
         android:id="@+id/activeCallView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -104,6 +104,14 @@
         app:layout_constraintTop_toBottomOf="@id/syncStateView"
         tools:visibility="visible" />
 
+    <im.vector.app.core.ui.views.ActiveConferenceView
+        android:id="@+id/activeConferenceView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintTop_toBottomOf="@id/activeCallView"
+        tools:visibility="visible" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="0dp"
@@ -112,7 +120,7 @@
         app:layout_constraintBottom_toTopOf="@+id/recyclerViewBarrier"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/activeCallView"
+        app:layout_constraintTop_toBottomOf="@id/activeConferenceView"
         tools:listitem="@layout/item_timeline_event_base" />
 
     <FrameLayout
@@ -121,19 +129,19 @@
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/activeCallView">
+        app:layout_constraintTop_toBottomOf="@id/activeConferenceView">
 
-        <im.vector.riotx.features.home.room.detail.widget.RoomWidgetsBannerView
-            android:id="@+id/roomWidgetsBannerView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:visibility="gone"
-            tools:visibility="visible" />
+        <!--        <im.vector.app.features.home.room.detail.widget.RoomWidgetsBannerView-->
+        <!--            android:id="@+id/roomWidgetsBannerView"-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginStart="8dp"-->
+        <!--            android:layout_marginTop="8dp"-->
+        <!--            android:layout_marginEnd="8dp"-->
+        <!--            android:visibility="gone"-->
+        <!--            tools:visibility="visible" />-->
 
-        <im.vector.riotx.core.ui.views.JumpToReadMarkerView
+        <im.vector.app.core.ui.views.JumpToReadMarkerView
             android:id="@+id/jumpToReadMarkerView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -142,7 +150,7 @@
 
     </FrameLayout>
 
-    <im.vector.riotx.core.ui.views.NotificationAreaView
+    <im.vector.app.core.ui.views.NotificationAreaView
         android:id="@+id/notificationAreaView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -151,7 +159,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <im.vector.riotx.features.home.room.detail.composer.TextComposerView
+    <im.vector.app.features.home.room.detail.composer.TextComposerView
         android:id="@+id/composerLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -161,7 +169,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <im.vector.riotx.features.invite.VectorInviteView
+    <im.vector.app.features.invite.VectorInviteView
         android:id="@+id/inviteView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -190,7 +198,7 @@
         android:focusable="true"
         app:cardCornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/activeCallView">
+        app:layout_constraintTop_toBottomOf="@id/activeConferenceView">
 
         <org.webrtc.SurfaceViewRenderer
             android:id="@+id/activeCallPiP"
@@ -200,7 +208,7 @@
             tools:visibility="visible" />
     </androidx.cardview.widget.CardView>
 
-    <im.vector.riotx.core.platform.BadgeFloatingActionButton
+    <im.vector.app.core.platform.BadgeFloatingActionButton
         android:id="@+id/jumpToBottomView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_room_list.xml b/vector/src/main/res/layout/fragment_room_list.xml
index 2c828c8397..413d3957c1 100644
--- a/vector/src/main/res/layout/fragment_room_list.xml
+++ b/vector/src/main/res/layout/fragment_room_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<im.vector.riotx.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
+<im.vector.app.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/stateView"
@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:overScrollMode="always" />
 
-    <im.vector.riotx.features.home.room.list.widget.FabMenuView
+    <im.vector.app.features.home.room.list.widget.FabMenuView
         android:id="@+id/createChatFabMenu"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -28,7 +28,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:accessibilityTraversalBefore="@+id/roomListView"
         android:contentDescription="@string/a11y_create_direct_message"
@@ -45,7 +44,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:accessibilityTraversalBefore="@+id/roomListView"
         android:contentDescription="@string/a11y_create_room"
@@ -55,4 +53,4 @@
         tools:layout_marginEnd="144dp"
         tools:visibility="visible" />
 
-</im.vector.riotx.core.platform.StateView>
+</im.vector.app.core.platform.StateView>
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index ee8f87fc02..2f4db6f116 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -64,8 +64,8 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 android:orientation="vertical"
-                android:paddingLeft="@dimen/layout_horizontal_margin"
-                android:paddingRight="@dimen/layout_horizontal_margin">
+                android:paddingStart="@dimen/layout_horizontal_margin"
+                android:paddingEnd="@dimen/layout_horizontal_margin">
 
                 <ImageView
                     android:id="@+id/roomPreviewNoPreviewAvatar"
@@ -118,7 +118,7 @@
                     tools:text="Error"
                     tools:visibility="visible" />
 
-                <im.vector.riotx.core.platform.ButtonStateView
+                <im.vector.app.core.platform.ButtonStateView
                     android:id="@+id/roomPreviewNoPreviewJoin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
index 69ffcb41fc..6e3749b0eb 100644
--- a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
+++ b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
@@ -33,10 +33,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="4dp"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/settings_troubleshoot_diagnostic"
             android:textColor="?riotx_text_primary"
             android:textStyle="bold" />
@@ -46,10 +44,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="4dp"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:textColor="?riotx_text_secondary"
             tools:text="@string/settings_troubleshoot_diagnostic_running_status" />
 
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 005de93cf6..e5482f0ec7 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -15,11 +15,11 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
+            android:src="@drawable/ic_security_phrase_24dp"
             android:tint="?riotx_text_primary"
             app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_passphrase"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_passphrase"
-            android:src="@drawable/ic_security_phrase_24dp" />
+            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_passphrase" />
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase"
@@ -56,7 +56,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginTop="16dp"
             app:errorEnabled="true"
             app:layout_constraintEnd_toStartOf="@id/ssss_view_show_password"
diff --git a/vector/src/main/res/layout/grid_item_emoji.xml b/vector/src/main/res/layout/grid_item_emoji.xml
index 6fc4ada972..d297d4e7aa 100644
--- a/vector/src/main/res/layout/grid_item_emoji.xml
+++ b/vector/src/main/res/layout/grid_item_emoji.xml
@@ -15,7 +15,7 @@
         tools:visibility="visible"
         android:background="@drawable/circle" />
 
-    <im.vector.riotx.features.reactions.EmojiDrawView
+    <im.vector.app.features.reactions.EmojiDrawView
         android:id="@+id/grid_item_emoji_text"
         android:layout_width="40dp"
         android:layout_height="40dp"
diff --git a/vector/src/main/res/layout/grid_section_header.xml b/vector/src/main/res/layout/grid_section_header.xml
index 4cd6499a87..65aa68dab6 100644
--- a/vector/src/main/res/layout/grid_section_header.xml
+++ b/vector/src/main/res/layout/grid_section_header.xml
@@ -10,8 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:paddingStart="8dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
+        android:paddingEnd="8dp"
         android:textStyle="bold"
         tools:text="Smiley &amp; Peolple" />
 
diff --git a/vector/src/main/res/layout/item_attachment_miniature_preview.xml b/vector/src/main/res/layout/item_attachment_miniature_preview.xml
index a0fde7b778..c52dc6cead 100644
--- a/vector/src/main/res/layout/item_attachment_miniature_preview.xml
+++ b/vector/src/main/res/layout/item_attachment_miniature_preview.xml
@@ -8,7 +8,7 @@
     card_view:cardBackgroundColor="@android:color/transparent"
     card_view:cardElevation="0dp">
 
-    <im.vector.riotx.core.platform.CheckableImageView
+    <im.vector.app.core.platform.CheckableImageView
         android:id="@+id/attachmentMiniatureImageView"
         android:layout_width="64dp"
         android:layout_height="64dp"
diff --git a/vector/src/main/res/layout/item_autocomplete_command.xml b/vector/src/main/res/layout/item_autocomplete_command.xml
index ce2cd6c731..3e73da00ae 100644
--- a/vector/src/main/res/layout/item_autocomplete_command.xml
+++ b/vector/src/main/res/layout/item_autocomplete_command.xml
@@ -27,9 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="5dp"
-        android:layout_marginLeft="5dp"
         android:layout_toEndOf="@+id/commandName"
-        android:layout_toRightOf="@+id/commandName"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
@@ -42,7 +40,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/commandName"
         android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_gravity="center_vertical"
         android:maxLines="2"
         android:textColor="?riotx_text_secondary"
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index c34ab0d452..fa628c0d24 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -23,7 +23,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:orientation="vertical">
 
         <TextView
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 84a85d0102..81eb084eb6 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -20,7 +20,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:orientation="vertical">
 
         <TextView
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index 66a096799d..2d10d513ab 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -8,9 +8,9 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="50dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <Space
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index a688f38d0f..0e4a613662 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -27,9 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:layout_marginRight="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:fontFamily="sans-serif-bold"
         android:singleLine="true"
@@ -47,9 +45,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:layout_marginRight="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="4dp"
         android:ellipsize="end"
         android:maxLines="3"
@@ -67,7 +63,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:layout_marginRight="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index e3fa8944ee..bed1d5eb2f 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -31,7 +31,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif-bold"
         android:singleLine="true"
diff --git a/vector/src/main/res/layout/item_breadcrumbs.xml b/vector/src/main/res/layout/item_breadcrumbs.xml
index 6596f71b40..c6fff52b6c 100644
--- a/vector/src/main/res/layout/item_breadcrumbs.xml
+++ b/vector/src/main/res/layout/item_breadcrumbs.xml
@@ -35,7 +35,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@tools:sample/avatars" />
 
-    <im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/breadcrumbsUnreadCounterBadgeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
index 80a0fc4ce1..61e4231fa8 100644
--- a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/createDirectRoomLetterView"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/createDirectRoomLetterView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="8dp"
+    android:layout_marginStart="8dp"
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?attr/riotx_text_primary"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 146c8c70ce..24425a5eb4 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -13,9 +13,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginLeft="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:layout_marginRight="@dimen/layout_horizontal_margin"
         android:duplicateParentState="true"
         android:ellipsize="end"
         android:maxLines="1"
diff --git a/vector/src/main/res/layout/item_generic_header.xml b/vector/src/main/res/layout/item_generic_header.xml
index 0d2cf8ebc5..6dbf68cd11 100644
--- a/vector/src/main/res/layout/item_generic_header.xml
+++ b/vector/src/main/res/layout/item_generic_header.xml
@@ -4,9 +4,9 @@
     android:id="@+id/itemGenericHeaderText"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="16dp"
+    android:paddingStart="16dp"
     android:paddingTop="4dp"
-    android:paddingRight="16dp"
+    android:paddingEnd="16dp"
     android:paddingBottom="4dp"
     android:textColor="?vctr_notice_text_color"
     android:textSize="15sp"
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index 7331c31dfd..4b206c352d 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -5,40 +5,39 @@
     android:id="@+id/item_generic_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?riotx_background"
     android:minHeight="50dp">
 
     <ImageView
+        android:id="@+id/item_generic_title_image"
         android:layout_width="20dp"
         android:layout_height="20dp"
-        android:id="@+id/item_generic_title_image"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/item_generic_title_text"
-        app:layout_constraintBottom_toBottomOf="@id/item_generic_title_text"
         android:layout_marginStart="16dp"
         android:scaleType="centerInside"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/item_generic_title_text"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/item_generic_title_text"
         tools:src="@drawable/ic_shield_trusted"
-        tools:visibility="visible"
-        android:visibility="gone"/>
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/item_generic_title_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginStart="8dp"
         android:layout_marginBottom="4dp"
         android:textColor="?riotx_text_primary"
         android:textStyle="bold"
         android:visibility="gone"
         app:layout_constrainedWidth="true"
-        app:layout_goneMarginStart="16dp"
         app:layout_constraintBottom_toTopOf="@+id/item_generic_description_text"
         app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@id/item_generic_title_image"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginStart="16dp"
         tools:text="Item Title"
         tools:textSize="14sp"
         tools:visibility="visible" />
@@ -48,10 +47,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="4dp"
         android:textColor="?riotx_text_secondary"
         android:visibility="gone"
@@ -102,7 +99,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:maxWidth="@dimen/button_max_width"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 03468e9c2f..c42d1e26e9 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<im.vector.riotx.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<im.vector.app.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemGroupLayout"
@@ -16,7 +16,6 @@
         android:layout_height="42dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginLeft="@dimen/layout_horizontal_margin"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
@@ -45,7 +44,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="21dp"
-        android:layout_marginRight="21dp"
         android:src="@drawable/ic_arrow_right"
         android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
@@ -61,4 +59,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</im.vector.riotx.core.platform.CheckableConstraintLayout>
\ No newline at end of file
+</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml
index 759da76a0d..19b0c5452b 100644
--- a/vector/src/main/res/layout/item_login_password_form.xml
+++ b/vector/src/main/res/layout/item_login_password_form.xml
@@ -30,7 +30,6 @@
                 android:inputType="textPassword"
                 android:maxLines="1"
                 android:paddingEnd="48dp"
-                android:paddingRight="48dp"
                 tools:ignore="RtlSymmetry" />
 
         </com.google.android.material.textfield.TextInputLayout>
diff --git a/vector/src/main/res/layout/item_notification_troubleshoot.xml b/vector/src/main/res/layout/item_notification_troubleshoot.xml
index 7944e1969f..507b936d20 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -23,9 +23,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
         android:textColor="?riotx_text_primary"
@@ -45,9 +43,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
         android:textColor="?riotx_text_secondary"
@@ -66,9 +62,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         android:background="?attr/colorAccent"
         android:padding="8dp"
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index b23ea5c084..6d3ba36d06 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -9,9 +9,9 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="64dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <ImageView
@@ -71,7 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:src="@drawable/ic_shield_warning"
-        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/actionEditable"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 87f2f8de27..1c84a65691 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -9,9 +9,9 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="64dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <ImageView
@@ -46,12 +46,12 @@
         android:maxLines="1"
         android:textColor="?riotx_text_primary"
         android:textSize="16sp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemEditable"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constrainedWidth="true"
         app:layout_goneMarginStart="0dp"
         tools:text="@sample/matrix.json/data/displayName" />
 
@@ -66,12 +66,12 @@
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemEditable"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
-        app:layout_constrainedWidth="true"
         app:layout_goneMarginStart="0dp"
         tools:text="@sample/matrix.json/data/mxid" />
 
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index ccc6f66518..66cff4840e 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -9,9 +9,9 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="64dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <ImageView
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index c605a2fe90..ae8287fdc4 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -17,7 +17,6 @@
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -28,9 +27,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
-        android:layout_marginLeft="17dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="16dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="?riotx_text_primary"
@@ -49,7 +46,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="22dp"
-        android:layout_marginRight="22dp"
         android:gravity="center_vertical"
         android:maxLines="1"
         android:singleLine="true"
@@ -69,9 +65,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:drawableStart="@drawable/ic_user"
-        android:drawableLeft="@drawable/ic_user"
         android:drawablePadding="8dp"
         android:drawableTint="?riotx_text_secondary"
         android:gravity="center_vertical"
@@ -88,9 +82,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginEnd="22dp"
-        android:layout_marginRight="22dp"
         android:gravity="center_vertical"
         android:maxLines="1"
         android:minWidth="40dp"
@@ -102,13 +94,12 @@
         app:layout_constraintStart_toEndOf="@+id/itemPublicRoomMembersCount"
         tools:text="@sample/matrix.json/data/roomAlias" />
 
-    <im.vector.riotx.core.platform.ButtonStateView
+    <im.vector.app.core.platform.ButtonStateView
         android:id="@+id/itemPublicRoomButtonState"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         app:bsv_button_text="@string/join"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="true"
diff --git a/vector/src/main/res/layout/item_pushrule_raw.xml b/vector/src/main/res/layout/item_pushrule_raw.xml
index 0d2ba360bd..7a29415f2e 100644
--- a/vector/src/main/res/layout/item_pushrule_raw.xml
+++ b/vector/src/main/res/layout/item_pushrule_raw.xml
@@ -11,7 +11,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -20,8 +19,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            tools:text=".m.rule.contains_user_name"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:text=".m.rule.contains_user_name" />
 
 
         <TextView
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 9387f9ba75..c844f10ed2 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -51,12 +51,11 @@
         android:id="@+id/roomAvatarFailSendingImageView"
         android:layout_width="16dp"
         android:layout_height="16dp"
+        android:src="@drawable/ic_warning_badge"
         app:layout_constraintCircle="@id/roomAvatarContainer"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="30dp"
-        tools:ignore="MissingConstraints"
-        android:src="@drawable/ic_warning_badge"
-        />
+        tools:ignore="MissingConstraints" />
 
     <ImageView
         android:id="@+id/roomAvatarDecorationImageView"
@@ -82,10 +81,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginLeft="@dimen/layout_horizontal_margin"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:duplicateParentState="true"
         android:ellipsize="end"
         android:maxLines="1"
@@ -104,8 +101,8 @@
         android:id="@+id/roomDraftBadge"
         android:layout_width="16dp"
         android:layout_height="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
         android:src="@drawable/ic_edit"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
@@ -114,17 +111,16 @@
         app:layout_constraintTop_toTopOf="@+id/roomNameView"
         tools:visibility="visible" />
 
-    <im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomUnreadCounterBadgeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:gravity="center"
         android:minWidth="16dp"
         android:minHeight="16dp"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:textColor="@android:color/white"
         android:textSize="10sp"
         android:visibility="gone"
@@ -141,7 +137,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:textColor="?riotx_text_secondary"
         android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
@@ -155,7 +150,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="?riotx_text_secondary"
@@ -171,7 +165,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/riotx_accent"
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index 78b40430a1..d27aea5bcf 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -11,10 +11,8 @@
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:paddingStart="8dp"
-    android:paddingLeft="8dp"
     android:paddingTop="12dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingRight="@dimen/layout_horizontal_margin"
     android:paddingBottom="4dp">
 
     <TextView
@@ -32,15 +30,15 @@
         android:textStyle="bold"
         tools:text="@string/room_participants_header_direct_chats" />
 
-    <im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomCategoryUnreadCounterBadgeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:minWidth="16dp"
         android:minHeight="16dp"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:textColor="@android:color/white"
         android:textSize="10sp"
         tools:background="@drawable/bg_unread_highlight"
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 8869a22bea..4add2d566d 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -16,7 +16,6 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
         android:background="@drawable/circle"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 7fadab48e5..92660634e0 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -15,7 +15,6 @@
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="12dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,10 +34,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginLeft="@dimen/layout_horizontal_margin"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
         android:drawableEnd="@drawable/ic_arrow_right"
         android:drawablePadding="8dp"
         android:duplicateParentState="true"
@@ -77,7 +74,7 @@
         app:layout_constraintTop_toBottomOf="@+id/roomInvitationSubTitle"
         tools:layout_marginStart="120dp" />
 
-    <im.vector.riotx.core.platform.ButtonStateView
+    <im.vector.app.core.platform.ButtonStateView
         android:id="@+id/roomInvitationAccept"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -89,7 +86,7 @@
         app:layout_constraintEnd_toEndOf="@+id/roomInvitationNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomLastEventBottomSpace" />
 
-    <im.vector.riotx.core.platform.ButtonStateView
+    <im.vector.app.core.platform.ButtonStateView
         android:id="@+id/roomInvitationReject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_room_widget.xml b/vector/src/main/res/layout/item_room_widget.xml
index 8de7f244ee..e87e4c70a5 100644
--- a/vector/src/main/res/layout/item_room_widget.xml
+++ b/vector/src/main/res/layout/item_room_widget.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -16,11 +16,32 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginEnd="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:src="@tools:sample/avatars" />
 
     <TextView
         android:id="@+id/roomWidgetName"
         style="@style/BottomSheetItemTextMain"
-        tools:text="@sample/matrix.json/data/displayName" />
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintBottom_toTopOf="@id/roomWidgetUrl"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/roomWidgetAvatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="Widget name" />
 
-</LinearLayout>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/roomWidgetUrl"
+        style="@style/BottomSheetItemTextSecondary"
+        android:textStyle="normal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/roomWidgetName"
+        app:layout_constraintStart_toStartOf="@id/roomWidgetName"
+        app:layout_constraintTop_toBottomOf="@id/roomWidgetName"
+        tools:text="https://foobar" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_settings_button_single_line.xml b/vector/src/main/res/layout/item_settings_button_single_line.xml
index 93b5ac9b2d..592eb6dd96 100644
--- a/vector/src/main/res/layout/item_settings_button_single_line.xml
+++ b/vector/src/main/res/layout/item_settings_button_single_line.xml
@@ -23,7 +23,6 @@
         app:layout_constraintEnd_toStartOf="@+id/settings_item_button"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:drawableLeft="@drawable/ic_notification_privacy_warning"
         tools:drawableStart="@drawable/ic_notification_privacy_warning"
         tools:drawableTint="@color/vector_error_color"
         tools:text="foo@bar.test" />
diff --git a/vector/src/main/res/layout/item_signout_action.xml b/vector/src/main/res/layout/item_signout_action.xml
index c5acc09e56..16d10a3ff0 100644
--- a/vector/src/main/res/layout/item_signout_action.xml
+++ b/vector/src/main/res/layout/item_signout_action.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/signedOutActionClickable"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -7,11 +7,10 @@
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="50dp"
     android:orientation="horizontal"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    android:paddingBottom="8dp">
 
     <ImageView
         android:id="@+id/actionIconImageView"
@@ -19,7 +18,6 @@
         android:layout_height="24dp"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_secure_backup"
         android:tint="?riotx_text_primary" />
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index 919e5b0a3e..73b0750cbd 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -15,7 +15,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:gravity="center"
         android:lines="1"
         android:textColor="@color/black"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 0f27afd5b7..15016e0abe 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -7,13 +7,13 @@
     android:addStatesFromChildren="true"
     android:background="?attr/selectableItemBackground">
 
-    <im.vector.riotx.core.platform.CheckableView
+    <im.vector.app.core.platform.CheckableView
         android:id="@+id/messageSelectedBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignBottom="@+id/informationBottom"
         android:layout_alignParentTop="true"
-        android:background="?riotx_highlighted_message_background" />
+        android:background="@drawable/highlighted_message_background" />
 
     <ImageView
         android:id="@+id/messageAvatarImageView"
@@ -29,10 +29,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="4dp"
-        android:layout_marginRight="8dp"
         android:layout_toStartOf="@+id/messageTimeView"
         android:layout_toEndOf="@+id/messageStartGuideline"
         android:ellipsize="end"
@@ -49,9 +47,7 @@
         android:layout_alignBaseline="@+id/messageMemberNameView"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
         tools:text="@tools:sample/date/hhmm" />
@@ -160,13 +156,13 @@
             tools:layout_height="40dp">
 
             <!-- ReactionButtons will be added here in the code -->
-            <!--im.vector.riotx.features.reactions.widget.ReactionButton
+            <!--im.vector.app.features.reactions.widget.ReactionButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" /-->
 
         </com.google.android.flexbox.FlexboxLayout>
 
-        <im.vector.riotx.core.ui.views.ReadReceiptsView
+        <im.vector.app.core.ui.views.ReadReceiptsView
             android:id="@+id/readReceiptsView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index d509d4e88b..4ad9ad5cae 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -6,13 +6,13 @@
     android:addStatesFromChildren="true"
     android:background="?attr/selectableItemBackground">
 
-    <im.vector.riotx.core.platform.CheckableView
+    <im.vector.app.core.platform.CheckableView
         android:id="@+id/messageSelectedBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignBottom="@+id/readReceiptsView"
         android:layout_alignParentTop="true"
-        android:background="?riotx_highlighted_message_background" />
+        android:background="@drawable/highlighted_message_background" />
 
     <View
         android:id="@+id/messageStartGuideline"
@@ -82,7 +82,7 @@
         tools:visibility="visible" />
 
 
-    <im.vector.riotx.core.ui.views.ReadReceiptsView
+    <im.vector.app.core.ui.views.ReadReceiptsView
         android:id="@+id/readReceiptsView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml
index 3d87823866..a6b21aed15 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_state.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml
@@ -7,13 +7,13 @@
     android:addStatesFromChildren="true"
     android:background="?attr/selectableItemBackground">
 
-    <im.vector.riotx.core.platform.CheckableView
+    <im.vector.app.core.platform.CheckableView
         android:id="@+id/messageSelectedBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignBottom="@+id/informationBottom"
         android:layout_alignParentTop="true"
-        android:background="?riotx_highlighted_message_background" />
+        android:background="@drawable/highlighted_message_background" />
 
     <View
         android:id="@+id/messageStartGuideline"
@@ -99,13 +99,13 @@
             tools:layout_height="40dp">
 
             <!-- ReactionButtons will be added here in the code -->
-            <!--im.vector.riotx.features.reactions.widget.ReactionButton
+            <!--im.vector.app.features.reactions.widget.ReactionButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" /-->
 
         </com.google.android.flexbox.FlexboxLayout>
 
-        <im.vector.riotx.core.ui.views.ReadReceiptsView
+        <im.vector.app.core.ui.views.ReadReceiptsView
             android:id="@+id/readReceiptsView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_timeline_event_create.xml b/vector/src/main/res/layout/item_timeline_event_create.xml
index d6fc5e4b5d..0fd63515d9 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -9,7 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         android:background="?attr/riotx_keys_backup_banner_accent_color"
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index a15de8bd34..a67d14168b 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -35,7 +35,6 @@
     <!--        android:layout_width="@dimen/chat_avatar_size"-->
     <!--        android:layout_height="@dimen/chat_avatar_size"-->
     <!--        android:layout_marginStart="4dp"-->
-    <!--        android:layout_marginLeft="4dp"-->
     <!--        app:layout_constraintStart_toEndOf="@+id/messageFilee2eIcon"-->
     <!--        app:layout_constraintTop_toTopOf="parent"-->
     <!--        tools:src="@drawable/filetype_attachment" />-->
@@ -46,7 +45,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:layout_marginLeft="4dp"
         android:layout_marginEnd="32dp"
         android:autoLink="none"
         android:gravity="center_vertical"
@@ -70,7 +68,6 @@
         android:layout_height="46dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
index 5df455b1c1..ad3b036a4d 100644
--- a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
@@ -10,7 +10,6 @@
         android:layout_width="375dp"
         android:layout_height="0dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
@@ -49,7 +48,6 @@
         android:layout_height="46dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
         android:layout_marginBottom="8dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
index 7f16b51abd..a0cfb6491f 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
@@ -14,21 +14,21 @@
             layout="@layout/vector_message_merge_avatar_list"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_alignParentStart="true"
-            android:layout_toLeftOf="@+id/itemMergedExpandTextView"
-            android:layout_marginEnd="16dp" />
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_toStartOf="@+id/itemMergedExpandTextView" />
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:paddingLeft="8dp"
-            android:paddingTop="4dp"
-            android:paddingRight="8dp"
-            android:paddingBottom="4dp"
             android:layout_alignParentEnd="true"
+            android:layout_marginTop="2dp"
+            android:paddingStart="8dp"
+            android:paddingTop="4dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
             android:textColor="?attr/colorAccent"
             android:textSize="14sp"
@@ -41,7 +41,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginTop="4dp"
-        android:background="?attr/riotx_header_panel_background"/>
+        android:background="?attr/riotx_header_panel_background" />
 
 
     <TextView
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 3ed840954f..eefa387254 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -58,9 +58,9 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_marginTop="2dp"
-            android:paddingLeft="8dp"
+            android:paddingStart="8dp"
             android:paddingTop="4dp"
-            android:paddingRight="8dp"
+            android:paddingEnd="8dp"
             android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
             android:textColor="?attr/colorAccent"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 847324884c..3f0c269e90 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -55,9 +55,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="2dp"
-            android:paddingLeft="8dp"
+            android:paddingStart="8dp"
             android:paddingTop="4dp"
-            android:paddingRight="8dp"
+            android:paddingEnd="8dp"
             android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
             android:textColor="?attr/colorAccent"
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
index febb2dd0f3..ffaddd8739 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
@@ -87,7 +87,7 @@
         android:visibility="gone"
         tools:visibility="visible">
 
-        <im.vector.riotx.features.home.room.detail.timeline.item.PollResultLineView
+        <im.vector.app.features.home.room.detail.timeline.item.PollResultLineView
             android:id="@+id/pollResult1"
             android:layout_width="match_parent"
             android:layout_height="40dp"
@@ -95,7 +95,7 @@
             tools:optionName="Create Github issue"
             tools:optionSelected="true" />
 
-        <im.vector.riotx.features.home.room.detail.timeline.item.PollResultLineView
+        <im.vector.app.features.home.room.detail.timeline.item.PollResultLineView
             android:id="@+id/pollResult2"
             android:layout_width="match_parent"
             android:layout_height="40dp"
@@ -104,7 +104,7 @@
             tools:optionName="Search Github"
             tools:optionSelected="false" />
 
-        <im.vector.riotx.features.home.room.detail.timeline.item.PollResultLineView
+        <im.vector.app.features.home.room.detail.timeline.item.PollResultLineView
             android:id="@+id/pollResult3"
             android:layout_width="match_parent"
             android:layout_height="40dp"
@@ -112,7 +112,7 @@
             tools:optionName="Logout"
             tools:optionSelected="false" />
 
-        <im.vector.riotx.features.home.room.detail.timeline.item.PollResultLineView
+        <im.vector.app.features.home.room.detail.timeline.item.PollResultLineView
             android:id="@+id/pollResult4"
             android:layout_width="match_parent"
             android:layout_height="40dp"
@@ -120,7 +120,7 @@
             tools:optionName="Option 4"
             tools:optionSelected="false" />
 
-        <im.vector.riotx.features.home.room.detail.timeline.item.PollResultLineView
+        <im.vector.app.features.home.room.detail.timeline.item.PollResultLineView
             android:id="@+id/pollResult5"
             android:layout_width="match_parent"
             android:layout_height="40dp"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index 0cb2faf9bc..4e4b1fdfea 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/userDirectoryLetterView"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/userDirectoryLetterView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="8dp"
+    android:layout_marginStart="8dp"
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?attr/riotx_text_primary"
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index c6f1152afe..263a8ff107 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -5,13 +5,14 @@
     android:id="@+id/itemVerificationClickableZone"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?riotx_bottom_sheet_background"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="64dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <ImageView
diff --git a/vector/src/main/res/layout/item_verification_notice.xml b/vector/src/main/res/layout/item_verification_notice.xml
index bb495f88b1..2669fba03c 100644
--- a/vector/src/main/res/layout/item_verification_notice.xml
+++ b/vector/src/main/res/layout/item_verification_notice.xml
@@ -4,9 +4,9 @@
     android:id="@+id/itemVerificationNoticeText"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp"
     android:textColor="?riotx_text_primary"
     android:textSize="14sp"
diff --git a/vector/src/main/res/layout/item_verification_qr_code.xml b/vector/src/main/res/layout/item_verification_qr_code.xml
index 6a16315185..b57470fdc1 100644
--- a/vector/src/main/res/layout/item_verification_qr_code.xml
+++ b/vector/src/main/res/layout/item_verification_qr_code.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:layout_margin="8dp">
 
-    <im.vector.riotx.core.ui.views.QrCodeImageView
+    <im.vector.app.core.ui.views.QrCodeImageView
         android:id="@+id/itemVerificationQrCodeImage"
         android:layout_width="200dp"
         android:layout_height="200dp"
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index a5c4ae6f1b..639a3e112c 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="start"
-        android:text="@string/use_latest_riot"
+        android:text="@string/use_latest_app"
         android:textColor="?riotx_text_primary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -52,7 +52,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:gravity="center"
-        android:text="@string/riot_desktop_web"
+        android:text="@string/app_desktop_web"
         android:textColor="?riotx_text_primary"
         app:layout_constraintEnd_toEndOf="@id/monitorIcon"
         app:layout_constraintStart_toStartOf="@id/monitorIcon"
@@ -64,7 +64,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:gravity="center"
-        android:text="@string/riot_ios_android"
+        android:text="@string/app_ios_android"
         android:textColor="?riotx_text_primary"
         app:layout_constraintEnd_toEndOf="@id/smartphoneIcon"
         app:layout_constraintStart_toStartOf="@id/smartphoneIcon"
diff --git a/vector/src/main/res/layout/item_verification_waiting.xml b/vector/src/main/res/layout/item_verification_waiting.xml
index bcf99e6894..8c32e57f9b 100644
--- a/vector/src/main/res/layout/item_verification_waiting.xml
+++ b/vector/src/main/res/layout/item_verification_waiting.xml
@@ -5,9 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="72dp"
-    android:paddingLeft="@dimen/layout_horizontal_margin"
+    android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
-    android:paddingRight="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
     <TextView
diff --git a/vector/src/main/res/layout/merge_composer_layout.xml b/vector/src/main/res/layout/merge_composer_layout.xml
index 9f80c0a52b..94a69ed1fa 100644
--- a/vector/src/main/res/layout/merge_composer_layout.xml
+++ b/vector/src/main/res/layout/merge_composer_layout.xml
@@ -121,7 +121,7 @@
         android:tint="?attr/colorAccent"
         tools:ignore="MissingConstraints" />
 
-    <im.vector.riotx.features.home.room.detail.composer.ComposerEditText
+    <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
         style="@style/ComposerEditTextStyle"
         android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/merge_overlay_waiting_view.xml b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
index 10ae1a7ae2..c13d5e5df2 100644
--- a/vector/src/main/res/layout/merge_overlay_waiting_view.xml
+++ b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
@@ -39,8 +39,7 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginEnd="6dp"
-                    android:layout_marginRight="6dp" />
+                    android:layout_marginEnd="6dp" />
 
                 <TextView
                     android:id="@+id/waiting_view_status_text"
diff --git a/vector/src/main/res/layout/motion_fab_menu_merge.xml b/vector/src/main/res/layout/motion_fab_menu_merge.xml
index 104db206cd..e564d16aaf 100644
--- a/vector/src/main/res/layout/motion_fab_menu_merge.xml
+++ b/vector/src/main/res/layout/motion_fab_menu_merge.xml
@@ -38,7 +38,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:importantForAccessibility="no"
         android:text="@string/fab_menu_create_room" />
@@ -63,7 +62,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:importantForAccessibility="no"
         android:text="@string/fab_menu_create_chat" />
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index 7e715a7122..4f11bf1fcd 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -4,19 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/reactionSelector"
     android:layout_width="wrap_content"
-    android:minWidth="44dp"
     android:layout_height="26dp"
     android:background="@drawable/rounded_rect_shape"
-    android:clipChildren="false">
+    android:clipChildren="false"
+    android:minWidth="44dp">
 
 
     <!--<View-->
-        <!--android:id="@+id/reactionSelector"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:background="@drawable/rounded_rect_shape" />-->
+    <!--android:id="@+id/reactionSelector"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:background="@drawable/rounded_rect_shape" />-->
 
-    <im.vector.riotx.features.reactions.widget.DotsView
+    <im.vector.app.features.reactions.widget.DotsView
         android:id="@+id/dots"
         android:layout_width="30dp"
         android:layout_height="30dp"
@@ -26,7 +26,7 @@
         app:layout_constraintStart_toStartOf="@+id/reactionText"
         app:layout_constraintTop_toTopOf="@+id/reactionText" />
 
-    <im.vector.riotx.features.reactions.widget.CircleView
+    <im.vector.app.features.reactions.widget.CircleView
         android:id="@+id/circle"
         android:layout_width="14dp"
         android:layout_height="14dp"
@@ -39,32 +39,27 @@
         android:id="@+id/reactionText"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
-        android:minWidth="20dp"
         android:layout_marginStart="6dp"
-        android:layout_marginLeft="6dp"
+        android:ellipsize="middle"
         android:gravity="center"
+        android:maxEms="10"
+        android:minWidth="20dp"
+        android:singleLine="true"
         android:textColor="@color/black"
         android:textSize="13sp"
-        android:maxEms="10"
-        android:ellipsize="middle"
-        android:singleLine="true"
-        app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/reactionCount"
+        app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/reactionCount"
         tools:text="* Party Parrot Again * 👀" />
 
     <TextView
         android:id="@+id/reactionCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintBaseline_toBaselineOf="@id/reactionText"
         android:layout_marginStart="2dp"
-        android:layout_marginLeft="2dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:gravity="center"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
@@ -73,8 +68,10 @@
         app:autoSizeMaxTextSize="14sp"
         app:autoSizeMinTextSize="8sp"
         app:autoSizeTextType="uniform"
-        app:layout_constraintStart_toEndOf="@id/reactionText"
+        app:layout_constraintBaseline_toBaselineOf="@id/reactionText"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@id/reactionText"
         tools:text="13450" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
index a864c8ffa7..051e7850df 100644
--- a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
+++ b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
@@ -5,19 +5,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/actionUnreadCounterBadgeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center_horizontal"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:minWidth="8dp"
         android:minHeight="8dp"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:textColor="@android:color/white"
         android:textSize="10sp"
         tools:background="@drawable/bg_unread_highlight"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 7356fcf64b..159e394426 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -11,10 +11,8 @@
         android:layout_width="96dp"
         android:layout_height="96dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="86dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -57,7 +55,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteIdentifierView" />
 
-    <im.vector.riotx.core.platform.ButtonStateView
+    <im.vector.app.core.platform.ButtonStateView
         android:id="@+id/inviteAcceptView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -71,7 +69,7 @@
         app:layout_constraintStart_toEndOf="@+id/inviteRejectView"
         app:layout_constraintTop_toTopOf="@id/inviteRejectView" />
 
-    <im.vector.riotx.core.platform.ButtonStateView
+    <im.vector.app.core.platform.ButtonStateView
         android:id="@+id/inviteRejectView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -84,7 +82,7 @@
         app:layout_constraintEnd_toStartOf="@+id/inviteAcceptView"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/inviteLabelView"/>
+        app:layout_constraintTop_toBottomOf="@id/inviteLabelView" />
 
     <Space
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/vector_message_merge_avatar_list.xml b/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
index 58f38ada0e..7e4588f4cc 100644
--- a/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
+++ b/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
@@ -18,7 +18,6 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_marginStart="-5dp"
-        android:layout_marginLeft="-5dp"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
@@ -29,7 +28,6 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_marginStart="-5dp"
-        android:layout_marginLeft="-5dp"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
@@ -40,7 +38,6 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_marginStart="-5dp"
-        android:layout_marginLeft="-5dp"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
@@ -51,7 +48,6 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_marginStart="-5dp"
-        android:layout_marginLeft="-5dp"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
diff --git a/vector/src/main/res/layout/vector_preference_push_rule.xml b/vector/src/main/res/layout/vector_preference_push_rule.xml
index b5d111aed9..2c753a5c5e 100644
--- a/vector/src/main/res/layout/vector_preference_push_rule.xml
+++ b/vector/src/main/res/layout/vector_preference_push_rule.xml
@@ -10,9 +10,7 @@
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:orientation="vertical"
     android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingRight">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -35,7 +33,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
             android:layout_alignStart="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
             android:maxLines="2"
             android:paddingTop="6dp"
             android:textAppearance="?android:attr/textAppearanceSmall"
diff --git a/vector/src/main/res/layout/vector_settings_round_group_avatar.xml b/vector/src/main/res/layout/vector_settings_round_group_avatar.xml
index 57beeb48a7..8f0781dd4e 100644
--- a/vector/src/main/res/layout/vector_settings_round_group_avatar.xml
+++ b/vector/src/main/res/layout/vector_settings_round_group_avatar.xml
@@ -10,7 +10,6 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="10dp"
-        android:layout_marginRight="10dp"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
         tools:src="@tools:sample/avatars" />
diff --git a/vector/src/main/res/layout/view_active_call_view.xml b/vector/src/main/res/layout/view_active_call_view.xml
index 62ab2ae60e..5634dcee8f 100644
--- a/vector/src/main/res/layout/view_active_call_view.xml
+++ b/vector/src/main/res/layout/view_active_call_view.xml
@@ -25,8 +25,9 @@
         android:textColor="@color/white"
         app:drawableTint="@color/white" />
 
-    <TextView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/returnToCallButton"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/activeCallInfo"
@@ -38,7 +39,6 @@
         android:paddingStart="8dp"
         android:paddingEnd="16dp"
         android:text="@string/return_to_call"
-        android:textAllCaps="true"
         android:textColor="@color/white"
         android:textSize="15sp"
         android:textStyle="bold" />
diff --git a/vector/src/main/res/layout/view_active_conference_view.xml b/vector/src/main/res/layout/view_active_conference_view.xml
new file mode 100644
index 0000000000..66a47b728d
--- /dev/null
+++ b/vector/src/main/res/layout/view_active_conference_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorPrimary"
+    tools:parentTag="android.widget.RelativeLayout">
+
+    <TextView
+        android:id="@+id/activeConferenceInfo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toStartOf="@id/deleteWidgetButton"
+        android:drawableStart="@drawable/ic_call"
+        android:drawablePadding="10dp"
+        android:gravity="center_vertical"
+        android:paddingStart="16dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="12dp"
+        android:textColor="@color/white"
+        android:textColorLink="@color/white"
+        app:drawableTint="@color/white"
+        tools:text="@string/ongoing_conference_call" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/deleteWidgetButton"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/activeConferenceInfo"
+        android:layout_alignBottom="@+id/activeConferenceInfo"
+        android:layout_alignParentEnd="true"
+        android:clickable="false"
+        android:focusable="false"
+        android:gravity="center"
+        android:paddingStart="8dp"
+        android:paddingEnd="16dp"
+        android:text="@string/action_close"
+        android:textColor="@color/white"
+        android:textSize="15sp"
+        android:textStyle="bold" />
+
+</merge>
diff --git a/vector/src/main/res/layout/view_jump_to_read_marker.xml b/vector/src/main/res/layout/view_jump_to_read_marker.xml
index 48f7bd1d80..019480e6fe 100644
--- a/vector/src/main/res/layout/view_jump_to_read_marker.xml
+++ b/vector/src/main/res/layout/view_jump_to_read_marker.xml
@@ -29,13 +29,10 @@
         android:layout_alignTop="@+id/jumpToReadMarkerLabelView"
         android:layout_alignBottom="@+id/jumpToReadMarkerLabelView"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/action_close"
         android:paddingStart="16dp"
-        android:paddingLeft="16dp"
         android:paddingEnd="16dp"
-        android:paddingRight="16dp"
         android:src="@drawable/ic_clear_white" />
 
 </merge>
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index 6c8fc2b5a1..7e54823fae 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -13,7 +13,6 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginStart="19dp"
-        android:layout_marginLeft="19dp"
         android:src="@drawable/ic_secure_backup"
         android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -33,7 +32,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
-        android:layout_marginLeft="27dp"
         android:text="@string/secure_backup_banner_setup_line1"
         android:textColor="?riotx_text_primary"
         android:textSize="18sp"
@@ -47,7 +45,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
-        android:layout_marginLeft="27dp"
         android:text="@string/secure_backup_banner_setup_line2"
         android:textColor="?riotx_text_secondary"
         android:textSize="14sp"
@@ -115,7 +112,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?vctr_line_divider"
+        android:background="@drawable/line_divider"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_password_strength_bar.xml b/vector/src/main/res/layout/view_password_strength_bar.xml
index b359cd140b..0b4361c7cb 100644
--- a/vector/src/main/res/layout/view_password_strength_bar.xml
+++ b/vector/src/main/res/layout/view_password_strength_bar.xml
@@ -11,7 +11,6 @@
         android:layout_width="0dp"
         android:layout_height="4dp"
         android:layout_marginEnd="5dp"
-        android:layout_marginRight="5dp"
         android:layout_weight="1"
         tools:background="@color/password_strength_bar_weak" />
 
@@ -20,7 +19,6 @@
         android:layout_width="0dp"
         android:layout_height="4dp"
         android:layout_marginEnd="5dp"
-        android:layout_marginRight="5dp"
         android:layout_weight="1"
         tools:background="@color/password_strength_bar_low" />
 
@@ -29,7 +27,6 @@
         android:layout_width="0dp"
         android:layout_height="4dp"
         android:layout_marginEnd="5dp"
-        android:layout_marginRight="5dp"
         android:layout_weight="1"
         tools:background="@color/password_strength_bar_ok" />
 
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index cb536884a1..3e4c49fe00 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -10,7 +10,7 @@
         android:id="@+id/receiptMore"
         android:layout_width="wrap_content"
         android:layout_height="18dp"
-        android:background="?vctr_pill_receipt"
+        android:background="@drawable/pill_receipt"
         android:gravity="center"
         android:importantForAccessibility="no"
         android:paddingStart="4dp"
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 6ded37d2f2..0ba595042a 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<im.vector.riotx.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
+<im.vector.app.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/memberProfileStateView"
@@ -98,4 +98,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</im.vector.riotx.core.platform.StateView>
\ No newline at end of file
+</im.vector.app.core.platform.StateView>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index d4eb923d50..6cdbbed424 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -12,11 +12,6 @@
         app:showAsAction="always"
         tools:visible="true" />
 
-    <item
-        android:id="@+id/open_matrix_apps"
-        android:title="@string/room_add_matrix_apps"
-        app:showAsAction="never" />
-
     <item
         android:id="@+id/voice_call"
         android:icon="@drawable/ic_phone"
@@ -35,6 +30,12 @@
         app:showAsAction="always"
         tools:visible="true" />
 
+    <item
+        android:id="@+id/open_matrix_apps"
+        android:title="@string/room_add_matrix_apps"
+        app:actionLayout="@layout/custom_action_item_layout_badge"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/resend_all"
         android:icon="@drawable/ic_refresh_cw"
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 972e695515..3c2998adfa 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -146,7 +146,6 @@
     <string name="login_error_unable_register">تعذّر التسجيل</string>
     <string name="login_error_unable_register_mail_ownership">تعذّر التسجيل: فشل في ملكية البريد</string>
     <string name="login_error_invalid_home_server">أدخِل مسارا صالحا</string>
-    <string name="login_mobile_device">المحمول</string>
 
     <string name="login_error_forbidden">اسم المستخدم/كلمة السر غير صالحة</string>
     <string name="login_error_not_json">لم يحتوي JSON صالح</string>
@@ -154,9 +153,6 @@
     <string name="login_error_user_in_use">اسم المستخدم هذا مستخدم بالفعل</string>
     <string name="login_error_login_email_not_yet">لم يُنقر بعد على الرابط في البريد</string>
 
-    <string name="e2e_need_log_in_again">عليك الولوج ثانيةً لتوليد مفاتيح تعمية الطرفين لهذا الجهاز وإرسال المفتاح العمومي إلى خادوم المنزل.
-نرجو المعذرة.</string>
-
     <string name="attachment_cancel_download">أأُلغي التنزيل؟</string>
     <string name="attachment_cancel_upload">أأُلغي الرفع؟</string>
     <string name="attachment_remaining_time_seconds">%d ثا</string>
@@ -764,10 +760,6 @@
 
 الأجهزة المجهولة:</string>
 
-    <string name="e2e_enabling_on_app_update">بات يدعم Element تعمية الطرفين، ولكن عليك الولوج مجددا لتفعيلها.
-
-يمكنك فعل ذلك الآن أو لاحقا وذلك من إعدادات التطبيق.</string>
-
     <string name="encryption_never_send_to_unverified_devices_summary">لا ترسل من هذا الجهاز الرسائل المعمّاة إلى الأجهزة غير المؤكّدة</string>
 
     <string name="encryption_never_send_to_unverified_devices_title">عمِّ إلى الأجهزة المؤكّدة فقط</string>
diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index 33dae7f725..f95c885c1d 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -162,7 +162,6 @@
     <string name="auth_reset_password_message">Kako bi resetovali vašu lozinku, unesite adresu elektronske pošte povezanu sa vašim nalogom:</string>
     <string name="auth_reset_password_missing_email">Morate uneti adresu elektronske pošte povezane sa vašim nalogom.</string>
     <string name="auth_reset_password_missing_password">Morate uneti novu lozinku.</string>
-    <string name="login_mobile_device">Mobilni</string>
 
     <string name="login_error_limit_exceeded">Poslato je previše zahteva</string>
     <string name="login_error_user_in_use">Ovo korisničko ime je već korišćeno</string>
@@ -184,7 +183,7 @@
     <string name="room_info_room_topic">Tema sobe</string>
 
     <string name="settings_call_category">Pozivi</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Koristi podrazumevani Element zvuk zvona za dolazeće pozive</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Koristi podrazumevani Element zvuk zvona za dolazeće pozive</string>
     <string name="settings_call_ringtone_title">Zvuk zvona dolazećeg poziva</string>
     <string name="settings_call_ringtone_dialog_title">Izaberite zvuk zvona za pozive:</string>
 
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 6a9189b84a..30689751d6 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -263,7 +263,6 @@
     <string name="login_error_unable_register">Неуспешна регистрация</string>
     <string name="login_error_unable_register_mail_ownership">Неуспешна регистрация: неуспешно потвърждаване на собствеността на имейла</string>
     <string name="login_error_invalid_home_server">Въведете валиден URL адрес</string>
-    <string name="login_mobile_device">Мобилно устройство</string>
 
     <string name="login_error_forbidden">Невалидно потребителско име/парола</string>
     <string name="login_error_unknown_token">Не е разпознат указаният тоукън за достъп</string>
@@ -273,10 +272,6 @@
     <string name="login_error_user_in_use">Това потребителско име е вече заето</string>
     <string name="login_error_login_email_not_yet">Все още не сте кликнали върху връзката в имейла</string>
 
-    <string name="e2e_need_log_in_again">Трябва да влезете обратно в профила си, за да се създадат ключове за шифроване от край до край за това устройство и да се изпрати публичния ключ към Home сървъра.
-Това е еднократно.
-Извинете за неудобството.</string>
-
     <string name="read_receipts_list">Списък с потвърждения за прочитане</string>
 
     <string name="groups_list">Списък с групи</string>
@@ -623,10 +618,6 @@
     <string name="encryption_information_verify_device_warning2">Ако съвпада, моля натиснете бутона за потвърждение по-долу. Ако не съвпада, то тогава някой друг имитира това устройство и вероятно бихте искали да го вкарате в черния списък. В бъдеще този процес на потвърждение ще бъде по-лесен.</string>
     <string name="encryption_information_verify_key_match">Потвърждавам, че ключовете съвпадат</string>
 
-    <string name="e2e_enabling_on_app_update">Element поддържа шифроване от край до край, но за да го включите трябва да влезете в профила си отново.
-
-Може да го направите сега или по-късно от настройките на приложението.</string>
-
     <string name="unknown_devices_alert_title">Стаята съдържа непознати устройства</string>
     <string name="unknown_devices_alert_message">Тази стая съдържа непознати устройства, който не са били потвърдени.
 Това означава, че няма гаранция, че устройствата принадлежат на потребителите, на който се твърди, че принадлежат.
@@ -1006,7 +997,7 @@
     <string name="auth_accept_policies">Моля прегледайте и приемете политиките на сървъра:</string>
 
     <string name="settings_call_category">Обаждания</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Използвай мелодията по подразбиране на Element за входящи повиквания</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Използвай мелодията по подразбиране на Element за входящи повиквания</string>
     <string name="settings_call_ringtone_title">Мелодия за входящо повикване</string>
     <string name="settings_call_ringtone_dialog_title">Избор на мелодия за обаждания:</string>
 
@@ -1025,7 +1016,6 @@
     <string name="settings_show_avatar_display_name_changes_messages">Показване на събития за потребителски профили</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Включва промени в снимки и имена.</string>
     <string name="settings_password">Парола</string>
-    <string name="encryption_import_room_keys_success">%1$d/%2$d ключ(а) бяха успешно импортирани.</string>
 
     <string name="settings_labs_native_camera_summary">Използване на системната камера вместо собствената интеграция на приложението.</string>
     <string name="settings_labs_enable_send_voice_summary">Тази опция изисква отделно приложение за записване на съобщенията.</string>
@@ -1117,29 +1107,8 @@
 
     <string name="no_valid_google_play_services_apk">Не беше открит валиден APK пакет за Google Play услугите. Уведомленията може да не работят правилно.</string>
 
-    <string name="store_title">Element - комуникирайте по свой начин</string>
-    <string name="store_short_description">Универсален и сигурен чат изцяло под ваш контрол.</string>
-    <string name="store_full_description">"Чат приложение, което е изцяло гъвкаво и под Ваш контрол. Element позволява да комуникирате по начина, по който искате. Направено за [matrix] - стандарт за отворена и децентрализирана комуникация.
-
-Използвайте безплатен matrix.org акаунт, собствен сървър от https://modular.im или друг Matrix сървър.
-
-Защо да изберете Element?
-
-• ПЪЛНА КОМУНИКАЦИЯ: Създавайте каквито пожелаете чат стаи - свързани с работни екипи, приятели или друг вид общности! Чатете, споделяйте файлове, добавяйте приспособления и водете аудио и видео разговори - всичко това, изцяло безплатно.
-
-• МОЩНИ ИНТЕГРАЦИИ: Използвайте Element с досега-познатите Ви инструменти. Посредством Element дори можете да чатите с потребители и групи използващи други чат приложения.
-
-• ЛИЧНО И ЗАЩИТЕНО: Пазете комуникацията си в тайна. Съвременна технология за шифроване от край до край гарантира, че Вашата комуникацията наистина остава Ваша.
-
-• ОТВОРЕНО, А НЕ ЗАТВОРЕНО: Приложение с отворен код, изградено върху Matrix. Дръжте данните си под Ваш контрол, като използвате Ваш собствен сървър или като изберете сървър, на който вярвате.
-
-• КЪДЕТО И ДА СТЕ: Поддържайте връзка където и да сте, с напълно синхронизирана чат история на всички Ваши устройства или онлайн на https://riot.im."</string>
-
     <string name="video_call_in_progress">В момента тече видео разговор…</string>
 
-    <string name="store_whats_new">"Постоянно правим промени и подобрения по Element.
-Пълният списък с промени може да бъде намерен тук: %1$s.
-За да сте сигурни, че няма да пропуснете нищо, просто оставете автоматичните обновления включени."</string>
     <string name="title_activity_keys_backup_setup">Резервно копие на ключовете</string>
     <string name="title_activity_keys_backup_restore">Използвай резервно копие на ключовете</string>
     <string name="keys_backup_is_not_finished_please_wait">Резервното копиране на ключовете не е завършило. Моля почакайте…</string>
@@ -1148,7 +1117,6 @@
     <string name="done">Готово</string>
 
     <string name="settings_notification_advanced">Разширени настройки за известия</string>
-    <string name="settings_notification_advanced_summary">Настройка на важност според тип събитие, настройка на звук, LED, вибрация</string>
     <string name="settings_notification_by_event">Важност на известията според типа събитие</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Собствени настройки.</string>
@@ -1225,7 +1193,6 @@
     <string name="keys_backup_recovery_code_error_decrypt">Резервното копие не можа да бъде разшифровано с този ключ за възстановяване: потвърдете, че сте въвели правилния ключ за възстановяване.</string>
 
     <string name="keys_backup_restore_success_title">Резервното копие бе възстановено %s !</string>
-    <string name="keys_backup_restore_success_description">Бяха възстановени %1$d сесийни ключа и добавени %2$d нови ключа, досега непознати за това устройство</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Възстановено резервно копие с %d ключ.</item>
         <item quantity="other">Възстановено резервно копие с %d ключа.</item>
@@ -1498,11 +1465,6 @@
     <string name="keys_backup_unable_to_get_trust_info">Случи се грешка при извличане на информацията за довереността</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Случи се грешка при извличане на резервните данни за ключовете</string>
 
-    <string name="alpha_disclaimer_title">Добре дошли в beta версията!</string>
-    <string name="alpha_disclaimer_content_line_1">Докато Element е в ранен стадий на разработка някои функции може да липсват или да има бъгове.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Store описанието</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Ако намерите бъгове, моля докладвайте ги от най-горното ляво меню на началния екран и ще ги разрешим възможно най-бързо.</string>
-
     <string name="import_e2e_keys_from_file">Импортирай e2e ключове от файл \"%1$s\".</string>
 
     <string name="settings_sdk_version">Matrix SDK версия</string>
@@ -1516,7 +1478,6 @@
     <string name="settings_expert">Експертни</string>
     <string name="settings_push_rules">Правила за уведомление</string>
     <string name="settings_push_rules_no_rules">Не са дефинирани правила за уведомление</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">Списъкът с последни функции винаги е в %1$s. Ако намерите бъг, изпратете доклад за грешка от менюто горе в ляво, и ще го поправим възможно най-скоро.</string>
     <string name="settings_other_third_party_notices">Други известия</string>
     <string name="settings_push_gateway_no_pushers">Не са регистрирани адреси за push уведомления</string>
 
@@ -1541,16 +1502,6 @@
 
     <string name="settings_labs_show_hidden_events_in_timeline">Показвай скрити събития в чата</string>
 
-    <string name="store_riotx_title">Element - следващо поколение Matrix клиент</string>
-    <string name="store_riotx_short_description">По-бърз и по-лек Matrix клиент, използващ последните Android технологии</string>
-    <string name="store_riotx_full_description">Element в нов клиент за Matrix протокола (Matrix.org): отворена мрежа за сигурна, децентрализирана комуникация. Element е изцяло пренаписан Riot Android клиент, базиран на изцяло пренаписан Matrix Android SDK.
-\n
-\nЗабележка: Това е бета версия. Element в момента се разработва активно и все още има ограничения и (надяваме се не прекалено много) бъгове. Всякаква обратна връзка е добре дошла!
-\n
-\nElement поддържа: • Вход в съществуващ акаунт • Създаване на стая и влизане в публични стаи • Приемане и отхвърляне на покани • Показване на списък със стаите • Преглеждане на информация за стая • Изпращане на текстови съобщения • Изпращане на прикачени файлове • Четене и писане на съобщения в шифровани стаи • Шифроване: резервни копия на E2E ключове, потвърждение на устройства, заявяване и отговаряне на заявки за споделяне на ключове • Уведомления • Светла, Тъмна и Черна тема
-\n
-\nЗасега не всички функции на Element са налични в Element. Основни липсващи (и скоро пристигащи!) функции са: • Настройки на стаи (показване на членове и т.н.) • Обаждания • Приспособления • …</string>
-
     <string name="bottom_action_people_x">Директни съобщения</string>
 
     <string name="send_file_step_idle">Изчакване…</string>
@@ -1564,9 +1515,6 @@
 
     <string name="edited_suffix">(редактирано)</string>
 
-    <string name="riotx_no_registration_notice">%1$s за да създадете профил.</string>
-    <string name="riotx_no_registration_notice_colored_part">Използвай старото приложение</string>
-
 
     <string name="message_edits">Редакции на съобщението</string>
     <string name="no_message_edits_found">Не са открити редакции</string>
@@ -1601,11 +1549,6 @@
 
     <string name="widget_integration_review_terms">За да продължите трябва да приемете условията за използване на услугата.</string>
 
-    <string name="security_warning_identity_server">Предишни версии на Element имат проблем със сигурността, давайки достъп на сървъра за самоличност (%1$s) до профила ви. Ако се доверявате на %2$s, може да игнорирате проблема; в противен случай, излезте от профила си и влезте наново.
-\n
-\nНаучете повече подробности тук:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="terms_of_service">Условия за ползване</string>
     <string name="review_terms">Прегледай условията</string>
     <string name="terms_description_for_identity_server">Бъдете откриваеми от други</string>
@@ -1703,7 +1646,6 @@
     <string name="a11y_hide_password">Скрий паролата</string>
     <string name="a11y_jump_to_bottom">Отиди най-отдолу</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s и %3$d други прочетоха</string>
     <string name="three_users_read">%1$s, %2$s и %3$s прочетоха</string>
     <string name="two_users_read">%1$s и %2$s прочетоха</string>
     <string name="one_user_read">%s прочете</string>
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index 787132383c..10c0b793f7 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -250,7 +250,6 @@
     <string name="login_error_invalid_home_server">একটি বৈধ URL প্রবেশ করুন</string>
     <string name="login_error_unknown_host">এই URL টি পৌঁছানোর যোগ্য নয়, দয়া করে এটি পরীক্ষা করুন</string>
     <string name="login_error_ssl_handshake">আপনার যন্ত্র একটি সেকেলে TLS নিরাপত্তা খসড়া চুক্তি,অরক্ষিত সংঘর্ষ করতে ,আপনার নিত্যাপাত্তার জন্য আপনি সম্পর্ক করতে পারবেন না</string>
-    <string name="login_mobile_device">মোবাইল</string>
 
     <string name="login_error_forbidden">অবৈধ ব্যাবহারকারির নাম/সংকেত শব্দ</string>
     <string name="login_error_unknown_token">প্রবেশকারী টোকেনটা চিনতে নির্দিষ্ট ছিলো না</string>
@@ -260,10 +259,6 @@
     <string name="login_error_user_in_use">এই ব্যাবহারকারী আগেও নাম ব্যবহার করে ছিল</string>
     <string name="login_error_login_email_not_yet">এই ইমেইল লিংক যেটা এখনো ক্লিক করা হয়নি</string>
 
-    <string name="e2e_need_log_in_again">আপনার প্রয়জনীয় পিছনে লগ করা সেশানের জন্য এনক্রিপশন চাবি উৎপন্ন করতে শেষ থেকে শেষে এবং জমা করা জনগণ এর চাবি আপনার ঘরের লোক এর কাছে। 
-\nএটাই হলো একবার। 
-\nক্ষমা করবেন এটাই হলো অসুবিধা।</string>
-
     <string name="e2e_re_request_encryption_key"><u>পুনরায় অনুরোধ এনক্রিপশন চাবিগুলি</u>আপনার অন্য সেশানগুলি থেকে।</string>
 
     <string name="e2e_re_request_encryption_key_sent">চাবির অনুরোধ পাঠানো।</string>
@@ -298,7 +293,7 @@
     <string name="room_info_room_topic">ঘরএর বিষয়</string>
 
     <string name="settings_call_category">ডাকা</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">ব্যবহার করছেন অনুপস্থিত Element রিংটোন আগামী ডাক এর জন্য</string>
+    <string name="settings_call_ringtone_use_app_ringtone">ব্যবহার করছেন অনুপস্থিত Element রিংটোন আগামী ডাক এর জন্য</string>
     <string name="settings_call_ringtone_title">আসা কল এর রিংটোন</string>
     <string name="settings_call_ringtone_dialog_title">নির্বাচন করুন রিংটোন কল আর জন্য:</string>
 
@@ -420,15 +415,15 @@
     <string name="room_participants_action_set_default_power_level">স্বাভাবিক ব্যবহারকারী তে রিসেট করুন</string>
     <string name="room_participants_action_set_moderator">মডারেটর কর</string>
     <string name="room_participants_action_set_admin">অ্যাডমিন কর</string>
-    <string name="room_participants_action_ignore">এই ব্যবহারকারীর কাছ থেকে সব বার্তা লুকান</string>
-    <string name="room_participants_action_unignore">এই ব্যবহারকারীর সব বার্তা দেখান</string>
+    <string name="room_participants_action_ignore">উপেক্ষা</string>
+    <string name="room_participants_action_unignore">উপেক্ষা</string>
     <string name="room_participants_invite_search_another_user">ব্যবহারকারী আইডি, নাম বা ইমেইল</string>
     <string name="room_participants_action_mention">উল্লেখ</string>
     <string name="room_participants_action_devices_list">সেশান তালিকা প্রদর্শন কর</string>
     <string name="room_participants_power_level_prompt">আপনি এই পরিবর্তনটি পূর্বাবস্থায় ফিরিয়ে আনতে সক্ষম হবেন না যেহেতু আপনি ব্যবহারকারীকে একই শক্তি স্তর হিসাবে প্রচার করার জন্য প্রচার করছেন।
 \nআপনি কি নিশ্চিত\?</string>
 
-    <string name="room_participants_ban_prompt_msg">আপনি কি এই চ্যাট থেকে এই ব্যবহারকারীকে নিষিদ্ধ করতে চান\?</string>
+    <string name="room_participants_ban_prompt_msg">নিষিদ্ধ ব্যবহারকারীরা তাদের এই ঘর থেকে কীক মেরে দেবে এবং আবার যোগদান করতে বাধা দেবেন।</string>
     <string name="reason_hint">কারণ</string>
 
     <string name="room_participants_invite_prompt_msg">আপনি এই চ্যাটে %s কে আমন্ত্রণ জানাতে চান\?</string>
@@ -558,7 +553,6 @@
 
 
     <string name="settings_notification_advanced">উন্নত বিজ্ঞপ্তি সেটিংস</string>
-    <string name="settings_notification_advanced_summary">ইভেন্ট দ্বারা বিজ্ঞপ্তি সেট করুন, শব্দ, নেতৃত্বে, কম্পন কনফিগার করুন</string>
     <string name="settings_notification_by_event">ঘটনা দ্বারা বিজ্ঞপ্তির গুরুত্ব</string>
 
     <string name="settings_notification_privacy">বিজ্ঞপ্তির গোপনীয়তা</string>
@@ -661,9 +655,6 @@
     <string name="settings_theme">থিম</string>
 
     <string name="encryption_information_verify_device_warning">এই সেশানটি বিশ্বাসযোগ্য হতে পারে তা যাচাই করতে, অন্য কোন উপায়ে (যেমন ব্যক্তি বা ফোন কল) ব্যবহার করে তার মালিকের সাথে যোগাযোগ করুন এবং এই সেশানটির জন্য তাদের ব্যবহারকারী সেটিংসে এ কুঞ্জি দেখছে তা তাদের জিজ্ঞাসা করুন নীচের কুঞ্জিটির সাথে মেলে কিনা:</string>
-    <string name="e2e_enabling_on_app_update">দাঙ্গা এখন শেষ-থেকে-শেষ এনক্রিপশন সমর্থন করে তবে এটি সক্ষম করতে আপনাকে আবার লগ ইন করতে হবে।
-\n
-\nআপনি এখন বা পরে এপ্লিকেশন সেটিংস থেকে এটি করতে পারেন।</string>
 
     <string name="font_size">অক্ষর এর আকার</string>
     <string name="you_added_a_new_device">আপনি একটি নতুন সেশান \'%s\' যোগ করেছেন, যা এনক্রিপশন কীগুলির জন্য অনুরোধ করছে।</string>
@@ -677,7 +668,6 @@
     <string name="merged_events_collapse">বন্ধ</string>
 
     <string name="keys_backup_restore_with_key_helper">আপনার পুনরুদ্ধারের কুঞ্জি হারিয়ে গেছে\? আপনি সেটিংস একটি নতুন সেট আপ করতে পারেন।</string>
-    <string name="keys_backup_restore_success_description">"%1$d  সেশন কী পুনরুদ্ধার করা হয়েছে, এবং %2$d নতুন কী (গুলি) জোড়া হয়েছে যা এই ডিভাইসটি জানত না"</string>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="one">%d টি নতুন কী এই ডিভাইসে যোগ করা হয়েছে।</item>
         <item quantity="other">%d টি নতুন কী এই ডিভাইসে যোগ করা হয়েছে।</item>
@@ -958,7 +948,6 @@
     <string name="encryption_import_import">ইম্পোর্ট</string>
     <string name="encryption_never_send_to_unverified_devices_title">শুধুমাত্র যাচাই সেশানে এনক্রিপ্ট করুন</string>
     <string name="encryption_never_send_to_unverified_devices_summary">এই সেশান থেকে যাচাই করা সেশানগুলিতে এনক্রিপ্ট করা বার্তাগুলি কখনও প্রেরণ করবেন না।</string>
-    <string name="encryption_import_room_keys_success">%1$d/%2$d কুঞ্জি(গুলি) সাফল্য সাথে ইম্পোর্ট করা হয়েছে।</string>
 
     <string name="encryption_information_not_verified">যাচাই করা হয়নি</string>
     <string name="encryption_information_verified">প্রতিপাদিত</string>
@@ -1255,4 +1244,166 @@
     <string name="resource_limit_soft_mau"> এই হোমসার্ভারটি তার মাসিক অ্যাক্টিভ ব্যবহারকারীর সীমাটিতে আঘাত করেছে তাই <b> কিছু ব্যবহারকারী লগ ইন করতে পারবেন না </b>।</string>
     <string name="resource_limit_hard_mau">এই হোমসার্ভারটি তার মাসিক সক্রিয় ব্যবহারকারীর সীমাতে ছুঁয়েছে।</string>
 
+    <string name="resources_script">Beng</string>
+
+    <string name="play_video">চালু</string>
+    <string name="pause_video">থামাও</string>
+    <string name="dismiss">বাতিল</string>
+
+
+    <string name="action_copy">অনুলিপি</string>
+    <string name="dialog_title_success">সাফল্য</string>
+
+    <string name="bottom_action_notification">বিজ্ঞপ্তিগুলি</string>
+    <string name="call_failed_no_connection">এলিমেন্ট কল ব্যর্থ</string>
+    <string name="call_failed_no_connection_description">রিয়েল টাইম সংযোগ স্থাপন করতে ব্যর্থ।
+\nকলগুলি নির্ভরযোগ্যতার সাথে কাজ করার জন্য দয়া করে আপনার হোমসার্ভারের প্রশাসককে একটি টার্ন সার্ভার কনফিগার করতে বলুন।</string>
+
+    <string name="call_select_sound_device">সাউন্ড ডিভাইস নির্বাচন করুন</string>
+    <string name="sound_device_phone">ফোন</string>
+    <string name="sound_device_speaker">স্পিকার</string>
+    <string name="sound_device_headset">হেডসেট</string>
+    <string name="sound_device_wireless_headset">বেতার হেডসেট</string>
+    <string name="call_switch_camera">ক্যামেরা স্যুইচ করুন</string>
+    <string name="call_camera_front">সম্মুখ</string>
+    <string name="call_camera_back">পেছনের</string>
+    <string name="call_format_turn_hd_off">এইচডি বন্ধ করুন</string>
+    <string name="call_format_turn_hd_on">এইচডি চালু করুন</string>
+
+    <string name="login_error_ssl_peer_unverified">এসএসএল ত্রুটি: পিয়ারের পরিচয় যাচাই করা হয়নি।</string>
+    <string name="login_error_ssl_other">এসএসএল ত্রুটি।</string>
+    <string name="active_call_with_duration">অ্যাক্টিভ কল (%s)</string>
+    <string name="return_to_call">কল ফিরে যান</string>
+
+    <string name="room_participants_action_cancel_invite">আমন্ত্রণ বাতিল করুন</string>
+    <string name="room_participants_power_level_demote_warning_title">নিজেকে হিনপদস্থ করবেন\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">আপনি নিজেকে হ্রাসকারী হিসাবে আপনি এই পরিবর্তনটিকে পূর্বাবস্থায় ফিরিয়ে আনতে পারবেন না, আপনি যদি রুমের সর্বশেষ সুবিধাযুক্ত ব্যবহারকারী হন তবে সুযোগ সুবিধাগুলি ফিরে পাওয়া অসম্ভব।</string>
+    <string name="room_participants_power_level_demote">হীনপদস্থ</string>
+
+
+    <string name="room_participants_action_ignore_title">ব্যবহারকারীকে উপেক্ষা করুন</string>
+    <string name="room_participants_action_ignore_prompt_msg">এই ব্যবহারকারীর উপেক্ষা করা আপনার ভাগ করা কক্ষগুলি থেকে তাদের বার্তা সরিয়ে দেবে।
+\n
+\nআপনি সাধারণ সেটিংসে যে কোনও সময় এই ক্রিয়াটি বিপরীত করতে পারেন।</string>
+    <string name="room_participants_action_unignore_title">উপেক্ষা তালিকা থেকে ব্যবহারকারীকে সরান</string>
+    <string name="room_participants_action_unignore_prompt_msg">এই ব্যবহারকারী কে উপেক্ষা তালিকা থেকে সরালে তাদের থেকে সমস্ত বার্তা আবার দেখাবে।</string>
+    <string name="room_participants_action_cancel_invite_title">আমন্ত্রণ বাতিল করুন</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">আপনি কি নিশ্চিত যে আপনি এই ব্যবহারকারীর জন্য আমন্ত্রণটি বাতিল করতে চান\?</string>
+    <string name="room_participants_kick_title">ব্যবহারকারী কে কীক করুন</string>
+    <string name="room_participants_kick_reason">কীক করার কারণ</string>
+    <string name="room_participants_kick_prompt_msg">কীক করা ব্যবহারকারী কে তাদের এই ঘর থেকে সরিয়ে দেবে।
+\n
+\nতাদের আবার যোগদানের হাত থেকে বাঁচাতে আপনার পরিবর্তে ওদেরকে নিষিদ্ধ করা উচিত।</string>
+    <string name="room_participants_ban_title">ব্যবহারকারীকে নিষিদ্ধ করুন</string>
+    <string name="room_participants_ban_reason">নিষিদ্ধ করার কারণ</string>
+    <string name="room_participants_unban_title">ব্যবহারকারী কে নিষেধাজ্ঞা মুক্ত করুন</string>
+    <string name="room_participants_unban_prompt_msg">নিষিদ্ধ মুক্ত ব্যবহারকারীরা আবার ঘরে যোগদানের অনুমতি দেওয়া হবে।</string>
+
+    <string name="settings_secure_backup_section_title">সুরক্ষিত ব্যাকআপ</string>
+    <string name="settings_secure_backup_manage">পরিচালনা</string>
+    <string name="settings_secure_backup_setup">সুরক্ষিত ব্যাকআপ সেট আপ করুন</string>
+    <string name="settings_secure_backup_reset">সুরক্ষিত ব্যাকআপ পুনরায় সেট করুন</string>
+    <string name="settings_secure_backup_enter_to_setup">এই ডিভাইসে সেট আপ করুন</string>
+    <string name="settings_secure_backup_section_info">আপনার সার্ভারে এনক্রিপশন কীগুলি ব্যাক আপ করে এনক্রিপ্ট করা বার্তাগুলি এবং ডেটাতে অ্যাক্সেস হারানোর বিরুদ্ধে সুরক্ষা।</string>
+    <string name="reset_secure_backup_title">আপনার বিদ্যমান ব্যাকআপের জন্য একটি নতুন সুরক্ষা কী তৈরি করুন বা একটি নতুন সুরক্ষা বাক্য সেট করুন।</string>
+    <string name="reset_secure_backup_warning">এটি আপনার বর্তমান কী বা বাক্যাংশটি প্রতিস্থাপন করবে।</string>
+
+    <string name="disabled_integration_dialog_title">সংহতকরণ অক্ষম করা হয়েছে</string>
+    <string name="disabled_integration_dialog_content">এটি করতে সেটিংসে \'একীকরণের অনুমতি দিন\' সক্ষম করুন।</string>
+
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d নিষিদ্ধ ব্যবহারকারী</item>
+        <item quantity="other">%d নিষিদ্ধ ব্যবহারকারী</item>
+    </plurals>
+
+    <string name="encryption_exported_successfully">কীগুলি সফলভাবে উত্পাদন হয়েছিল</string>
+
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+
+    <string name="active_widget_view_action">দেখুন</string>
+    <string name="active_widgets_title">সক্রিয় উইজেটগুলি</string>
+
+
+    <string name="resource_limit_soft_contact">এই সীমাটি বৃদ্ধি পেতে দয়া করে %s করুন।</string>
+    <string name="resource_limit_hard_contact">এই পরিষেবাটি ব্যবহার চালিয়ে যেতে দয়া করে %s করুন।</string>
+
+    <string name="settings_lazy_loading_title">রুম সদস্যরাদের অলস লোড করুন</string>
+    <string name="settings_lazy_loading_description">প্রথম দর্শনে কেবল রুমের সদস্যদের লোড করে কর্মক্ষমতা বাড়ান।</string>
+    <string name="error_lazy_loading_not_supported_by_home_server">আপনার হোমসার্ভারটি এখনও সদস্যদের অলস লোডিং সমর্থন করে না। পরে চেষ্টা করুন।</string>
+
+    <string name="unknown_error">দুঃখিত, একটি ত্রুটি ঘটেছে</string>
+
+    <string name="settings_info_area_show">তথ্য অঞ্চলটি দেখান</string>
+    <string name="show_info_area_always">সর্বদা</string>
+    <string name="show_info_area_messages_and_errors">বার্তা এবং ত্রুটির জন্য</string>
+    <string name="show_info_area_only_errors">শুধুমাত্র ত্রুটির জন্য</string>
+
+    <string name="generic_label">%1$s:</string>
+    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="plus_x">+%d</string>
+    <string name="x_plus">%d+</string>
+    <string name="no_valid_google_play_services_apk">কোনও বৈধ গুগল প্লে পরিষেবা APK পাওয়া যায় নি। বিজ্ঞপ্তিগুলি সঠিকভাবে কাজ করতে পারে না।</string>
+
+    <string name="passphrase_create_passphrase">পাসফ্রেজ তৈরি করুন</string>
+    <string name="passphrase_confirm_passphrase">পাসফ্রেজ নিশ্চিত করুন</string>
+    <string name="passphrase_enter_passphrase">পাসফ্রেজ প্রবেশ করুন</string>
+    <string name="passphrase_passphrase_does_not_match">পাসফ্রেজ মেলে নি</string>
+    <string name="passphrase_empty_error_message">দয়া করে একটি পাসফ্রেজ লিখুন</string>
+    <string name="passphrase_passphrase_too_weak">পাসফ্রেজটি খুব দুর্বল</string>
+
+    <string name="keys_backup_passphrase_not_empty_error_message">আপনি যদি এলিমেন্টটি পুনরুদ্ধার কী তৈরি করতে চান তবে দয়া করে পাসফ্রেজটি মুছুন।</string>
+    <string name="keys_backup_no_session_error">কোনও ম্যাট্রিক্স সেশন উপলব্ধ নেই</string>
+
+    <string name="keys_backup_setup_step1_title">এনক্রিপ্ট করা বার্তাগুলি কখনই হারাবেন না</string>
+    <string name="keys_backup_setup_step1_description">এনক্রিপ্ট করা কক্ষের বার্তাগুলি শেষ-থেকে-শেষ এনক্রিপশন সহ সুরক্ষিত। এই বার্তাগুলি পড়ার জন্য কেবলমাত্র আপনার এবং প্রাপকের (গুলি) কী রয়েছে।
+\n
+\n আপনার কীগুলি এড়াতে নিরাপদে ব্যাক আপ দিন।</string>
+    <string name="keys_backup_setup">কী ব্যাকআপ ব্যবহার শুরু করুন</string>
+    <string name="keys_backup_setup_step1_advanced">(উন্নত)</string>
+    <string name="keys_backup_setup_step1_manual_export">ম্যানুয়ালি কী রপ্তানি করুন</string>
+
+    <string name="keys_backup_setup_step2_text_title">একটি পাসফ্রেজ দিয়ে আপনার ব্যাকআপ সুরক্ষিত করুন।</string>
+    <string name="keys_backup_setup_step2_text_description">আমরা আপনার হোমসভারে আপনার কীগুলির একটি এনক্রিপ্ট করা অনুলিপি সঞ্চয় করব। আপনার ব্যাকআপটিকে সুরক্ষিত রাখতে একটি পাসফ্রেজ দিয়ে সুরক্ষিত করুন।
+\n
+\nসর্বাধিক সুরক্ষার জন্য, এটি আপনার অ্যাকাউন্টের পাসওয়ার্ডের থেকে আলাদা হওয়া উচিত।</string>
+    <string name="keys_backup_setup_step2_button_title">পাসফ্রেজ সেট করুন</string>
+    <string name="keys_backup_setup_creating_backup">ব্যাকআপ তৈরি করা হচ্ছে</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">বা, আপনার ব্যাকআপটিকে পুনরুদ্ধার কী দ্বারা সুরক্ষিত করুন, এটি কোথাও নিরাপদ সাশ্রয় করুন।</string>
+    <string name="keys_backup_setup_step2_skip_button_title">(উন্নত) পুনরুদ্ধার কী সহ সেট আপ করুন</string>
+    <string name="keys_backup_setup_step3_success_title">সাফল্য!</string>
+    <string name="keys_backup_setup_step3_text_line1">আপনার কীগুলি ব্যাক আপ করা হচ্ছে।</string>
+    <string name="keys_backup_setup_step3_text_line2">আপনার পুনরুদ্ধার কীটি একটি সুরক্ষা জাল - আপনি যদি আপনার পাসফ্রেজ ভুলে যান তবে আপনি এটি আপনার এনক্রিপ্ট করা বার্তাগুলির অ্যাক্সেস পুনরুদ্ধার করতে ব্যবহার করতে পারেন।
+\nআপনার পুনরুদ্ধার কীটি কোথাও খুব সুরক্ষিত রাখুন যেমন একটি পাসওয়ার্ড পরিচালক (বা নিরাপদ)</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">আপনার পুনরুদ্ধার কীটি কোথাও খুব সুরক্ষিত রাখুন যেমন একটি পাসওয়ার্ড পরিচালক (বা নিরাপদ)</string>
+    <string name="keys_backup_setup_step3_button_title">সম্পন্ন</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">আমি একটি অনুলিপি তৈরি করেছি</string>
+    <string name="keys_backup_setup_step3_copy_button_title">রিকভারি কী সংরক্ষণ করুন</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">অংশভাগ</string>
+    <string name="keys_backup_setup_step3_save_button_title">ফাইল হিসাবে সংরক্ষণ করুন</string>
+    <string name="recovery_key_export_saved_as_warning">পুনরুদ্ধার কীটি \'%s\' তে সংরক্ষণ করা হয়েছে।
+\n
+\nসতর্কতা: অ্যাপ্লিকেশনটি আনইনস্টল করা হলে এই ফাইলটি মুছে যেতে পারে।</string>
+    <string name="recovery_key_export_saved">পুনরুদ্ধার কী সংরক্ষণ করা হয়েছে।</string>
+
+    <string name="keys_backup_setup_override_backup_prompt_tile">আপনার হোম সার্ভারে ইতিমধ্যে একটি ব্যাকআপ রয়েছে</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">দেখে মনে হচ্ছে আপনার অন্য সেশন থেকে ইতিমধ্যে সেটআপ কী ব্যাকআপ রয়েছে। আপনি কি এটি তৈরি করছেন তার সাথে প্রতিস্থাপন করতে চান\?</string>
+    <string name="keys_backup_setup_override_replace">প্রতিস্থাপন</string>
+    <string name="keys_backup_setup_override_stop">থামুন</string>
+
+    <string name="keys_backup_setup_step3_please_make_copy">দয়া করে একটি অনুলিপি করুন</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">এর সাথে পুনরুদ্ধার কী ভাগ করুন…</string>
+    <string name="keys_backup_setup_step3_generating_key_status">পাসফ্রেজ ব্যবহার করে পুনরুদ্ধার কী তৈরি করা হচ্ছে, এই প্রক্রিয়াটি কয়েক সেকেন্ড সময় নিতে পারে।</string>
+    <string name="recovery_key">পুনরুদ্ধার কী</string>
+    <string name="unexpected_error">অপ্রত্যাশিত ত্রুটি</string>
+    <string name="keys_backup_setup_backup_started_title">ব্যাকআপ শুরু হয়েছে</string>
+    <string name="keys_backup_setup_backup_started_message">আপনার এনক্রিপশন কীগুলি এখন ব্যাকগ্রাউন্ডে আপনার হোমসার্ভারে ব্যাক আপ করা হচ্ছে। প্রাথমিক ব্যাকআপটি কয়েক মিনিট সময় নিতে পারে।</string>
+
+
+    <string name="keys_backup_setup_skip_title">তুমি কি নিশ্চিত\?</string>
+    <string name="keys_backup_setup_skip_msg">আপনি লগ আউট বা এই ডিভাইসটি হারাতে পারলে আপনি আপনার বার্তাগুলির অ্যাক্সেস হারিয়ে ফেলতে পারেন।</string>
+
+    <string name="keys_backup_restore_is_getting_backup_version">ব্যাকআপ সংস্করণ আনছে…</string>
+    <string name="keys_backup_restore_with_passphrase">আপনার এনক্রিপ্ট করা বার্তাগুলির ইতিহাস আনলক করতে আপনার পুনরুদ্ধার পাসফ্রেজটি ব্যবহার করুন</string>
+    <string name="keys_backup_restore_use_recovery_key">আপনার পুনরুদ্ধার কী ব্যবহার করুন</string>
 </resources>
diff --git a/vector/src/main/res/values-bs/strings.xml b/vector/src/main/res/values-bs/strings.xml
index 168c2479ae..14727bd2ec 100644
--- a/vector/src/main/res/values-bs/strings.xml
+++ b/vector/src/main/res/values-bs/strings.xml
@@ -183,7 +183,6 @@ Odjavljeni ste sa svih uređaja i više nećete primati obavijesti. Da biste pon
     <string name="login_error_unable_register">Nemoguća registracija</string>
     <string name="login_error_unable_register_mail_ownership">Nemoguća registracija : problem sa vlasništvom email adrese</string>
     <string name="login_error_invalid_home_server">Unesite ispravan URL</string>
-    <string name="login_mobile_device">Mobitel</string>
 
     <string name="login_error_forbidden">Netačno korisničko ime/lozinka</string>
     <string name="login_error_unknown_token">Navedeni pristupni token nije prepoznat</string>
@@ -193,10 +192,6 @@ Odjavljeni ste sa svih uređaja i više nećete primati obavijesti. Da biste pon
     <string name="login_error_user_in_use">Ovo korisničko ime se već koristi</string>
     <string name="login_error_login_email_not_yet">Link email adrese koji još uvijek nije kliknut</string>
 
-    <string name="e2e_need_log_in_again">Morate se ponovno prijaviti da biste generisali krajnje ključeve za šifriranje za ovaj uređaj i poslali javni ključ svom lokalnom serveru.
-Ovo je isključeno.
-Oprostite na neugodnosti.</string>
-
     <string name="read_receipts_list">Čitajte Listu Primalaca</string>
 
     <string name="compression_options">"Pošalji kao "</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 3becd5213b..56bea320aa 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -211,7 +211,6 @@
     <string name="login_error_unable_register">No s\'ha pogut fer el registre</string>
     <string name="login_error_unable_register_mail_ownership">No s\'ha pogut fer el registre: s\'ha produït una errada en la propietat del correu electrònic</string>
     <string name="login_error_invalid_home_server">Introduïu una URL vàlida</string>
-    <string name="login_mobile_device">Mòbil</string>
 
     <string name="login_error_forbidden">El nom d\'usuari/contrasenya és invàlid</string>
     <string name="login_error_unknown_token">No s\'ha reconegut el testimoni d\'accés</string>
@@ -222,9 +221,6 @@
     <string name="login_error_login_email_not_yet">L\'enllaç del correu electrònic que encara no heu fet clic</string>
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">Heu de tornar a iniciar sessió per tal de generar claus de xifrat d\'extrema a extrem per a aquest dispositiu i enviar la clau pública al vostre servidor base.
-\nAixò només s\'ha de fer un cop.
-\nDisculpeu les molèsties.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Llegit per</string>
@@ -708,8 +704,6 @@ Atenció: es podria eliminar aquest fitxer si es desinstal·la l\'aplicació.</s
     <string name="encryption_information_verify_device_warning2">Si coincideix, premeu el botó per verificar. Si no coincideix, algú està interceptant aquest dispositiu i probablement voldreu prémer el botó per bloquejar-lo. En un futur aquest procés de verificació serà més sofisticat.</string>
     <string name="encryption_information_verify_key_match">Verifica que les claus coincideixen</string>
 
-    <string name="e2e_enabling_on_app_update">El Element ara permet l\'ús d\'encriptació d\'extrem a extrem però us heu de tronar a connectar per tal d\'activar-la.\n\nHo podeu fer ara o més tard des de les preferències de l\'aplicació.</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">La sala conté dispositius desconeguts</string>
     <string name="unknown_devices_alert_message">Aquesta sala conté dispositius desconeguts que no han estat verificats.\nAixò vol dir que no hi ha cap garantia que aquests dispositius siguin dels usuaris corresponents.\nEs recomana que feu el procés de verificació per a cada dispositiu abans de continuar, tot i que, si ho preferiu, podeu reenviar el missatge sense verificar.\n\nDispositius desconeguts:</string>
@@ -1035,7 +1029,7 @@ En voleu afegir algun?</string>
     <string name="accept">Acceptar</string>
 
     <string name="settings_call_category">Trucada</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Useu el to de Element per defecte per les trucades entrants</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Useu el to de Element per defecte per les trucades entrants</string>
     <string name="settings_call_ringtone_title">To de trucada entrant</string>
     <string name="settings_call_ringtone_dialog_title">Escolliu el to per les trucades:</string>
 
@@ -1095,8 +1089,6 @@ A la pantalla següent se us demanarà que permeteu al Element executar-se sempr
     <string name="settings_password">Contrasenya</string>
     <string name="account_additional_info">Informació addicional: %s</string>
 
-    <string name="encryption_import_room_keys_success">S\'ha importat %1$d/%2$d claus amb èxit.</string>
-
     <string name="markdown_has_been_enabled">S\'ha habilitat el Markdown.</string>
     <string name="markdown_has_been_disabled">S\'ha inhabilitat el Markdown.</string>
 
@@ -1113,11 +1105,6 @@ A la pantalla següent se us demanarà que permeteu al Element executar-se sempr
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">No s\'ha trobat cap APK de Google Play Services vàlid. Les notificacions poden no funcionar correctament.</string>
 
-    <string name="store_title">Element - Comunica\'t, a la teva manera</string>
-    <string name="store_whats_new">"Sempre hi som fent canvis i millores al Element.
-Podeu trobar el registre de canvis complet aquí: %1$s.
-Per assegurar-vos que no us perdeu res, només heu de mantenir les actualitzacions automàtiques habilitades."</string>
-    <string name="store_short_description">Una aplicació de xat universal i segura sota el vostre control.</string>
     <string name="title_activity_keys_backup_setup">Còpia de seguretat de la clau</string>
     <string name="title_activity_keys_backup_restore">Empra una còpia de seguretat de la clau</string>
 
@@ -1125,7 +1112,6 @@ Per assegurar-vos que no us perdeu res, només heu de mantenir les actualitzacio
     <string name="done">Fet</string>
 
     <string name="settings_notification_advanced">Paràmetres avançats de notificacions</string>
-    <string name="settings_notification_advanced_summary">Estableix la importància de les notificacions per tipus d\'esdeveniment, configura el so, led i vibració</string>
     <string name="settings_notification_by_event">Importància de les notificacions per esdeveniment</string>
 
     <string name="settings_notification_troubleshoot">Diagnostica les notificacions</string>
@@ -1237,21 +1223,6 @@ Aquest error és fora del control del Element. No hi ha cap compte de Google al
 Les tasques que l\'aplicació intenta fer estaran restringides agressivament mentre estigui al rerefons, i això pot afectar les notificacions.
 %1$s</string>
     <string name="settings_troubleshoot_test_battery_failed">Si un usuari deixa un dispositiu sense endollar i immòbil durant un període de temps, amb la pantalla apagada, el dispositiu entra en el mode d\'estalvi d\'energia. Això impedeix les aplicacions d\'accedir a la xarxa i ajorna les seves tasques, sincronitzacions i alarmes estàndard.</string>
-    <string name="store_full_description">"Una aplicació de xat, sota el vostre control i totalment flexible. El Element us permet comunicar-vos de la manera que preferiu. Fet per al [matrix] - l’estàndard per a la comunicació oberta i descentralitzada.
-
-Obteniu un compte gratuït de matrix.org, executeu el vostre servidor propi a https://modular.im, o empreu un altre servidor de Matrix.
-
-Per què triar Element?
-
-• COMUNICACIÓ COMPLETA: Creeu sales al voltant dels vostres equips, els vostre amics o la vostra comunitat - de la manera que preferiu! Converseu, compartiu fitxers, afegiu ginys i feu trucades de veu i vídeo - tot de manera gratuïta.
-
-• INTEGRACIONS POTENTS: Empreu el Element amb les eines que ja coneixeu i us agraden. Amb el Element fins i tot podeu conversar amb usuaris i grups d’altres aplicacions de xat.
-
-• PRIVAT I SEGUR: Mantingueu les vostres converses en secret. Xifratge punt a punt us assegura que les comunicacions privades continuaran sent privades.
-
-• OBERT, NO TANCAT: Programari lliure, i construït damunt de Matrix. Sigueu els propietaris de les vostres dades hostatjant el vostre servidor propi, o emprant un en què confieu.
-
-• ALLÀ ON SIGUEU: Esteu en contacte allà on esteu amb una sincronització total de l’historial dels missatges en tots els vostres dispositius, i en línia a https://riot.im."</string>
 
 
     <string name="keys_backup_setup_step3_generating_key_status">S\'està generant la clau de recuperació emprant una frase de pas. Aquest procés pot trigar uns segons.</string>
@@ -1293,7 +1264,6 @@ Per què triar Element?
 
     <string name="keys_backup_settings_delete_confirm_title">Suprimeix la còpia de seguretat</string>
 
-    <string name="keys_backup_restore_success_description">S\'ha restaurat %1$d claus de sessió, i afegit %2$d claus noves que no eren conegudes per aquest dispositiu</string>
     <string name="keys_backup_settings_signature_from_unknown_device">La còpia de seguretat té una signatura d\'un dispositiu desconegut amb ID %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">La còpia de seguretat té una signatura vàlida d\'aquest dispositiu.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">La còpia de seguretat té una signatura vàlida del dispositiu verificat %s.</string>
@@ -1546,12 +1516,6 @@ Per què triar Element?
     <string name="keys_backup_unable_to_get_trust_info">Hi ha hagut un error rebent informació de confança</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Hi ha hagut un error rebent dades de la còpia de seguretat de les claus</string>
 
-    <string name="alpha_disclaimer_title">Benvinguts a la beta!</string>
-    <string name="alpha_disclaimer_content_line_1">Mentre Element estigui en les primeres etapes de desenvolupament, faltaran algunes funcions i podríeu experimentar alguns errors.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">L\'última llista de característiques està sempre a %1$s, i si trobeu errors si us plau reporteu informe des de la part superior esquerra del menú d\'Inici, i el resoldrem tan aviat com puguem.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Descripció de la Play Store</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Si trobeu errors si us plau envieu un informe d\'errors des de la part superior esquerra del menú d\'Inici, i el resoldrem tan aviat com puguem.</string>
-
     <string name="import_e2e_keys_from_file">Importar claus e2e des del fitxer \"%1$s\".</string>
 
     <string name="settings_sdk_version">Versió de l\'SDK de Matrix</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index f082a68fa8..1db3b14c6f 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -196,7 +196,6 @@
     <string name="login_error_unable_register">Nelze se registrovat</string>
     <string name="login_error_unable_register_mail_ownership">Nelze se registrovat: chyba ověření vlastnictví e-mailu</string>
     <string name="login_error_invalid_home_server">Prosím, zadejte platné URL</string>
-    <string name="login_mobile_device">Mobil</string>
 
     <string name="login_error_forbidden">Neplatný uživatelský jméno/heslo</string>
     <string name="login_error_bad_json">Poškozený JSON</string>
@@ -247,10 +246,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="login_error_not_json">Neobsahuje platný JSON</string>
     <string name="login_error_login_email_not_yet">E-mailový odkaz, na který ještě nebylo klepnuto</string>
 
-    <string name="e2e_need_log_in_again">Je nutné se znovu přihlásit, aby byly vygenerovány E2E šifrovací klíče pro toto zařízení a odeslán veřejný klíč vašemu homeserveru.
-\nToto je nutné pouze jednou. 
-\nOmlouváme se za způsobené nepříjemnosti.</string>
-
     <string name="e2e_re_request_encryption_key">Znovu požádat o šifrovací klíče z vašich ostatních relací.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Žádost o klíče odeslána.</string>
@@ -258,8 +253,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <plurals name="membership_changes">
         <item quantity="one">1 změna členství</item>
         <item quantity="few">%d změny členství</item>
-        <item quantity="many">%d změn členství</item>
-        <item quantity="other" />
+        <item quantity="other">%d změn členství</item>
     </plurals>
 
     <string name="compression_options">Odeslat jako</string>
@@ -280,7 +274,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="room_info_room_topic">Téma místnosti</string>
 
     <string name="settings_call_category">Volání</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Použít původní vyzvánění Element pro příchozí hovory</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Použít původní vyzvánění Element pro příchozí hovory</string>
     <string name="settings_call_ringtone_title">Vyzvánění příchozího hovoru</string>
     <string name="settings_call_ringtone_dialog_title">Vybrat vyzvánění pro hovory:</string>
 
@@ -346,14 +340,12 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <plurals name="room_header_active_members_count">
         <item quantity="one">1 aktivní člen</item>
         <item quantity="few">%d aktivní členové</item>
-        <item quantity="many">%d aktivních členů</item>
-        <item quantity="other" />
+        <item quantity="other">%d aktivních členů</item>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">1 člen</item>
         <item quantity="few">%d členové</item>
-        <item quantity="many">%d členů</item>
-        <item quantity="other" />
+        <item quantity="other">%d členů</item>
     </plurals>
     <string name="room_title_one_member">1 člen</string>
     <plurals name="format_time_s">
@@ -444,8 +436,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <plurals name="room_new_messages_notification">
         <item quantity="one">1 nová zpráva</item>
         <item quantity="few">%d nové zprávy</item>
-        <item quantity="many">%d nových zpráv</item>
-        <item quantity="other" />
+        <item quantity="other">%d nových zpráv</item>
     </plurals>
 
     <string name="ssl_trust">Důvěřovat</string>
@@ -461,8 +452,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <plurals name="room_details_selected">
         <item quantity="one">1 vybrán</item>
         <item quantity="few">%d vybrány</item>
-        <item quantity="many">%d vybráno</item>
-        <item quantity="other" />
+        <item quantity="other">%d vybráno</item>
     </plurals>
     <string name="title_activity_keys_backup_setup">Záloha klíče</string>
     <string name="title_activity_keys_backup_restore">Použít zálohu klíče</string>
@@ -583,7 +573,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
 
     <string name="settings_notification_advanced">Rozšířená nestavení oznámení</string>
-    <string name="settings_notification_advanced_summary">Nastavit důležitost oznámení na základě události, nastavení zvuku, LED, vibrací</string>
     <string name="settings_notification_by_event">Důležitost oznámení na základě události</string>
 
     <string name="notification_sync_init">Spouštím služby</string>
@@ -1015,7 +1004,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="encryption_import_import">Import</string>
     <string name="encryption_never_send_to_unverified_devices_title">Šifruj pouze do ověřených relací</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Nikdy neposílejte šifrované zprávy do neověřených relací z této relace.</string>
-    <string name="encryption_import_room_keys_success">Klíče %1$d/%2$d importovány úspěšně.</string>
 
     <string name="encryption_information_not_verified">Není ověřeno</string>
     <string name="encryption_information_verified">Potvrzeno</string>
@@ -1078,9 +1066,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="encryption_information_verify_device_warning">Potvrďte porovnáním následujícího s nastavením uživatele ve svých dalších relacích:</string>
     <string name="encryption_information_verify_device_warning2">Pokud se neshodují, zabezpečení Vaší komunikace může být ohroženo.</string>
-    <string name="e2e_enabling_on_app_update">Element nyní podporuje šifrování end-to-end, ale pro aktivaci se musíte se opět přihlásit.
-\n
-\nMůžete to provést nyní nebo později z aplikačních nastavení.</string>
 
     <string name="unknown_devices_alert_title">Místnost obsahuje neznámé relace</string>
     <string name="unknown_devices_alert_message">Tato místnost obsahuje neznámé relace, která nebyla ověřena.
@@ -1329,25 +1314,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Žádný platný APK Google Plaz Services nenalezen. Oznámení možná nebudou pracovat spolehlivě.</string>
 
-    <string name="store_title">Element - Komunikujte, svým způsobem</string>
-    <string name="store_whats_new">Stále měníme a vylepšujeme Element. Úplný seznam změn je k nalezení zde: %1$s. Abyste zajistili, že nic nezmeškáte, ponechte aktualizace zapnuté.</string>
-    <string name="store_short_description">Univerzální zabezpečená chat aplikace zcela pod Vaší kontrolou.</string>
-    <string name="store_full_description">Chat aplikace pod Vaší kontrolou a zcela flexibilní. Element Vás nechá komunikovat způsobem, kterým chcete. Vytvořena pro [matrix] - standard otevřené, decentralizované komunikace.
-\n
-\nZaložte si bezplatný účet u matrix.org, založte si svůj server na https://modular.im nebo použijte jiný Matrix server.
-\n
-\nProč zvolit Element\?
-\n
-\n• KOMPLETNÍ KOMUNIKACE: Zakládejte místnosti pro své týmy, přátele, komunitu - jakkoli chcete! Chatujte, sdílejte soubory, přidávejte widgety, komunikujte hovorem či video hovorem - vše bezplatně.
-\n
-\n• HLUBOKÉ INTEGRACE: Používejte Element s nástroji, jež znáte a máte rádi. S Element můžete dokonce chatovat s uživateli a skupinami s jinými chat aplikacemi.
-\n
-\n• SOUKROMÁ A ZABEZBEČENÁ: Udržujte své konverzace tajné. Nejmodernější end-to-end šifrování zaručí, že soukromé konverzace soukromými zůstanou. 
-\n
-\n• OTEVŘENÁ, NE ZAVŘENÁ: Open source a postavená na Matrixu. Staňte se vlastníky svých dat tím, že si založíte vlastní server, nebo si zvolíte ten, jemuž důvěřujete.
-\n
-\n• KDEKOLI JSTE: Zůstaňte v kontaktu, ať už jste kdekoli, s plně synchronizovanou historií zpráv přes všechna svá zařízení nebo online u https://riot.im.</string>
-
     <string name="passphrase_create_passphrase">Založit heslo</string>
     <string name="passphrase_confirm_passphrase">Potvrdit heslo</string>
     <string name="passphrase_enter_passphrase">Zadat heslo</string>
@@ -1418,7 +1384,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="keys_backup_recovery_code_error_decrypt">Zálohu nebylo možno s tímto heslem dešifrovat: prosím, ověřte, že jste zadali správný klíč obnovy.</string>
 
     <string name="keys_backup_restore_success_title">Záloha obnovena %s !</string>
-    <string name="keys_backup_restore_success_description">Obnoveno %1$d relačních klíčů a doplněno %2$d nových klíčů, které této relaci nebyly známy</string>
     <string name="keys_backup_get_version_error">Načtení poslední verze klíčů obnovy selhalo (%s).</string>
     <string name="keys_backup_no_keysbackup_sdk_error">Krypto relace není zapnuto</string>
 
@@ -1520,11 +1485,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="identity_server_not_defined">Nepoužíváte žádný server pro identity</string>
     <string name="identity_server_not_defined_for_password_reset">Není konfigurován žádný server pro identity, musíte přenastavit heslo.</string>
 
-    <string name="security_warning_identity_server">Předchozí verze Elementu měly bezpečnostní chybu, jež umožnila serveru pro identity (%1$s) přístup k Vašemu účtu. Pokud důvěřujete %2$s, můžete ignorovat; jinak se, prosím, odhlašte a znovu přihlašte.
-\n
-\nDetaily zde:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="error_user_already_logged_in">Vypadá to, že se chcete připojit k jinému homeserveru. Chcete se odhlásit\?</string>
 
     <string name="edit">Upravit</string>
@@ -1581,12 +1541,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="keys_backup_unable_to_get_trust_info">Při načítání důvěryhodnosti došlo k chybě</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Při načítání dat zálohy klíčů došlo k chybě</string>
 
-    <string name="alpha_disclaimer_title">Vítejte v betě!</string>
-    <string name="alpha_disclaimer_content_line_1">Protože Element je v raném vývoji, některé funkce mohou chybět a mohou se objevit i chyby.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">Seznam nejnovějších funkcí je vždy na %1$s a pokud nejdete chyby, prosím, zapište hlášení v levém horním menu na domovské obrazovce. Opravíme je tak brzy, jak jen můžeme.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Popis v Play Store</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Pokud nejdete chyby, prosím, zapište hlášení v levém horním menu na domovské obrazovce. Opravíme je tak brzy, jak jen můžeme.</string>
-
     <string name="settings_sdk_version">Verze Matrix SDK</string>
     <string name="settings_other_third_party_notices">Jiná oznámení třetích stran</string>
     <string name="navigate_to_room_when_already_in_the_room">Již se díváte do této místnosti!</string>
@@ -1622,16 +1576,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Ukázat skryté události v časovém sledu</string>
 
-    <string name="store_riotx_title">Element - Klient Matrixu pro příští generaci</string>
-    <string name="store_riotx_short_description">Rychlejši a lehčí klient Matrixu s nejnovějšími konstrukcemi Androidu</string>
-    <string name="store_riotx_full_description">"Element je nový klient protokolu Matrix (Matrix.org): otevřená síť pro bezpečnou, decentralizovanou komunikaci. Element je úplný přepis klienta Riot Android založený na úplném přepisu Matrix Android SDK.
-\n
-\nProhlášení: Toto je beta verze. Element nyní prochází aktivním vývojem, obsahuje omezení a (doufáme, že ne moc) chyby. Veškerý feedback je vítán.
-\n
-\nElement podporuje: • Přihlášní do existujícího účtu  • Založení místnosti a vstup do veřejných místností  • Přijetí a odmítnutí pozvánek  • Seznam místností uživatelů  • Náhled podrobností místnosti  • Odesílání textových zpráv  • Odesílání příloh  • Čtení a psaní zpráv v zašifrovaných místnostech  • Krypto: záloha klíčů E2E, pokročilé ověření zařízení, požadavek na sdílení klíče a jeho uspokojení   • Push oznámení  • Světlý, tmavý a černý motiv
-\n
-\nJeště nejsou všechny funkce Elementu v Element implementovány. Hlavní chybějící funkce (přijdou brzy!): • Nastavení místnosti (seznam členů místnosti, atd.) • Hovory • Widgety • …"</string>
-
     <string name="bottom_action_people_x">Přímé zprávy</string>
 
     <string name="send_file_step_idle">Čekám…</string>
@@ -1645,9 +1589,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="edited_suffix">(upraveno)</string>
 
-    <string name="riotx_no_registration_notice">%1$s pro založení účtu.</string>
-    <string name="riotx_no_registration_notice_colored_part">Použít zastaralou aplikaci</string>
-
 
     <string name="message_edits">Úpravy zpráv</string>
     <string name="no_message_edits_found">Úpravy nenalezeny</string>
@@ -1726,7 +1667,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="a11y_hide_password">Skrýt heslo</string>
     <string name="a11y_jump_to_bottom">Přeskočit až dolů</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s a %3$d dalších přečetli</string>
     <string name="three_users_read">%1$s, %2$s a %3$s přečetli</string>
     <string name="two_users_read">%1$s a %2$s přečetli</string>
     <string name="one_user_read">%s přečetl(a)</string>
@@ -1966,7 +1906,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="settings_developer_mode_fail_fast_title">Fail-fast</string>
     <string name="settings_developer_mode_fail_fast_summary">Element se může zbořit častěji, když se objeví neočekávané chyby</string>
 
-    <string name="command_description_verify">Požadavek ověření daného uživatelského ID</string>
     <string name="command_description_shrug">Předsune ¯\\_(ツ)_/¯ do textové zprávy</string>
 
     <string name="create_room_encryption_title">Zapnout šifrování</string>
@@ -2192,7 +2131,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Klíče jsou již aktuální!</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="settings_key_requests">Požadavky na klíče</string>
 
@@ -2291,7 +2230,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="settings_messages_in_e2e_group_chat">Zašifrované zprávy ve skupinových chatech</string>
     <string name="settings_when_rooms_are_upgraded">Když dojde k upgradu místností</string>
     <string name="settings_troubleshoot_title">Řešit problémy</string>
-    <string name="settings_notification_advanced_summary_riotx">Nastavit důležitost oznámení podle události</string>
+    <string name="settings_notification_advanced_summary">Nastavit důležitost oznámení podle události</string>
 
     <string name="command_description_plain">Odešle zprávu jako prostý text bez interpretace markdown</string>
 
@@ -2357,12 +2296,12 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Režim letadlo je zapnut</string>
 
     <string name="use_other_session_content_description">Použijte na svých zařízeních nejnovější Element, Element Web, Element Desktop, Element iOS, Element pro Android nebo jiný Matrix klient schopný křížového přihlášení</string>
-    <string name="riot_desktop_web">Element Web
+    <string name="app_desktop_web">Element Web
 \nElement Desktop</string>
-    <string name="riot_ios_android">Element iOS
-\nElement pro Android</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
     <string name="or_other_mx_capabale_client">nebo jiný Matrix klient schopný křížového přihlášení</string>
-    <string name="use_latest_riot">Použijte na svých zařízeních nejnovější Element:</string>
+    <string name="use_latest_app">Použijte na svých zařízeních nejnovější Element:</string>
     <string name="command_description_discard_session">Vynutí zahození probíhající skupinové relace v šifrované místnosti</string>
     <string name="command_description_discard_session_not_handled">Podporováno jen v šifrovaných místnostech</string>
     <string name="enter_secret_storage_passphrase_or_key">Použijte své %1$s nebo použijte svůj %2$s a pokračujte.</string>
diff --git a/vector/src/main/res/values-da/strings.xml b/vector/src/main/res/values-da/strings.xml
index 5e92032c0d..676f4eebe3 100644
--- a/vector/src/main/res/values-da/strings.xml
+++ b/vector/src/main/res/values-da/strings.xml
@@ -182,7 +182,6 @@ Du er blevet logget ud af alle enheder og vil ikke længere modtage pushnotifika
     <string name="login_error_unable_register">Kunne ikke registrere</string>
     <string name="login_error_unable_register_mail_ownership">Kunne ikke registrere : email ejerskabsfejl</string>
     <string name="login_error_invalid_home_server">Skriv gyldig URL</string>
-    <string name="login_mobile_device">Mobil</string>
 
     <string name="login_error_forbidden">Ugyldigt brugernavn/password</string>
     <string name="login_error_unknown_token">Adgangstokenen du skrev blev ikke godkendt</string>
@@ -198,10 +197,6 @@ Du er blevet logget ud af alle enheder og vil ikke længere modtage pushnotifika
     <string name="option_take_photo">Tag billede</string>
     <string name="option_take_video">Optag video</string>
 
-    <string name="e2e_need_log_in_again">Du skal logge ind igen for at generere end-to-end krypteringsnøgler for denne enhed og sende public keyen til din homeserver.
-Dette skal kun gøres én gang.
-Beklager ulejligheden.</string>
-
     <string name="compression_options">"Send som "</string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Stor</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index b6afec5775..2579effd9c 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -84,7 +84,7 @@
     <string name="local_address_book_header">Lokales Adressbuch</string>
     <string name="matrix_only_filter">Nur Matrix-Kontakte</string>
     <string name="no_conversation_placeholder">Keine Konversationen</string>
-    <string name="no_contact_access_placeholder">Sie haben Element nicht erlaubt, auf lokale Kontakte zuzugreifen</string>
+    <string name="no_contact_access_placeholder">Element wurde nicht erlaubt, auf lokale Kontakte zuzugreifen</string>
     <string name="no_result_placeholder">Keine Ergebnisse</string>
 
     <!-- Rooms fragment -->
@@ -101,10 +101,10 @@
     <string name="send_bug_report_include_crash_logs">Absturzberichte übermitteln</string>
     <string name="send_bug_report_include_screenshot">Screenshot übermitteln</string>
     <string name="send_bug_report">Problem melden</string>
-    <string name="send_bug_report_description">Bitte beschreiben Sie das Problem. Was haben Sie genau gemacht\? Was sollte passieren\? Was passierte tatsächlich\?</string>
+    <string name="send_bug_report_description">Bitte beschreibe das Problem. Was hast du genau gemacht\? Was sollte passieren\? Was ist tatsächlich passiert\?</string>
     <string name="send_bug_report_placeholder">Problembeschreibung</string>
-    <string name="send_bug_report_logs_description">Um Probleme diagnostizieren zu können, werden Protokolle dieses Clients zusammen mit dem Fehlerbericht übermittelt. Dieser Fehlerbericht wird, wie die Protokolle und der Screenshot, nicht öffentlich sichtbar sein. Wenn Sie nur den oben eingegebenen Text senden möchten, bitte die nachfolgenden Haken entsprechend entfernen:</string>
-    <string name="send_bug_report_alert_message">Sie scheinen Ihr Telefon frustriert zu schütteln. Möchten Sie das Fenster zum Senden eines Fehlerberichts öffnen\?</string>
+    <string name="send_bug_report_logs_description">Um Probleme diagnostizieren zu können, werden Protokolle dieses Clients zusammen mit dem Fehlerbericht übermittelt. Dieser Fehlerbericht wird, wie die Protokolle und der Screenshot, nicht öffentlich sichtbar sein. Wenn du nur den oben eingegebenen Text senden möchtest, die nachfolgenden Haken entsprechend entfernen:</string>
+    <string name="send_bug_report_alert_message">Du scheinst dein Telefon frustriert zu schütteln. Möchtest du das Fenster zum Senden eines Fehlerberichts öffnen\?</string>
     <string name="send_bug_report_sent">Der Fehlerbericht wurde erfolgreich übermittelt</string>
     <string name="send_bug_report_failed">Der Fehlerbericht konnte nicht übermittelt werden (%s)</string>
     <string name="send_bug_report_progress">Fortschritt (%s%%)</string>
@@ -171,7 +171,7 @@
     <string name="auth_reset_password_missing_email">Die E-Mail-Adresse, die mit deinem Account verknüpft ist, muss eingegeben werden.</string>
     <string name="auth_reset_password_missing_password">Ein neues Passwort muss eingegeben werden.</string>
     <string name="auth_reset_password_email_validation_message">Eine E-Mail wurde an %s gesendet. Bitte dem in der E-Mail enthaltenen Link folgen und anschließend unten klicken.</string>
-    <string name="auth_reset_password_error_unauthorized">Verifizierung der E-Mail-Adresse ist fehlgeschlagen: Stelle sicher, dass du den Link in der E-Mail geöffnet hast</string>
+    <string name="auth_reset_password_error_unauthorized">Verifizierung der E-Mail-Adresse ist fehlgeschlagen. Stelle sicher, dass du den Link in der E-Mail geöffnet hast</string>
     <string name="auth_reset_password_success_message">Dein Passwort wurde zurückgesetzt.
 \n
 \nDu wurdest aus allen Sitzungen abgemeldet und wirst keine Push-Benachrichtigungen mehr erhalten. Um die Push-Benachrichtigungen wieder zu aktivieren, musst du dich auf jedem Gerät erneut anmelden.</string>
@@ -182,7 +182,7 @@
     <string name="login_error_unable_login">Login unmöglich</string>
     <string name="login_error_registration_network_error">Registrierung unmöglich: Netzwerkfehler</string>
     <string name="login_error_unable_register">Registrierung unmöglich</string>
-    <string name="login_error_unable_register_mail_ownership">Registrierung unmöglich: E-Mail-Adresse nicht verifizierbar</string>
+    <string name="login_error_unable_register_mail_ownership">Registrierung fehlgeschlagen: E-Mail-Adresse nicht verifizierbar</string>
     <string name="login_error_invalid_home_server">Bitte eine gültige URL eingeben</string>
 
     <string name="login_error_forbidden">Ungültige Zugangsdaten</string>
@@ -194,9 +194,6 @@
     <string name="login_error_login_email_not_yet">Der Link in der E-Mail wurde noch nicht geöffnet</string>
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">Du musst dich erneut anmelden, um Ende-zu-Ende-Verschlüsselungsschlüssel für diese Sitzung zu generieren und den öffentlichen Schlüssel an deinen Heimserver zu senden.
-\nDies ist einmalig.
-\nEntschuldige die Unannehmlichkeiten.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lesebestätigungsliste</string>
@@ -317,7 +314,7 @@ Du kannst dich mit einem anderen Konto anmelden oder diese E-Mail-Adresse zu die
     <string name="room_participants_action_set_admin">Zum Admin machen</string>
     <string name="room_participants_action_ignore">Alle Nachrichten dieses Nutzers verbergen</string>
     <string name="room_participants_action_unignore">Alle Nachrichten dieses Nutzers anzeigen</string>
-    <string name="room_participants_invite_search_another_user">Benutzer-ID, Name oder E-Mail-Adresse</string>
+    <string name="room_participants_invite_search_another_user">Nutzer-ID, Name oder E-Mail-Adresse</string>
     <string name="room_participants_action_mention">Erwähnen</string>
     <string name="room_participants_action_devices_list">Sitzungsliste anzeigen</string>
     <string name="room_participants_power_level_prompt">Du wirst diese Änderung nicht rückgängig machen können, da der Benutzer dasselbe Berechtigungslevel wie du selbst erhalten wirst.
@@ -493,7 +490,7 @@ Um fortzufahren, gib dein Passwort ein.</string>
 
     <string name="account_email_validation_title">Verifizierung ausstehend</string>
     <string name="account_email_validation_message">Bitte prüfe deinen E-Mail-Posteingang und klicke auf den in der E-Mail enthaltenen Link. Klicke anschließend auf Fortsetzen.</string>
-    <string name="account_email_validation_error">Verifizieren der E-Mail-Adresse unmöglich. Bitte prüfe deine E-Mails und klicke auf den enthaltenen Link. Anschließend klicke auf Fortsetzen.</string>
+    <string name="account_email_validation_error">Verifizieren der E-Mail-Adresse nicht möglich. Bitte prüfe deine E-Mails und klicke auf den enthaltenen Link. Anschließend klicke auf Fortsetzen.</string>
 
     <string name="account_email_already_used_error">Diese E-Mail-Adresse wird bereits verwendet.</string>
     <string name="account_email_not_found_error">Diese E-Mail-Adresse wurde nicht gefunden.</string>
@@ -565,7 +562,7 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="room_settings_category_advanced_title">Erweitert</string>
     <string name="room_settings_room_internal_id">Interne ID dieses Raumes</string>
     <string name="room_settings_addresses_pref_title">Adressen</string>
-    <string name="room_settings_labs_pref_title">Labor</string>
+    <string name="room_settings_labs_pref_title">Experimentelle Einstellungen</string>
     <string name="room_settings_labs_warning_message">Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können. Mit Vorsicht zu verwenden.</string>
     <string name="room_settings_labs_end_to_end">Ende-zu-Ende-Verschlüsselung</string>
     <string name="room_settings_labs_end_to_end_is_active">Ende-zu-Ende-Verschlüsselung ist aktiv</string>
@@ -601,7 +598,7 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="encryption_information_title">Ende-zu-Ende-Verschlüsselungs-Informationen</string>
 
     <string name="encryption_information_device_info">Ereignisinformation</string>
-    <string name="encryption_information_user_id">Benutzer-ID</string>
+    <string name="encryption_information_user_id">Nutzer-ID</string>
     <string name="encryption_information_curve25519_identity_key">Curve25519-Identitätsschlüssel</string>
     <string name="encryption_information_claimed_ed25519_fingerprint_key">Beanspruchter Ed25519-Fingerabdruckschlüssel</string>
     <string name="encryption_information_algorithm">Algorithmus</string>
@@ -650,26 +647,26 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="encryption_information_verify_device_warning2">Falls sie nicht übereinstimmen, wurde die Kommunikation vielleicht kompromittiert.</string>
     <string name="encryption_information_verify_key_match">Ich bestätige, dass die Schlüssel übereinstimmen</string>
 
-    <string name="e2e_enabling_on_app_update">Element unterstützt jetzt Ende-zu-Ende-Verschlüsselung, du musst dich jedoch erneut anmelden, um sie zu aktivieren.
-
-Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Raum enthält unbekannte Sitzungen</string>
-    <string name="unknown_devices_alert_message">Dieser Raum enthält unbekannte Sitzungen, die noch nicht verifiziert wurden. Es gibt also keine Garantie, dass diese Sitzung wirklich der angegebenen Person gehören. Wir empfehlen, den Verifizierungsprozess für jedes Gerät zu durchlaufen, bevor du fortfährst. Du kannst die Nachricht aber auch ohne Verifizierung senden, wenn du das vorziehst. Unbekannte Sitzungen:</string>
+    <string name="unknown_devices_alert_message">Dieser Raum enthält unbekannte Sitzungen, die noch nicht verifiziert wurden.
+\nEs gibt also keine Garantie, dass diese Sitzung wirklich der angegebenen Person gehören.
+\nWir empfehlen, den Verifizierungsprozess für jedes Gerät zu durchlaufen, bevor du fortfährst. Du kannst die Nachricht aber auch ohne Verifizierung senden, wenn du das vorziehst. 
+\n
+\nUnbekannte Sitzungen:</string>
 
     <!-- directory activity  -->
     <string name="select_room_directory">Raum-Verzeichnis auswählen</string>
     <string name="directory_server_fail_to_retrieve_server">Der Server kann nicht verfügbar oder überlastet sein</string>
-    <string name="directory_server_type_homeserver">Gib einen Heimserver ein, um seine öffentlichen Räume aufzulisten</string>
-    <string name="directory_server_placeholder">Heimserver-URL</string>
+    <string name="directory_server_type_homeserver">Gib einen Home-Server ein, um seine öffentlichen Räume aufzulisten</string>
+    <string name="directory_server_placeholder">Home-Server-URL</string>
     <string name="directory_server_all_rooms_on_server">Alle Räume auf dem %s-Server</string>
     <string name="directory_server_native_rooms">Alle nativen %s-Räume</string>
 
     <!-- historical -->
     <string name="historical_placeholder">Suche nach historischen</string>
 
-    <string name="settings_user_interface">Benutzer-Oberfläche</string>
+    <string name="settings_user_interface">Nutzer-Oberfläche</string>
     <string name="settings_interface_language">Sprache</string>
     <string name="settings_select_language">Wähle Sprache</string>
 
@@ -686,7 +683,7 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
 
     <string name="offline">Offline</string>
 
-    <string name="user_directory_header">Benutzer-Verzeichnis</string>
+    <string name="user_directory_header">Nutzer-Verzeichnis</string>
     <string name="people_search_user_directory">BENUTZER-VERZEICHNIS (%s)</string>
     <string name="settings_data_save_mode">Datensparsamer Modus</string>
 
@@ -722,8 +719,6 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="dark_theme">Dunkles Design</string>
     <string name="black_them">Schwarzes Design</string>
 
-    <string name="login_mobile_device">Mobilgerät</string>
-
     <string name="notification_sync_in_progress">Synchronisiere…</string>
     <string name="notification_listening_for_events">Auf Ereignisse lauschen</string>
 
@@ -774,13 +769,13 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="groups_header">Communities</string>
     <string name="no_group_placeholder">Keine Gruppen</string>
 
-    <string name="start_new_chat_prompt_msg">Sind Sie sicher, dass Sie einen neuen Chat mit %s starten möchten\?</string>
-    <string name="start_voice_call_prompt_msg">Sind Sie sicher, dass Sie einen Sprachanruf starten möchten\?</string>
-    <string name="start_video_call_prompt_msg">Sind Sie sicher, dass Sie einen Videoanruf starten möchten\?</string>
+    <string name="start_new_chat_prompt_msg">Sicher, dass du einen neuen Chat mit %s starten möchtest\?</string>
+    <string name="start_voice_call_prompt_msg">Sicher, dass du einen Sprachanruf starten möchtest\?</string>
+    <string name="start_video_call_prompt_msg">Sicher, dass du einen Videoanruf starten möchtest\?</string>
 
     <string name="groups_list">Gruppenliste</string>
 
-    <string name="room_participants_ban_prompt_msg">Bist du sicher, dass du diesen Nutzer aus diesem Chat verbannen möchtest?</string>
+    <string name="room_participants_ban_prompt_msg">Ein Bann führt zu einem Ausschluss eines Nutzers von diesem Raum und verhindert einen erneuten Beitritt.</string>
 
     <string name="room_settings_all_messages_noisy">Alle Nachrichten (laut)</string>
     <string name="room_settings_all_messages">Alle Nachrichten</string>
@@ -790,14 +785,14 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="settings_vibrate_on_mention">Vibriere beim Erwähnen eines Nutzers</string>
 
     <string name="room_settings_room_notifications_title">Benachrichtigungen</string>
-    <string name="room_settings_no_flair">Dieser Raum zeigt keine Flairs für irgendeine Community an</string>
+    <string name="room_settings_no_flair">Dieser Raum zeigt für keine Communities die Abzeichen an</string>
     <string name="room_settings_add_new_group">Neue Community-ID (z.B. +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">Ungültige Community-ID</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' ist keine valide Community-ID</string>
 
 
     <string name="create">Erstellen</string>
-    <string name="create_community">Erstelle Community</string>
+    <string name="create_community">Community erstellen</string>
     <string name="community_name">Community-Name</string>
     <string name="community_name_hint">Beispiel</string>
     <string name="community_id">Community-ID</string>
@@ -824,7 +819,7 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="forget_room">Raum vergessen</string>
     <string name="room_settings_add_homescreen_shortcut">Startbildschirm-Verknüpfung hinzufügen</string>
 
-    <string name="settings_flair">Flair</string>
+    <string name="settings_flair">Abzeichen</string>
 
     <string name="send_bug_report_rage_shake">Schüttele, um einen Fehler zu melden</string>
 
@@ -888,7 +883,7 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="settings_notification_privacy_need_permission">Dies App braucht die Berechtigung im Hintergrund zu laufen</string>
     <string name="settings_notification_privacy_fcm">• Benachrichtigungen werden über Firebase Cloud Messaging versendet</string>
     <string name="settings_notification_privacy_metadata">• Benachrichtigungen enthalten nur Metadaten</string>
-    <string name="settings_notification_privacy_secure_message_content">• Der Nachrichteninhalt der Benachrichtigung wird <b>sicher vom Matrix-Heimserver abgerufen</b></string>
+    <string name="settings_notification_privacy_secure_message_content">• Der Nachrichteninhalt der Benachrichtigung wird <b>sicher vom Matrix-Home-Server abgerufen</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• Benachrichtigungen enthalten <b>Metadaten und Nachrichteninhalte</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Benachrichtigungen werden <b>den Nachrichteninhalt nicht anzeigen</b></string>
 
@@ -900,9 +895,11 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="title_activity_choose_sticker">Sende einen Sticker</string>
 
     <string name="option_send_sticker">Sende Sticker</string>
-    <string name="no_sticker_application_dialog_content">Sie haben aktuell keine Stickerpakete aktiviert. Möchten Sie welche hinzufügen\?</string>
+    <string name="no_sticker_application_dialog_content">Du hast aktuell keine Stickerpakete aktiviert.
+\n
+\nMöchtest du welche hinzufügen\?</string>
 
-    <string name="settings_deactivate_account_section">Deaktiviere Account</string>
+    <string name="settings_deactivate_account_section">Account deaktivieren</string>
     <string name="settings_deactivate_my_account">Deaktivere meinen Account</string>
 
     <string name="settings_opt_in_of_analytics">Sende Analysedaten</string>
@@ -948,7 +945,7 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
 
     <string name="error_empty_field_your_password">Bitte gib dein Passwort ein.</string>
 
-    <string name="send_bug_report_description_in_english">Wenn möglich, schreiben Sie bitte auf Englisch.</string>
+    <string name="send_bug_report_description_in_english">Schreibe bitte auf Englisch, wenn möglich.</string>
     <string name="room_message_placeholder_reply_to_encrypted">Sende verschlüsselte Antwort…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Sende unverschlüsselte Antwort…</string>
     <string name="settings_preview_media_before_sending">Zeige Medien vor dem Senden</string>
@@ -1020,11 +1017,11 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
 
     <string name="resource_limit_contact_admin">kontaktiere deinen Service-Administrator</string>
 
-    <string name="resource_limit_soft_default">Dieser Heimserver hat einen seiner Ressourcen-Limits erreicht, sodass <b>einige Nutzer sich nicht anmelden können</b>.</string>
-    <string name="resource_limit_hard_default">Dieser Heimserver hat einen seiner Ressourcen-Limits überschritten.</string>
+    <string name="resource_limit_soft_default">Dieser Home-Server hat einen seiner Ressourcen-Limits erreicht, sodass <b>einige Nutzer sich nicht anmelden können</b>.</string>
+    <string name="resource_limit_hard_default">Dieser Home-Server hat einen seiner Ressourcen-Limits überschritten.</string>
 
-    <string name="resource_limit_soft_mau"> Dieser Heimserver hat sein Limit an monatlich aktiven Nutzern erreicht, sodass <b>einige Nutzer sich nicht anmelden können</b>.</string>
-    <string name="resource_limit_hard_mau">Dieser Heimserver hat sein Limit an monatlich aktiven Nutzern erreicht.</string>
+    <string name="resource_limit_soft_mau"> Dieser Home-Server hat sein Limit an monatlich aktiven Nutzern erreicht, sodass <b>einige Nutzer sich nicht anmelden können</b>.</string>
+    <string name="resource_limit_hard_mau">Dieser Home-Server hat sein Limit an monatlich aktiven Nutzern erreicht.</string>
 
     <string name="resource_limit_soft_contact">Bitte %s um dieses Limit anheben zu lassen.</string>
     <string name="resource_limit_hard_contact">Bitte %s um diesen Dienst weiter zu nutzen.</string>
@@ -1033,7 +1030,7 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
 
     <string name="settings_lazy_loading_title">Raummitglieder bei Bedarf nachladen</string>
     <string name="settings_lazy_loading_description">Verbessere Performanz, indem Raum-Mitglieder erst beim ersten Ansehen geladen werden.</string>
-    <string name="error_lazy_loading_not_supported_by_home_server">Dein Heimserver unterstützt nachladen von Raummitgliedern noch nicht. Versuche es später.</string>
+    <string name="error_lazy_loading_not_supported_by_home_server">Dein Home-Server unterstützt noch nicht das Nachladen von Raummitgliedern. Versuche es später.</string>
 
     <string name="unknown_error">Entschuldige, ein Fehler trat auf</string>
 
@@ -1060,7 +1057,7 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="room_participants_action_kick">Kicken</string>
     <string name="reason_hint">Grund</string>
 
-    <string name="settings_inline_url_preview_summary">Im Chat Linkvorschau aktivieren, wenn dein Heimserver diese Funktion unterstützt.</string>
+    <string name="settings_inline_url_preview_summary">Linkvorschau im Chat aktivieren, falls dein Home-Server diese Funktion unterstützt.</string>
     <string name="settings_send_typing_notifs">Sende Schreibbenachrichtigungen</string>
     <string name="settings_send_typing_notifs_summary">Lasse andere Benutzer wissen, dass du tippst.</string>
     <string name="settings_send_markdown">Markdown-Formatierung</string>
@@ -1080,15 +1077,13 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="settings_show_avatar_display_name_changes_messages">Zeige Konto-Ereignisse</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Enthält Änderungen des Profilbilds und des Anzeigenamens.</string>
     <string name="settings_call_category">Anrufe</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Nutze den Standard-Klingelton von Element für eingehende Anrufe</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Nutze den Standard-Klingelton von Element für eingehende Anrufe</string>
     <string name="settings_call_ringtone_title">Klingelton für eingehende Anrufe</string>
     <string name="settings_call_ringtone_dialog_title">Wähle Klingelton für Anrufe:</string>
 
     <string name="accept">Akzeptieren</string>
 
-    <string name="auth_accept_policies">Bitte prüfe und akzeptiere die Richtlinien dieses Heimservers:</string>
-
-    <string name="encryption_import_room_keys_success">%1$d/%2$d Schlüssel erfolgreich importiert.</string>
+    <string name="auth_accept_policies">Bitte prüfe und akzeptiere die Richtlinien dieses Home-Servers:</string>
 
     <string name="settings_troubleshoot_diagnostic_run_button_title">Tests ausführen</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Läuft… (%1$d von %2$d)</string>
@@ -1123,9 +1118,8 @@ Bitte überprüfe die Kontoeinstellungen.</string>
     <string name="settings_troubleshoot_test_fcm_failed">Abfragen des FCM-Tokens fehlgeschlagen:
 \n%1$s</string>
 
-    <string name="settings_troubleshoot_test_token_registration_success">FCM-Token erfolgreich beim Heimserver registriert.</string>
-    <string name="settings_troubleshoot_test_token_registration_failed">FCM-Token konnte nicht beim Heimserver registriert werden:
-%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCM-Token erfolgreich beim Home-Sserver registriert.</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">FCM-Token konnte nicht beim Home-Server registriert werden: %1$s</string>
 
     <string name="settings_troubleshoot_test_foreground_service_started_title">Benachrichtigungsdienst</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Benachrichtigungsdienst läuft.</string>
@@ -1173,29 +1167,8 @@ Versuche die Anwendung neuzustarten.</string>
 
     <string name="no_valid_google_play_services_apk">Keine validen Google-Play-Dienste gefunden. Benachrichtigungen könnten nicht richtig funktionieren.</string>
 
-    <string name="store_title">Element - Kommuniziere auf deine Weise</string>
-    <string name="store_short_description">Eine universelle, sichere Chat-App - komplett unter deiner Kontrolle.</string>
-    <string name="store_full_description">Eine Chat-App unter deiner Kontrolle und total flexibel. Element lässt dich auf die Art kommunizieren, wie du willst. Die App wurde gemacht für [matrix] - dem Standard für offene, dezentrale Komunikation.
-\n
-\nHole dir ein kostenloses Konto auf matrix.org, hol dir einen eigenen Server auf https://modular.im oder nutze einen anderen Matrix-Server.
-\n
-\nWarum solltest du Element wählen\?
-\n
-\n• KOMPLETTE KOMMUNIKATION: Baue Räume um deine Teams, deine Freunde, deine Community - wie auch immer du willst! Chatte, teile Dateien, füge Widgets hinzu und führe Sprach- und Videotelefonate - alles kostenlos.
-\n
-\n• MÄCHTIGE INTEGRATIONEN: Benutze Element mit den Werkzeugen die du kennst und liebst. Mit Element kannst du sogar mit Personen und Gruppen chatten, die andere Chat-Anwendungen benutzen.
-\n
-\n• PRIVAT UND SICHER: Halte deine Konversationen geheim. Aktuellste Ende-zu-Ende-Verschlüsselung sorgt dafür, dass deine private Kommunikation auch privat bleibt.
-\n
-\n• OFFEN - NICHT VERSCHLOSSEN: Quelloffen und basierend auf Matrix. Behalte deine Daten indem du deinen eigenen Server betreibst oder einen auswählst dem du vertraust.
-\n
-\n• WO AUCH IMMER DU BIST: Bleibe im Kontakt wo auch immer du bist, wobei deine Nachrichtenhistorie zwischen all deinen Geräten und auch deinem Messenger im Browser synchronisiert wird. Schau dir dazu auch riot.im an.</string>
-
     <string name="video_call_in_progress">Videogespräch aktiv…</string>
 
-    <string name="store_whats_new">"An Element werden ständig Änderungen und Verbesserungen durchgeführt.
-Das vollständige Änderungsprotokoll ist hier zu finden: %1$s.
-Um sicherzustellen, dass du nichts verpasst, lass deine Updates einfach aktiviert."</string>
     <string name="title_activity_keys_backup_setup">Schlüssel-Sicherung</string>
     <string name="title_activity_keys_backup_restore">Schlüssel-Sicherung verwenden</string>
     <string name="keys_backup_is_not_finished_please_wait">Schlüsselsicherung ist nicht abgeschlossen. Bitte warten…</string>
@@ -1235,7 +1208,7 @@ Um sicherzustellen, dass du nichts verpasst, lass deine Updates einfach aktivier
     <string name="recovery_key">Wiederherstellungsschlüssel</string>
     <string name="unexpected_error">Unerwarteter Fehler</string>
     <string name="keys_backup_setup_backup_started_title">Sicherung gestartet</string>
-    <string name="keys_backup_setup_skip_title">Sind Sie sicher\?</string>
+    <string name="keys_backup_setup_skip_title">Bist du sicher\?</string>
     <string name="keys_backup_restore_key_enter_hint">Wiederherstellungsschlüssel eingeben</string>
 
     <string name="keys_backup_restore_setup_recovery_key">Nachrichtenwiederherstellung</string>
@@ -1250,8 +1223,7 @@ Um sicherzustellen, dass du nichts verpasst, lass deine Updates einfach aktivier
 
     <string name="keys_backup_settings_delete_confirm_title">Lösche Sicherung</string>
 
-    <string name="settings_notification_advanced_summary">Setze Wichtigkeit von Benachrichtigungen nach Ereignis; konfiguriere Ton, LED, Vibration</string>
-    <string name="settings_notification_by_event">Wichtigkeit der Benachrichtigung nach Ereignis</string>
+    <string name="settings_notification_by_event">Präferenz der Benachrichtigungen nach Ereignis</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 Dieser Fehler ist außerhalb von Element passiert. Google sagt, dass dieses Gerät zu viele Apps registriert hat um FCM zu nutzen. Der Fehler taucht nur auf, wenn sehr viele Apps installiert sind. Er sollte also den Durchschnittsnutzer nicht betreffen.</string>
@@ -1270,26 +1242,25 @@ Dieser Fehler ist außerhalb von Element passiert. Es gibt kein Google-Konto auf
 \nWarnung: Diese Datei wird gelöscht, wenn die Anwendung deinstalliert wird.</string>
 
     <string name="keys_backup_setup_step3_generating_key_status">Wiederherstellungsschlüssel aus Passphrase generieren. Dies kann mehrere Sekunden brauchen.</string>
-    <string name="keys_backup_setup_backup_started_message">Deine Verschlüsselungsschlüssel werden nun im Hintergrund auf deinem Heimserver gesichert. Die initiale Sicherung kann mehrere Minuten dauern.</string>
+    <string name="keys_backup_setup_backup_started_message">Deine Verschlüsselungsschlüssel werden nun im Hintergrund auf deinem Home-Server gesichert. Die initiale Sicherung kann mehrere Minuten dauern.</string>
 
 
-    <string name="keys_backup_setup_skip_msg">Sie verlieren möglicherweise den Zugang zu Ihren Nachrichten, wenn Sie sich abmelden oder das Gerät verlieren.</string>
+    <string name="keys_backup_setup_skip_msg">Du verlierst möglicherweise den Zugang zu deinen Nachrichten, wenn du dich abmeldest oder das Gerät verlierst.</string>
 
     <string name="keys_backup_restore_is_getting_backup_version">Rufe Backup-Version ab…</string>
-    <string name="keys_backup_restore_with_passphrase">Nutzen Sie Ihre Wiederherstellungspassphrase, um Ihren verschlüsselten Chatverlauf lesen zu können</string>
-    <string name="keys_backup_restore_use_recovery_key">nutzen Sie Ihren Wiederherstellungsschlüssel</string>
-    <string name="keys_backup_restore_with_passphrase_helper_with_link">Wenn Sie Ihre Wiederherstellungspassphrase nicht wissen, können Sie %s.</string>
+    <string name="keys_backup_restore_with_passphrase">Nutze deine Wiederherstellungspassphrase, um deinen verschlüsselten Chatverlauf lesen zu können</string>
+    <string name="keys_backup_restore_use_recovery_key">nutze deinen Wiederherstellungsschlüssel</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Wenn du deine Wiederherstellungspassphrase nicht weist, kannst du %s.</string>
 
-    <string name="keys_backup_restore_with_recovery_key">Nutzen Sie Ihren Wiederherstellungsschlüssel, um Ihren verschlüsselten Chatverlauf lesen zu können</string>
-    <string name="keys_backup_restore_with_key_helper">Haben Sie Ihren Wiederherstellungsschlüssel verloren\? Sie können einen neuen in den Einstellungen einrichten.</string>
-    <string name="keys_backup_passphrase_error_decrypt">Sicherung konnte mit dieser Passphrase nicht entschlüsselt werden. Bitte stellen Sie sicher, dass Sie die korrekte Wiederherstellungspassphrase eingegeben haben.</string>
-    <string name="network_error_please_check_and_retry">Netzwerkfehler: Bitte überprüfen Sie Ihre Verbindung und versuchen Sie es erneut.</string>
+    <string name="keys_backup_restore_with_recovery_key">Nutze deinen Wiederherstellungsschlüssel, um deinen verschlüsselten Chatverlauf lesen zu können</string>
+    <string name="keys_backup_restore_with_key_helper">Hast du deinen Wiederherstellungsschlüssel verloren\? Du kannst einen neuen in den Einstellungen einrichten.</string>
+    <string name="keys_backup_passphrase_error_decrypt">Sicherung konnte mit dieser Passphrase nicht entschlüsselt werden. Bitte stelle sicher, dass du die korrekte Wiederherstellungspassphrase eingegeben hast.</string>
+    <string name="network_error_please_check_and_retry">Netzwerkfehler: Bitte überprüfe die Verbindung und versuche es erneut.</string>
 
-    <string name="keys_backup_recovery_code_empty_error_message">Bitte geben Sie Ihren Wiederherstellungsschlüssel ein</string>
-    <string name="keys_backup_recovery_code_error_decrypt">Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden. Bitte stellen Sie sicher, dass Sie den korrekten Wiederherstellungsschlüssel eingegeben haben.</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Gib deinen Wiederherstellungsschlüssel ein</string>
+    <string name="keys_backup_recovery_code_error_decrypt">Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden. Bitte stelle sicher, dass du den korrekten Wiederherstellungsschlüssel eingegeben hast.</string>
 
     <string name="keys_backup_restore_success_title">Sicherung wiederhergestellt %s !</string>
-    <string name="keys_backup_restore_success_description">%1$d Sitzungsschlüssel wurde(n) wiederhergestellt und %2$d vorher unbekannte(r) Schlüssel wurde(n) hinzugefügt</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Backup mit %d Schlüssel wiederhergestellt.</item>
         <item quantity="other">Backup mit %d Schlüsseln wiederhergestellt.</item>
@@ -1305,7 +1276,7 @@ Dieser Fehler ist außerhalb von Element passiert. Es gibt kein Google-Konto auf
 
     <string name="keys_backup_settings_status_ok">Die Schlüsselsicherung wurde für diese Sitzung korrekt eingerichtet.</string>
     <string name="keys_backup_settings_status_ko">Die Schlüsselsicherung ist in dieser Sitzung nicht aktiv.</string>
-    <string name="keys_backup_settings_status_not_setup">Ihre Schlüssel werden von dieser Sitzung nicht gesichert.</string>
+    <string name="keys_backup_settings_status_not_setup">Deine Schlüssel werden von dieser Sitzung nicht gesichert.</string>
 
 
     <string name="keys_backup_settings_signature_from_unknown_device">Sicherung hat eine Signatur von einer unbekannten Sitzung mit der ID %s.</string>
@@ -1319,20 +1290,20 @@ Dieser Fehler ist außerhalb von Element passiert. Es gibt kein Google-Konto auf
     <string name="keys_backup_settings_untrusted_backup">Um die Schlüsselsicherung für diese Sitzung zu verwenden, stelle sie jetzt mit deiner Passphrase oder deinem Wiederherstellungsschlüssel wieder her.</string>
     <string name="keys_backup_settings_delete_confirm_message">Deine gesicherten Verschlüsselungsschlüssel vom Server löschen\? Du wirst deinen Wiederherstellungsschlüssel nicht mehr nutzen können, um deinen verschlüsselten Chatverlauf zu lesen.</string>
 
-    <string name="sign_out_bottom_sheet_warning_no_backup">Beim Ausloggen gehen Ihre verschlüsselten Nachrichten verloren</string>
-    <string name="sign_out_bottom_sheet_warning_backing_up">Schlüssel-Sicherung wird durchgeführt. Wenn Sie sich jetzt ausloggen, dann gehen Ihre verschlüsselten Nachrichten verloren.</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">Schlüssel-Sicherung sollte bei all Ihren Sitzungen aktiviert sein, um einen Verlust Ihrer verschlüsselten Nachrichten zu verhindern.</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Beim Ausloggen gehen deine verschlüsselten Nachrichten verloren</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Schlüssel-Sicherung wird durchgeführt. Wenn du dich jetzt ausloggst, gehen deine verschlüsselten Nachrichten verloren.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Schlüssel-Sicherung sollte bei allen Sitzungen aktiviert sein, um den Verlust verschlüsselter Nachrichten zu verhindern.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Ich möchte meine verschlüsselten Nachrichten nicht</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">Sichere Schlüssel…</string>
     <string name="keys_backup_activate">Schlüssel-Sicherung verwenden</string>
-    <string name="are_you_sure">Sind Sie sicher\?</string>
+    <string name="are_you_sure">Sicher\?</string>
     <string name="backup">Sicherung</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Alle verschlüsselten Nachrichten gehen verloren, wenn Du dich ausloggst ohne eine Sicherung der Schlüssel gemacht zu haben.</string>
 
     <string name="stay">Bleiben</string>
     <string name="abort">Abbrechen</string>
 
-    <string name="action_sign_out_confirmation_simple">Sind Sie sicher, dass Sie sich ausloggen möchten\?</string>
+    <string name="action_sign_out_confirmation_simple">Sicher, dass du dich ausloggen möchtest\?</string>
 
     <string name="encryption_message_recovery">Wiederherstellung verschlüsselter Nachrichten</string>
     <string name="error_empty_field_enter_user_name">Bitte gib einen Benutzernamen ein.</string>
@@ -1343,9 +1314,7 @@ Dieser Fehler ist außerhalb von Element passiert. Es gibt kein Google-Konto auf
     <string name="keys_backup_setup_step1_manual_export">Schlüssel manuell exportieren</string>
 
     <string name="keys_backup_setup_step2_text_title">Schütze deine Sicherung mit einer Passphrase.</string>
-    <string name="keys_backup_setup_step2_text_description">Eine verschlüsselte Kopie deiner Schlüssel wird auf deinem Heimserver gespeichert. Schütze deine Sicherung mit einer Passphrase.
-
-Für maximale Sicherheit sollte diese *nicht* dein Konto-Passwort sein.</string>
+    <string name="keys_backup_setup_step2_text_description">Eine verschlüsselte Kopie deiner Schlüssel wird auf deinem Home-Server gespeichert. Schütze deine Sicherung mit einer Passphrase. Für maximale Sicherheit sollte diese *nicht* dein Konto-Passwort sein.</string>
     <string name="keys_backup_setup_creating_backup">Erstelle Sicherung</string>
     <string name="keys_backup_setup_step1_recovery_key_alternative">Oder schütze deine Sicherung mit einem Wiederherstellungsschlüssel den du sicher verwahrst.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Erweitert) Wiederherstellungsschlüssel einrichten</string>
@@ -1353,7 +1322,7 @@ Für maximale Sicherheit sollte diese *nicht* dein Konto-Passwort sein.</string>
     <string name="keys_backup_setup_step3_text_line1">Deine Schlüssel wurden gesichert.</string>
     <string name="keys_backup_setup_step3_text_line2">Dein Wiederherstellungsschlüssel ist ein Sicherungsnetz - du kannst es benutzen um den Zugriff auf deine verschlüsselten Nachrichten wiederherzustellen, falls du deine Passphrase vergisst.
 Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie einem Passwortmanager (oder Safe)</string>
-    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie einem Passwortmanager (oder Safe) auf</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort auf, wie z.B. einem Passwortmanager (oder Tresor) auf</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">Ich habe eine Kopie angefertigt</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Teilen</string>
     <string name="new_recovery_method_popup_title">Neue Schlüsselsicherung</string>
@@ -1397,7 +1366,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_fail_to_update_password_invalid_current_password">Das Passwort ist ungültig</string>
     <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
 
-    <string name="autodiscover_invalid_response">Ungültige Antwort beim Entdecken des Heimservers</string>
+    <string name="autodiscover_invalid_response">Ungültige Antwort beim Entdecken des Home-Servers</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Serveroptionen vervollständigen</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Element hat eine benutzerdefinierte Serverkonfiguration für die Domäne deines Benutzernamens gefunden \"%1$s\":
 \n%2$s</string>
@@ -1412,7 +1381,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_play_shutter_sound">Auslöseton abspielen</string>
 
     <string name="action_mark_room_read">Als gelesen markieren</string>
-    <string name="settings_notification_privacy_no_background_sync">Die App muss <b>nicht</b> im Hintergrund zum Heimserver verbinden, dies sollte die Akkunutzung reduzieren</string>
+    <string name="settings_notification_privacy_no_background_sync">Die App braucht sich <b>nicht</b> im Hintergrund mit dem Home-Server verbinden, dies sollte die Akkunutzung reduzieren</string>
     <plurals name="notification_compat_summary_line_for_room">
         <item quantity="one">%1$s: 1 Nachricht</item>
         <item quantity="other">%1$s: %2$d Nachrichten</item>
@@ -1447,7 +1416,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="share_without_verifying_short_label">Teilen</string>
     <string name="ignore_request_short_label">Ignorieren</string>
 
-    <string name="keys_backup_setup_override_backup_prompt_tile">Auf deinem Heimserver existiert bereits eine Sicherung</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">Auf deinem Home-Server existiert bereits eine Sicherung</string>
     <string name="keys_backup_setup_override_replace">Ersetzen</string>
     <string name="keys_backup_setup_override_stop">Stopp</string>
 
@@ -1459,7 +1428,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="sas_incoming_request_title">Eingehende Verifizierungsanfrage</string>
     <string name="sas_incoming_verification_request_dialog">Du hast eine eingehende Verifizierungsanfrage erhalten.</string>
     <string name="sas_view_request_action">Anfrage ansehen</string>
-    <string name="sas_waiting_for_partner">Warte auf Bestätigung des Partners…</string>
+    <string name="sas_waiting_for_partner">Warte auf Bestätigung des/r anderen Nutzer*in…</string>
 
     <string name="sas_verified">Verifiziert!</string>
     <string name="sas_verified_successful">Du hast diese Sitzung erfolgreich verifiziert.</string>
@@ -1514,7 +1483,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="action_change">Ändern</string>
     <string name="change_room_directory_network">Netzwerk wechseln</string>
     <string name="please_wait">Bitte warten…</string>
-    <string name="group_all_communities">Alle Gemeinschaften</string>
+    <string name="group_all_communities">Alle Communities</string>
 
     <string name="room_preview_no_preview">Für diesen Raum kann keine Vorschau angezeigt werden</string>
     <string name="room_preview_world_readable_room_not_supported_yet">Die Vorschau von öffentlichen Räumen wird von Element noch nicht unterstützt</string>
@@ -1536,7 +1505,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="key_share_request">Schlüsselaustausch anfragen</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Es sieht so aus, als hättest du bereits ein Setup-Schlüssel-Backup von einer anderen Sitzung. Möchtest du es durch das, was du gerade erstellt hast, ersetzen\?</string>
     <string name="sas_security_advise">Für maximale Sicherheit empfehlen wir, dies persönlich zu tun, oder ein anderes vertrautes Kommunikationsmedium zu nutzen.</string>
-    <string name="sas_incoming_request_description">Überprüfe diese Sitzung, um sie als vertrauenswürdig zu markieren. Sitzungen von Partner!nnen zu vertrauen gibt dir zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende verschlüsselten Nachrichten.</string>
+    <string name="sas_incoming_request_description">Überprüfe diese Sitzung, um sie als vertrauenswürdig zu markieren. Sitzungen von anderen Nutzer*innen zu vertrauen gibt dir zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende verschlüsselten Nachrichten.</string>
     <string name="sas_incoming_request_description_2">Durch Verifizieren dieser Sitzung wird sie bei dir und deinem Gegenüber als vertrauenswürdig markiert.</string>
 
     <string name="sas_emoji_description">Verifiziere diese Sitzung, indem du bestätigst, dass das folgende Emoji auf dem Bildschirm deines Gegenübers angezeigt wird</string>
@@ -1556,9 +1525,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="keys_backup_unable_to_get_trust_info">Beim Abrufen der Vertrauensinformationen ist ein Fehler aufgetreten</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Beim Abrufen der Schlüsselsicherungsdaten ist ein Fehler aufgetreten</string>
 
-    <string name="alpha_disclaimer_title">Willkommen in der Beta!</string>
-    <string name="alpha_disclaimer_content_line_1">Während sich Element in der frühen Entwicklung befindet, fehlen möglicherweise einige Funktionen und es können Fehler auftreten.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Store Beschreibung</string>
     <string name="settings_sdk_version">Matrix SDK Version</string>
     <string name="settings_other_third_party_notices">Sonstige Hinweise Dritter</string>
     <string name="navigate_to_room_when_already_in_the_room">Du siehst diesen Raum bereits!</string>
@@ -1607,25 +1573,18 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="sas_cancelled_by_other">Die andere Partei hat die Überprüfung abgebrochen.
 \n%s</string>
     <string name="sas_error_m_unknown_method">Die Sitzung kann sich nicht auf eine Schlüsselvereinbarung, eine Hash-, eine MAC- oder eine SAS-Methode einigen</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">Die neueste Feature-Liste befindet sich immer in %1$s. Wenn du Fehler findest, sende uns bitte einen Bericht im Menü oben links von \"Startseite\". Wir werden den Fehler so schnell wie möglich beheben.</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Wenn du Fehler findest, sende uns bitte einen Bericht im Menü oben links von der \"Startseite\". Wir werden diese so schnell wie möglich beheben.</string>
 
     <string name="import_e2e_keys_from_file">E2E-Schlüssel aus der Datei \"%1$s\" importieren.</string>
 
     <string name="send_suggestion_sent">Vielen Dank, der Vorschlag wurde erfolgreich gesendet</string>
     <string name="send_suggestion_failed">Der Vorschlag konnte nicht gesendet werden (%s)</string>
 
-    <string name="store_riotx_title">Element - Matrix Client der nächsten Generation</string>
-    <string name="store_riotx_short_description">Ein schnellerer und leichterer Client für Matrix mit den neuesten Android-Frameworks</string>
     <string name="send_file_step_sending_thumbnail">Miniaturbild wird gesendet (%1$s / %2$s)</string>
     <string name="send_file_step_sending_file">Datei wird gesendet (%1$s / %2$s)</string>
 
     <string name="downloading_file">Datei %1$s wird heruntergeladen …</string>
     <string name="downloaded_file">Die Datei %1$s wurde heruntergeladen!</string>
 
-    <string name="riotx_no_registration_notice">%1$s , um ein Konto zu erstellen.</string>
-    <string name="riotx_no_registration_notice_colored_part">Benutze die alte App</string>
-
 
     <string name="room_filtering_footer_title">Kannst du nicht finden, wonach du suchst\?</string>
     <string name="room_filtering_footer_create_new_room">Erstelle einen neuen Raum</string>
@@ -1649,7 +1608,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="people_no_identity_server">Kein Integrationsserver konfiguriert.</string>
 
     <string name="call_failed_no_ice_title">Anruf aufgrund eines falsch konfigurierten Servers fehlgeschlagen</string>
-    <string name="call_failed_no_ice_use_alt">Versuchen Sie es mit %s</string>
+    <string name="call_failed_no_ice_use_alt">Versuche es mit %s</string>
     <string name="call_failed_dont_ask_again">Nicht erneut fragen</string>
 
     <string name="auth_add_email_message_2">Richte eine E-Mail für die Kontowiederherstellung ein. Optional, kannst du später einrichten, dass Personen dich über diese Adresse finden.</string>
@@ -1672,7 +1631,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="identity_server_not_defined">Du verwendest keinen Identitätsserver</string>
     <string name="identity_server_not_defined_for_password_reset">Es ist kein Identitätsserver konfiguriert. Du musst dein Kennwort zurücksetzen.</string>
 
-    <string name="error_user_already_logged_in">Du versuchst anscheinend, eine Verbindung zu einem anderen Heimserver herzustellen. Möchtest du dich abmelden\?</string>
+    <string name="error_user_already_logged_in">Du versuchst anscheinend, eine Verbindung zu einem anderen Home-Server herzustellen. Möchtest du dich abmelden\?</string>
 
     <string name="push_gateway_item_push_key">Push-Key:</string>
     <string name="push_gateway_item_app_display_name">App-Anzeigename:</string>
@@ -1694,12 +1653,12 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_discovery_mail_pending">ausstehend</string>
 
     <string name="settings_discovery_enter_identity_server">Gib einen neuen Identitätsserver ein</string>
-    <string name="settings_discovery_bad_identity_server">Konnte keine Verbindung zum Heimserver herstellen</string>
+    <string name="settings_discovery_bad_identity_server">Konnte keine Verbindung zum Home-Server herstellen</string>
     <string name="resources_script">Latn</string>
 
-    <string name="call_failed_no_ice_description">Bitte fragen Sie den Administrator Ihres Home-Servers (%1$s) nach der Einrichtung eines TURN-Servers, damit Anrufe zuverlässig funktionieren.
+    <string name="call_failed_no_ice_description">Bitte frage den/die Administrator/in deines Home-Servers (%1$s) nach der Einrichtung eines TURN-Servers, damit Anrufe zuverlässig funktionieren. 
 \n 
-\nAlternativ können Sie einen öffentlichen Server auf %2$s nutzen. Dies wird jedoch weniger zuverlässig sein und Ihre IP-Adresse gegenüber diesem Server preisgeben. Sie können dies auch in den Einstellungen anpassen.</string>
+\nAlternativ kann ein öffentlicher Server auf %2$s genutzt werden. Dies wird jedoch weniger zuverlässig sein und deine IP-Adresse wird gegenüber diesem Server preisgegeben. Du kannst den Server auch in den Einstellungen anpassen.</string>
     <string name="login_error_no_homeserver_found">Dies ist keine Adresse eines Matrixservers</string>
     <string name="login_error_homeserver_not_found">Kann Home-Server nicht bei dieser URL erreichen. Bitte überprüfen</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Wir nutzen %s als Assistenten wenn dein Home-Server keinen anbietet (Deine IP-Adresse wird während des Anrufs geteilt)</string>
@@ -1729,7 +1688,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="room_widget_open_in_browser">Im Browser öffnen</string>
     <string name="room_widget_permission_display_name">Dein Anzeigename</string>
     <string name="room_widget_permission_avatar_url">Deine Profilbild-Adresse</string>
-    <string name="room_widget_permission_user_id">Deine Benutzer-ID</string>
+    <string name="room_widget_permission_user_id">Deine Nutzer-ID</string>
     <string name="room_widget_permission_theme">Dein Design</string>
     <string name="room_widget_permission_widget_id">Widget-ID</string>
     <string name="room_widget_permission_room_id">Raum-ID</string>
@@ -1742,11 +1701,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="room_widget_webview_access_microphone">Mikrofon benutzen</string>
     <string name="room_widget_webview_read_protected_media">Lese DRM-geschützte Medien</string>
 
-    <string name="security_warning_identity_server">Frühere Versionen von Element hatten ein Sicherheitsproblem, welches dem Identitätsserver (%1$s) Zugriff auf deinen Account geben konnte. Wenn du %2$s vertraust, kannst du dies ignorieren – ansonsten logge dich bitte aus und wieder ein.
-\n
-\nWeitere Details gibt es hier (Englisch):
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="settings_background_fdroid_sync_mode_disabled_description">Du wirst nicht über eingehende Nachrichten benachrichtigt, wenn die App im Hintergrund ist.</string>
     <string name="settings_discovery_manage">Verwalte deine Erkennungseinstellungen.</string>
     <string name="room_widget_revoke_access">Zugriff für mich zurückziehen</string>
@@ -1754,15 +1708,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="push_gateway_item_device_name">Sitzungsname:</string>
     <string name="push_gateway_item_format">Format:</string>
 
-    <string name="store_riotx_full_description">Element ist ein neuer Client für das Matrix-Protokoll (matrix.org): Ein offenes Netzwerk für sichere, dezentrale Kommunikation.
-\nElement ist der Riot-Android-Client der auf dem matrix-android-sdk basiert - aber beides komplett neu geschrieben.
-\n
-\nHinweis: Dies ist eine Beta-Version. Element wird aktuell aktiv entwickelt und enthält Einschränkungen und (wir hoffen nicht zu viele) Fehler. Jede Rückmeldung ist willkommen!
-\n
-\nElement unterstützt: • Anmelden an ein existierendes Konto • Erstelle Räume und trete öffentlichen Räumen bei • Akzeptiere und lehne Einladungen ab • Zeige Raum-Details • Sende Textnachrichten • Sende Anhänge • Lese und Schreibe Nachrichten in verschlüsselten Räumen • Verschlüsselung: Backup der Ende-zu-Ende-Schlüssel, erweiterte Geräteverifizierung, Schlüsseltauschanfragen und -antworten • Push-Benachrichtigungen • Helles, dunkles und schwarzes Thema
-\n
-\nNicht alle Features in Element sind bisher in Element implementiert. Hauptfunktionen, die noch fehlen (und bald kommen!): • Raum-Einstellungen (Raum-Mitglieder auflisten, etc.) • Anrufe • Widgets • …</string>
-
     <string name="settings_discovery_identity_server_info">Du nutzt aktuell %1$s um vorhandene Kontakte zu finden und um von dir bekannten Kontakten gefunden zu werden.</string>
     <string name="settings_discovery_identity_server_info_none">Du benutzt aktuell keinen Identitätsserver. Um zu entdecken und um von dir bekannten Kontakten entdeckt zu werden, richte unten einen ein.</string>
     <string name="settings_discovery_msisdn_title">Entdeckbare Telefonnummern</string>
@@ -1772,7 +1717,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_text_message_sent">Eine Textnachricht wurde an %s gesendet. Bitte gebe den Verifizierungscode ein, den sie enthält.</string>
 
     <string name="labs_allow_extended_logging">Aktiviere ausführliche Logs.</string>
-    <string name="labs_allow_extended_logging_summary">Ausführliche Logs werden den Entwicklern helfen, indem sie mehr Informationen enthalten, wenn du einen Fehlerbericht sendest. Auch wenn dies aktiviert ist, werden keine Nachrichteninhalte oder andere privaten Daten aufgezeichnet.</string>
+    <string name="labs_allow_extended_logging_summary">Ausführliche Logs werden der Entwicklung der App dadurch helfen, dass mehr Informationen übertragen werden, wenn du einen Fehlerbericht sendest. Auch wenn dies aktiviert ist, werden keine Nachrichteninhalte oder andere privaten Daten aufgezeichnet.</string>
 
 
     <string name="error_terms_not_accepted">Bitte erneut versuchen, nachdem du die Nutzungsbedingungen deines Home-Servers akzeptiert hast.</string>
@@ -1874,7 +1819,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_discovery_disconnect_with_bound_pid">Du teilst deine Email Adressen oder Telefonnummern momentan auf dem Identitätsserver %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.</string>
     <string name="settings_agree_to_terms">Stimme den Nutzungsbedingungen des Identitätsservers (%s) zu, um zu erlauben per E-Mail oder Telefonnummer gefunden zu werden.</string>
 
-    <string name="two_and_some_others_read">gelesen von %1$s, %2$s und %3$d anderen</string>
     <string name="error_handling_incoming_share">Zu teilende Daten nicht verarbeitbar</string>
 
     <string name="login_splash_text3">Erweitere &amp; individualisiere dein Benutzererlebnis</string>
@@ -1947,13 +1891,13 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="reaction_search_type_hint">Beginne zu Tippen um eine Reaktion zu finden.</string>
 
     <string name="room_join_rules_invite">%1$s hat den Raum auf \"nur-einladen\" gestellt.</string>
-    <string name="login_splash_title">Befreie deine Kommunikation</string>
+    <string name="login_splash_title">Es ist dein Gespräch. Besitze es.</string>
     <string name="login_server_url_form_modular_text">Premium-Hosting für Organisationen</string>
     <string name="login_server_url_form_modular_notice">Gib die Adresse des Modular Element oder Servers ein, den du verwenden möchtest</string>
     <string name="login_server_url_form_other_notice">Gibt die Adresse eines Servers oder eines Element ein, zu dem du dich verbinden möchtest</string>
 
-    <string name="login_mode_not_supported">Die Anwendung kann sich nicht bei diesem Heimserver anmelden. Der Heimserver unterstützt die folgenden Anmeldetypen:%1$s.
-\n
+    <string name="login_mode_not_supported">Die Anwendung kann sich nicht bei diesem Home-Server anmelden. Der Home-Server unterstützt die folgenden Anmeldetypen: %1$s. 
+\n 
 \nMöchtest du dich mit einem Webclient anmelden\?</string>
     <string name="login_reset_password_notice">Eine Bestätigungs-E-Mail wird an dich gesendet, um dein neues Passwort zu bestätigen.</string>
     <string name="login_reset_password_submit">Weiter</string>
@@ -1977,8 +1921,8 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="login_signup_submit">Weiter</string>
     <string name="login_signup_cancel_confirmation_title">Warnung</string>
     <string name="login_a11y_captcha_container">Bitte löse das Captcha</string>
-    <string name="login_error_outdated_homeserver_title">Veralteter Heimserver</string>
-    <string name="login_error_outdated_homeserver_content">Auf diesem Heimserver läuft eine zu alte Version, um eine Verbindung herzustellen. Bitten die Heimserver-Administration um ein Upgrade.</string>
+    <string name="login_error_outdated_homeserver_title">Veralteter Home-Server</string>
+    <string name="login_error_outdated_homeserver_content">Auf diesem Home-Server läuft eine zu alte Version, um eine Verbindung herzustellen. Bitten deine Home-Server-Administration um ein Upgrade.</string>
 
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunde…</item>
@@ -1999,14 +1943,14 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
     <string name="soft_logout_title">Du bist abgemeldet</string>
     <string name="soft_logout_signin_title">Anmelden</string>
-    <string name="soft_logout_signin_notice">Deine Heimserver-Administration (%1$s) hat dich von deinem Konto %2$s (%3$s) abgemeldet.</string>
+    <string name="soft_logout_signin_notice">Deine Home-Server-Administration (%1$s) hat dich von deinem Konto %2$s (%3$s) abgemeldet.</string>
     <string name="soft_logout_signin_e2e_warning_notice">Melden dich an, um ausschließlich auf diesem Gerät gespeicherte Verschlüsselungsschlüssel wiederherzustellen. Du benötigst sie, um deine verschlüsselten Nachrichten auf jedem Gerät zu lesen.</string>
     <string name="soft_logout_signin_submit">Anmelden</string>
     <string name="soft_logout_signin_password_hint">Passwort</string>
     <string name="soft_logout_clear_data_title">Persönliche Daten löschen</string>
-    <string name="soft_logout_clear_data_notice">Warnung: Persönliche Daten (einschließlich Verschlüsselungsschlüssel) werden weiterhin auf diesem Gerät gespeichert.
-\n
-\nDeaktiviere diese Option, wenn dieses Gerät nicht mehr verwenden wird oder sich bei einem anderen Konto angemeldet werden soll.</string>
+    <string name="soft_logout_clear_data_notice">Warnung: Persönliche Daten (einschließlich Verschlüsselungsschlüssel) werden weiterhin auf diesem Gerät gespeichert. 
+\n 
+\nDeaktiviere diese Option, wenn dieses Gerät nicht mehr verwendet wird oder sich bei einem anderen Konto angemeldet werden soll.</string>
     <string name="soft_logout_clear_data_submit">Alle Daten löschen</string>
 
     <string name="soft_logout_clear_data_dialog_title">Daten löschen</string>
@@ -2039,7 +1983,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_developer_mode_fail_fast_title">Ausfallsicher</string>
     <string name="settings_developer_mode_fail_fast_summary">Element kann häufiger abstürzen, wenn ein unerwarteter Fehler auftritt</string>
 
-    <string name="command_description_verify">Überprüfe die angegebenen Benutzer-ID</string>
     <string name="command_description_shrug">Stellt einer Klartextnachricht ¯\\_(ツ)_/¯ voran</string>
 
     <string name="create_room_encryption_title">Aktiviere Verschlüsselung</string>
@@ -2048,18 +1991,18 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="login_error_threepid_denied">Deine E-Mail-Domain ist nicht berechtigt, sich auf diesem Server zu registrieren</string>
 
     <string name="verification_conclusion_warning">Nicht vertrauenswürdige Anmeldung</string>
-    <string name="verification_sas_match">Sie passen</string>
-    <string name="verification_sas_do_not_match">Sie passen nicht</string>
-    <string name="verify_user_sas_emoji_help_text">Verifiziere diese/n Benutzer!n, indem du bestätigst, dass diese einzigartigen Emoji in der selben Reihenfolge auf dem Bildschirm deines Gegenübers angezeigt werden.</string>
+    <string name="verification_sas_match">Sie stimmen überein</string>
+    <string name="verification_sas_do_not_match">Sie stimmen nicht überein</string>
+    <string name="verify_user_sas_emoji_help_text">Verifiziere diese/n Benutzer!n, indem du bestätigst, dass diese einzigartigen Emoji in derselben Reihenfolge auf dem Bildschirm deines Gegenübers angezeigt werden.</string>
     <string name="verify_user_sas_emoji_security_tip">Für ultimative Sicherheit verwende ein anderes vertrauenswürdiges Kommunikationsmittel oder mache es persönlich.</string>
     <string name="verification_green_shield">Suche nach dem grünen Schild, um sicherzustellen, dass ein/e Benutzer!n vertrauenswürdig ist. Vertraue allen Benutzer!nnen in einem Raum, um sicherzustellen, dass der Raum sicher ist.</string>
 
     <string name="verification_conclusion_not_secure">Nicht sicher</string>
-    <string name="verification_conclusion_compromised">Eine der folgenden Möglichkeiten kann beeinträchtigt sein:
-\n
-\n - Dein Heimserver
-\n - Der Heimserver mit dem dein Gegenüber verbunden ist
-\n - Deine oder die Internetverbindung des Gegenüber
+    <string name="verification_conclusion_compromised">Eine der folgenden Möglichkeiten kann beeinträchtigt sein: 
+\n 
+\n - Dein Home-Server 
+\n - Der Home-Server mit dem dein Gegenüber verbunden ist 
+\n - Deine oder die Internetverbindung des Gegenüber 
 \n - Dein Gerät oder das Gerät des Gegenüber</string>
 
     <string name="sent_a_video">Video.</string>
@@ -2081,7 +2024,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
     <string name="you">Ich</string>
 
-    <string name="verification_scan_notice">Scanne den Code mit dem Gerät des Gegenüber, um sich gegenseitig zu überprüfen</string>
+    <string name="verification_scan_notice">Scanne den Code mit dem Gerät des Gegenüber für eine gegenseitige Überprüfung</string>
     <string name="verification_scan_their_code">Scanne ihren/seinen Code</string>
     <string name="verification_scan_emoji_title">Kann nicht scannen</string>
     <string name="verification_scan_emoji_subtitle">Wenn ihr nicht am selben Ort seid, vergleicht Emoji stattdessen</string>
@@ -2116,7 +2059,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="room_profile_section_more_leave">Raum verlassen</string>
     <string name="room_profile_leaving_room">Verlasse den Raum…</string>
 
-    <string name="room_member_power_level_admins">Admins</string>
+    <string name="room_member_power_level_admins">Administratoren</string>
     <string name="room_member_power_level_moderators">Moderierende</string>
     <string name="room_member_power_level_custom">benutzerdefiniert</string>
     <string name="room_member_power_level_invites">Eingeladen</string>
@@ -2161,7 +2104,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="verification_conclusion_ok_self_notice">Deine neue Sitzung ist jetzt verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer!nnen sehen sie als vertrauenswürdig an.</string>
 
 
-    <string name="encryption_information_cross_signing_state">Cross-Signing</string>
+    <string name="encryption_information_cross_signing_state">Kreuz-Signierung</string>
     <string name="encryption_information_dg_xsigning_complete">Cross-Signing ist aktiviert
 \nPrivate Schlüssel auf dem Gerät.</string>
     <string name="encryption_information_dg_xsigning_trusted">Cross-Signing ist aktiviert
@@ -2261,7 +2204,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="spoiler">Spoiler</string>
     <string name="room_member_power_level_custom_in">Benutzerdefiniert (%1$d) in %2$s</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="settings_key_requests">Schlüsselanforderungen</string>
 
@@ -2297,7 +2240,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
     <string name="enter_account_password">Gibe dein %s ein um fortzufahren.</string>
 
-    <string name="bootstrap_info_confirm_text">Gebe deine %s für eine Bestätigung erneut ein.</string>
+    <string name="bootstrap_info_confirm_text">Gib deine %s für eine Bestätigung erneut ein.</string>
     <string name="bootstrap_dont_reuse_pwd">Benutze dein Accountpasswort nicht mehrfach.</string>
 
 
@@ -2305,7 +2248,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="bootstrap_loading_title">Wiederherstellung einrichten.</string>
     <string name="your_recovery_key">Dein Wiederherstellungsschlüssel</string>
     <string name="bootstrap_finish_title">Geschafft!</string>
-    <string name="keep_it_safe">Bewahre es sicher auf</string>
+    <string name="keep_it_safe">Bewahre ihn sicher auf</string>
     <string name="finish">Abschließen</string>
 
     <string name="bootstrap_save_key_description">Benutze diesen %1$s als Sicherheit für den Fall, dass du deine %2$s vergisst.</string>
@@ -2329,7 +2272,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_notification_configuration">Benachrichtigungskonfiguration</string>
     <string name="settings_messages_at_room">\@raum enthaltende Nachrichten</string>
     <string name="settings_messages_in_e2e_group_chat">Verschlüsselte Nachrichten in Gruppenchats</string>
-    <string name="settings_notification_advanced_summary_riotx">Setze die Benachrichtigungswichtigkeit abhängig vom Ereignistyp</string>
+    <string name="settings_notification_advanced_summary">Setze die Benachrichtigungspräferenz abhängig vom Ereignistyp</string>
 
     <string name="command_description_plain">Sendet eine Nachricht als einfachen Text, ohne sie als Markdown zu interpretieren</string>
 
@@ -2363,7 +2306,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
     <string name="security_prompt_text">Verifiziere dich &amp; andere, um eure Chats zu schützen</string>
 
-    <string name="bootstrap_enter_recovery">Geben Sie zum Fortfahren Ihren %s ein</string>
+    <string name="bootstrap_enter_recovery">Gib zum Fortfahren deinen %s ein</string>
     <string name="use_file">Datei benutzen</string>
 
     <string name="bootstrap_invalid_recovery_key">Dies ist kein gültiger Wiederherstellungsschlüssel</string>
@@ -2401,12 +2344,12 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="change_password_summary">Neues Benutzerpasswort festlegen…</string>
 
     <string name="use_other_session_content_description">Nutze die neueste Version von Element auf deinen anderen Geräten, Element Web, Element Desktop, Element iOS, Element für Android oder einen anderen cross-signing fähigen Matrix client</string>
-    <string name="riot_desktop_web">Element Web
+    <string name="app_desktop_web">Element Web
 \nElement Desktop</string>
-    <string name="riot_ios_android">Element iOS
-\nElement für Android</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
     <string name="or_other_mx_capabale_client">oder einen anderen cross-signing fähigen Matrix Client</string>
-    <string name="use_latest_riot">Nutze die neueste Version von Element auf deinen anderen Geräten:</string>
+    <string name="use_latest_app">Nutze die neueste Version von Element auf deinen anderen Geräten:</string>
     <string name="command_description_discard_session">Erzwingt das Verferfen der aktuell ausgehende Gruppensitzung in einem verschlüsseltem Raum</string>
     <string name="command_description_discard_session_not_handled">Wird nur in verschlüsselten Räumen unterstützt</string>
     <string name="enter_secret_storage_passphrase_or_key">Benutze dein %1$s oder deinen %2$s um fortzufahren.</string>
@@ -2417,9 +2360,9 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
     <string name="unencrypted">Unverschlüsselt</string>
     <string name="encrypted_unverified">Verschlüsselt von einem unbekannten Gerät</string>
-    <string name="review_logins">Überprüfe, wo du eingeloggt bist</string>
-    <string name="verify_other_sessions">Verifiziere alle deine Sitzungen, um sicher zu stellen, dass dein Konto &amp; deine Nachrichten sicher sind</string>
-    <string name="verify_this_session">Bestätige neue Anmeldung für dein Konto: %1$s</string>
+    <string name="review_logins">Überprüfe, wo du angemeldet bist</string>
+    <string name="verify_other_sessions">Verifiziere alle deine Sitzungen, um sicherzustellen, dass dein Konto &amp; deine Nachrichten sicher sind</string>
+    <string name="verify_this_session">Bestätige neue Anmeldung zu deinem Konto: %1$s</string>
 
     <string name="cross_signing_verify_by_text">Verifiziere manuell mit einem Text</string>
     <string name="crosssigning_verify_session">Verifiziere Anmeldung</string>
@@ -2450,4 +2393,235 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     </plurals>
     <string name="invite_users_to_room_failure">Wir konnten den Benutzer nicht einladen. Bitte überprüfe den Benutzernamen, welchen du einladen möchtest und versuche es erneut.</string>
 
+    <string name="pause_video">Pause</string>
+    <string name="action_copy">Kopieren</string>
+    <string name="bottom_action_notification">Benachrichtigungen</string>
+    <string name="call_failed_no_connection">Element-Anruf fehlgeschlagen</string>
+    <string name="play_video">Abspielen</string>
+    <string name="dismiss">Ablehnen</string>
+
+
+    <string name="dialog_title_success">Erfolg</string>
+
+    <string name="call_failed_no_connection_description">Echtzeitverbindung konnte nicht hergestellt werden.
+\nBitte den/die Administrator/in deines Home-Servers, einen TURN-Server so zu konfigurieren, dass Anrufe zuverlässig funktionieren.</string>
+
+    <string name="call_select_sound_device">Wähle Audiogerät aus</string>
+    <string name="sound_device_phone">Telefonie</string>
+    <string name="sound_device_speaker">Lautsprecher</string>
+    <string name="sound_device_headset">Headset</string>
+    <string name="sound_device_wireless_headset">Drahtloses Headset</string>
+    <string name="call_switch_camera">Wechsle Kamera</string>
+    <string name="call_camera_front">Frontkamera</string>
+    <string name="call_camera_back">Hintere Kamera</string>
+    <string name="call_format_turn_hd_off">Deaktiviere HD-Qualität</string>
+    <string name="call_format_turn_hd_on">Aktiviere HD-Qualität</string>
+
+    <string name="login_error_ssl_peer_unverified">SSL-Fehler: Die Identität des Gegenüber ist noch nicht verifiziert.</string>
+    <string name="login_error_ssl_other">SSL Fehler.</string>
+    <string name="active_call_with_duration">Aktiver Anruf (%s)</string>
+    <string name="return_to_call">Zum Anruf zurückkehren</string>
+
+    <string name="room_participants_action_cancel_invite">Einladung zurückziehen</string>
+    <string name="room_participants_power_level_demote_warning_title">Möchtest du dich zurückstufen\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Du kannst die Zurückstufung nicht rückgängig machen und du wirst die Rechte nur mit einem anderen berechtigten Benutzer im Raum zurückerlangen können.</string>
+    <string name="room_participants_power_level_demote">Zurückstufen</string>
+
+
+    <string name="room_participants_action_ignore_title">Benutzer ignorieren</string>
+    <string name="room_participants_action_ignore_prompt_msg">Durch das Ignorieren werden für dich alle Nachrichten des Nutzers ausgeblendet.
+\nDu kannst die Aktion jederzeit in den allgemeinen Einstellungen rückgängig machen.</string>
+    <string name="room_participants_action_unignore_title">Ignorieren des Benutzers rückgängig machen</string>
+    <string name="room_participants_action_unignore_prompt_msg">Das Aufheben der Ignorierung wird alle Nachrichten des Benutzers wieder einblenden.</string>
+    <string name="room_participants_action_cancel_invite_title">Einladung zurückziehen</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Bist du dir sicher, dass du die Einladung für diesen Benutzer zurückziehen möchtest\?</string>
+    <string name="room_participants_kick_title">Benutzer entfernen</string>
+    <string name="room_participants_kick_reason">Grund für das Entfernen</string>
+    <string name="room_participants_kick_prompt_msg">Das Entfernen wird den Benutzer von diesem Raum ausschließen.
+\nUm einen erneuten Beitritt zu verhindern, solltest du ihn stattdessen bannen.</string>
+    <string name="room_participants_ban_title">Benutzer bannen</string>
+    <string name="room_participants_ban_reason">Grund für den Bann</string>
+    <string name="room_participants_unban_title">Bann des Benutzers aufheben</string>
+    <string name="room_participants_unban_prompt_msg">Das Aufheben des Bannes wird dem Benutzer erlauben dem Raum wieder beizutreten.</string>
+
+    <string name="settings_secure_backup_section_title">Sicheres Backup</string>
+    <string name="settings_secure_backup_manage">Verwalten</string>
+    <string name="settings_secure_backup_setup">Backup einrichten</string>
+    <string name="settings_secure_backup_reset">Backup zurücksetzen</string>
+    <string name="settings_secure_backup_enter_to_setup">Auf diesem Gerät einrichten</string>
+    <string name="settings_secure_backup_section_info">Absicherung um den Zugriffsverlust auf verschlüsselte Nachrichten &amp; Daten zu verhindern, indem die Schlüssel für die Entschlüsselung auf dem Server gesichert werden.</string>
+    <string name="reset_secure_backup_title">Generiere einen neuen Sicherheitsschlüssel oder setze eine neue Sicherheitspassphrase für dein existierendes Backup.</string>
+    <string name="reset_secure_backup_warning">Dieses wird deinen aktuellen Schlüssel oder deine aktuelle Phrase ersetzen.</string>
+
+    <string name="disabled_integration_dialog_title">Integrationen sind deaktiviert</string>
+    <string name="disabled_integration_dialog_content">Aktiviere \'Erlaube Integrationen\' in den Einstellungen um dies zu machen.</string>
+
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d gebannter Benutzer</item>
+        <item quantity="other">%d gebannte Benutzer</item>
+    </plurals>
+
+    <string name="encryption_exported_successfully">Schlüssel erfolgreich exportiert</string>
+
+    <string name="active_widget_view_action">ANSICHT</string>
+    <string name="active_widgets_title">Aktive Widgets</string>
+
+
+    <string name="recovery_key_export_saved">Der Sicherheitsschlüssel ist gespeichert worden.</string>
+
+    <string name="secure_backup_banner_setup_line1">Backup</string>
+    <string name="secure_backup_banner_setup_line2">Absicherung gegen den Zugriffsverlust auf verschlüsselte Nachrichten &amp; Daten</string>
+
+    <string name="secure_backup_setup">Richte Backup ein</string>
+
+    <string name="event_redacted">Nachricht gelöscht</string>
+    <string name="settings_show_redacted">Zeige gelöschte Nachrichten</string>
+    <string name="settings_show_redacted_summary">Zeige einen Platzhalter für gelöschte Nachrichten</string>
+    <string name="labs_show_unread_notifications_as_tab">Füge dedizierten Tab für ungelesene Benachrichtungen zur Hauptansicht hinzu.</string>
+
+    <string name="settings_discovery_confirm_mail_not_clicked">Wir haben dir eine Bestätigungsmail an %s gesendet. Bitte prüfe deine Emails und klicke auf den Bestätigungslink</string>
+    <string name="settings_text_message_sent_wrong_code">Der Verifizierungscode ist nicht korrekt.</string>
+
+    <string name="uploads_media_title">MEDIEN</string>
+    <string name="uploads_media_no_result">Es gibt in diesem Raum keine Medien</string>
+    <string name="uploads_files_title">DATEIEN</string>
+    <string name="uploads_files_subtitle">%1$s um %2$s</string>
+    <string name="uploads_files_no_result">Es gibt in diesem Raum keine Dateien</string>
+
+    <string name="room_list_quick_actions_favorite_add">Füge zu Favoriten hinzu</string>
+    <string name="room_list_quick_actions_favorite_remove">Entferne von Favoriten</string>
+    <string name="notice_member_no_changes_by_you">Du hast keine Änderungen gemacht</string>
+    <string name="room_join_rules_public_by_you">Du hast den Raum für alle, die den Link kennen, zugänglich gemacht.</string>
+    <string name="room_join_rules_invite_by_you">Du hast den Raumbeitritt auf Einladungen beschränkt.</string>
+    <string name="login_server_url_form_common_notice">Gib die Adresse des Servers ein, den du benutzen möchtest</string>
+
+    <string name="login_connect_using_matrix_id_notice">Wenn du deine Matrixkennung und dein Passwort weißt, kannst du alternativ diese Methode nutzen:</string>
+    <string name="login_connect_using_matrix_id_submit">Einloggen mit Matrix ID</string>
+    <string name="login_signin_matrix_id_title">Einloggen mit Matrix ID</string>
+    <string name="login_signin_matrix_id_notice">Wenn du einen Account auf einem Homeserver eingerichtet hast, benutze deine Matrix ID (z.B. @benutzer@domain.com) und Passwort.</string>
+    <string name="login_signin_matrix_id_hint">Matrix ID</string>
+    <string name="login_signin_matrix_id_password_notice">Wenn du dein Passwort nicht weißt, gehe zurück um es zurücksetzen zu lassen.</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Dies ist keine gültige Benutzerkennung. Erwartetes Format: \'@benutzer:homeserver.org\'</string>
+    <string name="autodiscover_well_known_error">Es konnte kein gültiger Homeserver gefunden werden. Bitte prüfe deine Kennung</string>
+
+    <string name="send_a_sticker">Sticker</string>
+
+    <string name="room_profile_section_admin">Administrative Aktionen</string>
+    <string name="room_member_power_level_default_in">Standard in %1$s</string>
+    <string name="settings_hs_admin_e2e_disabled">Dein Serveradministrator hat in privaten Räumen &amp; Direktnachrichten Ende-zu-Ende Verschlüsselung standardmäßig deaktiviert.</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">Flugzeugmodus ist aktiv</string>
+
+    <string name="bootstrap_info_text_2">Gib eine Sicherheitsphrase ein, die nur du kennst. Diese wird benutzt um deine Daten auf dem Server geheim zu halten.</string>
+
+    <string name="bootstrap_cancel_text">Wenn du jetzt abbrichst und den Zugriff zu deinen Sitzungen verlierst, kannst du verschlüsselte Nachrichten &amp; Daten verlieren.
+\n
+\nDu kannst auch ein Backup einrichten &amp; deine Schlüssel in den Einstellungen verwalten.</string>
+
+    <string name="room_created_summary_item_by_you">Du hast den Raum erstellt und konfiguriert.</string>
+
+    <string name="auth_invalid_login_deactivated_account">Dieser Account ist deaktiviert worden.</string>
+
+    <string name="setup_cross_signing">Aktiviere Cross Signing</string>
+    <string name="error_saving_media_file">Konnte Mediendatei nicht speichern</string>
+    <string name="choose_locale_current_locale_title">Aktuelle Sprache</string>
+    <string name="choose_locale_other_locales_title">Andere verfügbare Sprachen</string>
+    <string name="choose_locale_loading_locales">Lade verfügbare Sprachen…</string>
+
+    <string name="open_terms_of">Öffne AGBs von %s</string>
+    <string name="disconnect_identity_server_dialog_content">Trenne Verbingung zu Identitätsserver %s\?</string>
+    <string name="identity_server_error_outdated_identity_server">Dieser Identitätsserver ist veraltet. Element unterstützt nur API V2.</string>
+    <string name="identity_server_error_outdated_home_server">Diese Operation is nicht möglich. Der Homeserver ist veraltet.</string>
+    <string name="identity_server_error_no_identity_server_configured">Bitte konfiguriere zuerst einen Identitätsserver.</string>
+    <string name="identity_server_error_terms_not_signed">Bitte akzeptiere zuerst die AGB des Identitätsservers in den Einstellungen.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Deiner Privatssphäre wegen unterstützt Element nur das Senden gehashter Emailaddressen und Telefonnummern.</string>
+    <string name="identity_server_error_binding_error">Die Assoziierung ist fehlgeschlagen.</string>
+    <string name="identity_server_error_no_current_binding_error">Für diese Kennung gibt es aktuell keine Assoziierung.</string>
+
+    <string name="identity_server_set_default_notice">Dein Homeserver (%1$s) schlägt %2$s als Identitätsserver vor</string>
+    <string name="identity_server_set_default_submit">Benutze %1$s</string>
+    <string name="identity_server_set_alternative_notice">Alternativ kannst du die URL eines beliebigen anderen Identitätsservers angeben</string>
+    <string name="identity_server_set_alternative_notice_no_default">Gib die URL von einem Identitätsserver ein</string>
+    <string name="identity_server_set_alternative_submit">Bestätigen</string>
+    <string name="power_level_edit_title">Lege Rolle fest</string>
+    <string name="power_level_title">Rolle</string>
+    <string name="a11y_open_chat">Öffne Chat</string>
+    <string name="a11y_mute_microphone">Stelle Mikrophon stumm</string>
+    <string name="a11y_unmute_microphone">Aktiviere Mikrophon</string>
+    <string name="a11y_stop_camera">Stoppe Kamera</string>
+    <string name="a11y_start_camera">Starte Kamera</string>
+
+    <string name="settings_setup_secure_backup">Richte Backup ein</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">Backup</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Absicherung um den Zugriffsverlust auf verschlüsselte Nachrichten &amp; Daten zu verhindern, indem die Schlüssel für die Entschlüsselung auf dem Server gesichert werden.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Benutze einen Sicherheitsschlüssel</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Generiere einen Sicherheitsschlüssel, welcher z.B. in einem Passwortmanager oder in einem Tresor sicher aufbewahrt werden sollte.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Benutze Sicherheitsphrase</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Gib eine geheime Phrase ein, die nur du kennst und generiere einen Schlüssel als Backup.</string>
+
+    <string name="bottom_sheet_save_your_recovery_key_title">Speichere deinen Sicherheitsschlüssel</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Bewahre deinen Sicherheitsschlüssel irgendwo sicher auf, wie z.B. in einem Passwortmanager oder in einem Tresor.</string>
+
+    <string name="set_a_security_phrase_title">Setze Sicherheitsphrase</string>
+    <string name="set_a_security_phrase_notice">Gib eine Sicherheitsphrase ein, welche nur du kennst und deine Daten auf dem Server geheim halten soll.</string>
+    <string name="set_a_security_phrase_hint">Sicherheitsphrase</string>
+    <string name="set_a_security_phrase_again_notice">Gib deine Sicherheitsphrase zur Bestätigung erneut ein.</string>
+
+    <string name="save_your_security_key_title">Speichere deinen Sicherheitsschlüssel</string>
+    <string name="save_your_security_key_notice">Bewahre deinen Sicherheitsschlüssel irgendwo sicher auf, wie z.B. in einem Passwortmanager oder in einem Tresor.</string>
+
+    <string name="room_settings_name_hint">Raumname</string>
+    <string name="room_settings_topic_hint">Thema</string>
+    <string name="room_settings_save_success">Du hast die Raumeinstellungen erfolgreich geändert</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">Du kannst auf diese Nachricht nicht zugreifen</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Warte auf diese Nachricht. Das könnte eine Weile dauern</string>
+    <string name="crypto_utd">Kann nicht entschlüsselt werden</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Wegen der Ende-zu-Ende Verschlüsselung könnte es sein, dass du auf jemandes Nachricht warten musst, weil die Verschlüsselungsschlüssel nicht ordnungsgemäß gesendet worden sind.</string>
+    <string name="crypto_error_withheld_blacklisted">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender dich blockiert hat</string>
+    <string name="crypto_error_withheld_unverified">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender deiner Sitzung nicht vertraut</string>
+    <string name="crypto_error_withheld_generic">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender absichtlich die Schlüssel nicht gesendet hat</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Warte auf Verschlüsselungshistorie</string>
+
+    <string name="element_disclaimer_title">Riot heißt nun Element!</string>
+    <string name="element_disclaimer_content">Wir sind begeistert unsere Namensänderung mitteilen zu können! Deine App ist auf dem neusten Stand und du bist mit deinem Account angemeldet.</string>
+    <string name="element_disclaimer_negative_button">VERSTANDEN</string>
+    <string name="element_disclaimer_positive_button">MEHR ERFAHREN</string>
+
+    <string name="element_login_splash_brand">element</string>
+
+
+    <string name="save_recovery_key_chooser_hint">Speichere Wiederherstellungsschlüssel in</string>
+
+    <string name="add_from_phone_book">Füge über Kontaktliste hinzu</string>
+    <string name="empty_phone_book">Deine Kontaktliste ist leer</string>
+    <string name="phone_book_title">Kontaktliste</string>
+    <string name="search_in_my_contacts">Suche in meinen Kontakten</string>
+    <string name="loading_contact_book">Ermittle deine Kontakte…</string>
+    <string name="empty_contact_book">Deine Kontaktliste ist leer</string>
+    <string name="contacts_book_title">Kontaktliste</string>
+
+    <string name="three_pid_revoke_invite_dialog_title">Einladung zurücknehmen</string>
+    <string name="three_pid_revoke_invite_dialog_content">Einladung zu %1$s zurücknehmen\?</string>
+
+    <string name="member_banned_by">Gebannt von %1$s</string>
+    <string name="failed_to_unban">Aufheben des Banns fehlgeschlagen</string>
+
+    <string name="alert_push_are_disabled_title">Push-Benachrichtigungen sind deaktiviert</string>
+    <string name="alert_push_are_disabled_description">Gehe zu deinen Einstellungen um Push-Benachrichtigungen zu aktivieren</string>
+    <string name="create_pin_title">Nutze eine PIN für mehr Sicherheit</string>
+    <string name="create_pin_confirm_title">Bestätige PIN</string>
+    <string name="create_pin_confirm_failure">Validierung der PIN fehlgeschlagen. Bitte probiere es noch einmal.</string>
+    <string name="auth_pin_title">Gib deine PIN ein</string>
+    <string name="auth_pin_forgot">PIN vergessen\?</string>
+    <string name="auth_pin_reset_title">PIN zurücksetzen</string>
+    <string name="auth_pin_new_pin_action">Neue PIN</string>
+    <string name="auth_pin_reset_content">Um deine PIN zurückzusetzen, musst du dich erneut anmelden und eine neue erstellen.</string>
+    <string name="settings_security_pin_code_title">Aktiviere PIN</string>
+    <string name="settings_security_pin_code_summary">Wenn du deine PIN zurücksetzen möchtest, tippe \"PIN vergessen\" um dich abzumelden und sie anschließend zurückzusetzen.</string>
+    <string name="auth_pin_confirm_to_disable_title">Bestätige PIN um die PIN zu deaktivieren</string>
+    <string name="labs_merge_e2e_in_timeline">Übertragung von Schlüsseln zur Entschlüsselung in Nachrichtenverlauf fehlgeschlagen</string>
+    <string name="settings_call_show_confirmation_dialog_title">Verhindern Sie versehentliche Anrufe</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Bitten Sie um Bestätigung, bevor Sie einen Anruf tätigen</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Konfiguration</string>
 </resources>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index f56f0eec67..4abc074d4b 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -148,7 +148,6 @@
     <string name="search">Αναζήτηση</string>
 
     <string name="option_send_files">Αποστολή αρχείων</string>
-    <string name="store_short_description">Καλωσορίσατε στο Element: έναν νέο κόσμο ελεύθερης επικοινωνίας!</string>
     <string name="x_plus">%d+</string>
     <string name="generic_label">%1$s :</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
@@ -179,7 +178,7 @@
     <string name="room_info_room_topic">Θέμα δωματίου</string>
 
     <string name="settings_call_category">Κλήσεις</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Χρήση του προεπιλεγμένου ήχου κλήσης του Element για τις εισερχόμενες κλήσεις</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Χρήση του προεπιλεγμένου ήχου κλήσης του Element για τις εισερχόμενες κλήσεις</string>
     <string name="settings_call_ringtone_title">Ήχος εισερχομένων κλήσεων</string>
     <string name="settings_call_ringtone_dialog_title">Επιλέξτε ήχο κλήσης:</string>
 
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index c0b148d988..0e4c464b9c 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -455,10 +455,6 @@
     <string name="login_error_user_in_use">Ĉi tiu uzantonomo jam estas uzata</string>
     <string name="login_error_login_email_not_yet">La retpoŝt-ligilo, kiu ankoraŭ ne estas klakita</string>
 
-    <string name="e2e_need_log_in_again">"Vi  bezonas resaluti por generi tutvoje ĉifrajn ŝlosilojn por ĉi tiu salutaĵo kaj sendi la publikan ŝlosilon al via hejmservilo.
-\nĈi tio necesas nur unufoje.
-\nPardonu la maloportunon."</string>
-
     <string name="e2e_re_request_encryption_key">Repeti ĉifrajn ŝlosilojn de aliaj viaj salutaĵoj.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Peto de ŝlosilo sendiĝis.</string>
@@ -601,4 +597,9 @@
 
     <string name="settings_troubleshoot_test_account_settings_title">Agordoj de konto.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Sciigoj estas ŝaltitaj por via konto.</string>
+    <string name="play_video">Ludi</string>
+    <string name="pause_video">Paûzi</string>
+    <string name="dismiss">Eksigi</string>
+
+
 </resources>
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index 0cc97e22fc..f63a1cffc4 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -191,9 +191,6 @@
     <string name="login_error_login_email_not_yet">El enlace que no siguió</string>
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">Necesitas entrar de nuevo para generar claves de cifrado de extremo-a-extremo nuevas de este dispositivo y enviar la clave pública a el servidor.
-Esto sólo ocurre una vez.
-Disculpe por la inconveniencia.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lista de Recibos de Lectura</string>
@@ -636,10 +633,6 @@ Disculpe por la inconveniencia.</string>
     <string name="encryption_information_verify_device_warning2">Si coinciden, seleccione Verificar. Si no, otro esta interceptando este dispositivo y vas a querer bloquearlo.\nEn el futuro, este procceso será mas sofisticado.</string>
     <string name="encryption_information_verify_key_match">Verifico que las claves coinciden</string>
 
-    <string name="e2e_enabling_on_app_update">Element ahora cuenta con cifrado de extremo-a-extremo pero necesitas reingresar tu cuenta para encenderlo.
-
-Lo puedes hacer ahora o luego desde las configuraciones de la aplicación.</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Esta sala contiene dispositivos desconocidos</string>
     <string name="unknown_devices_alert_message">Esta sala contiene dispositivos desconocidos que no se han verificado.
@@ -681,8 +674,6 @@ Dispositivos desconocidos:</string>
 
     <string name="error_no_external_application_found">Lo sentimos, no se encontró una aplicación externa para completar esta acción.</string>
 
-    <string name="login_mobile_device">Móvil</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">Solicitud enviada</string>
     <string name="groups_list">Lista de grupos</string>
 
@@ -771,7 +762,7 @@ Dispositivos desconocidos:</string>
     <string name="title_activity_verify_device">Verificar dispositivo</string>
 
     <string name="settings_call_category">Llamadas</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Usar el tono de llamada normal de Element para llamadas entrantes</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Usar el tono de llamada normal de Element para llamadas entrantes</string>
     <string name="settings_call_ringtone_title">Tono para llamadas entrantes</string>
     <string name="settings_call_ringtone_dialog_title">Elegir sonido de llamadas:</string>
 
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index af0a2df798..84ea53d685 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -32,11 +32,11 @@
     <string name="rename">Renombrar</string>
     <string name="report_content">Reportar contenido</string>
     <string name="active_call">Llamada activa</string>
-    <string name="ongoing_conference_call">Llamada de conferencia en curso.
-\nUnirse con %1$s o %2$s</string>
+    <string name="ongoing_conference_call">Llamada de conferencia en curso. 
+\nUnirse como %1$s o %2$s</string>
     <string name="ongoing_conference_call_voice">Voz</string>
     <string name="ongoing_conference_call_video">Vídeo</string>
-    <string name="cannot_start_call">No se puede iniciar la llamada, por favor inténtalo de nuevo más tarde</string>
+    <string name="cannot_start_call">No se puedo iniciar la llamada, por favor inténtelo de nuevo más tarde</string>
     <string name="missing_permissions_warning">Debido a que faltan permisos, pueden faltar algunas características…</string>
     <string name="missing_permissions_to_start_conf_call">Necesitas permiso para invitar a iniciar una conferencia en esta sala</string>
     <string name="missing_permissions_title_to_start_conf_call">No se puede iniciar la llamada</string>
@@ -168,7 +168,7 @@ Puedes añadir tu correo electrónico a tu perfil en ajustes.</string>
     <string name="auth_username_in_use">Nombre de usuario en uso</string>
     <string name="auth_home_server">Servidor Doméstico:</string>
     <string name="auth_identity_server">Servidor de Identidad:</string>
-    <string name="auth_reset_password_next_step_button">He verificado mi dirección de correo electrónico</string>
+    <string name="auth_reset_password_next_step_button">He verificado mi correo electrónico</string>
     <string name="auth_reset_password_message">Para restablecer tu contraseña, ingresa la dirección de correo electrónico vinculada a tu cuenta:</string>
     <string name="auth_reset_password_missing_email">Debes ingresar la dirección de correo electrónico vinculada a tu cuenta.</string>
     <string name="auth_reset_password_missing_password">Debes ingresar una nueva contraseña.</string>
@@ -196,9 +196,6 @@ Puedes añadir tu correo electrónico a tu perfil en ajustes.</string>
     <string name="login_error_login_email_not_yet">El enlace del correo electrónico que aún no se ha seguido</string>
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">Tienes que volver a iniciar sesión para generar claves de cifrado de extremo a extremo para esta sesión y enviar la clave pública a tu servidor doméstico. 
-\nSolo deberás hacer esto una vez. 
-\nDisculpa por las molestia.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lista de Recibos de Lectura</string>
@@ -324,7 +321,7 @@ Quizás quieras iniciar sesión con otra cuenta, o añadir este correo electrón
     <string name="room_participants_action_set_moderator">Convertir a moderador</string>
     <string name="room_participants_action_set_admin">Convertir a administrador</string>
     <string name="room_participants_action_ignore">Ocultar todos los mensajes de este usuario</string>
-    <string name="room_participants_action_unignore">Mostrar todos los mensajes de este usuario</string>
+    <string name="room_participants_action_unignore">Mostrar todos los mensajes del usuario</string>
     <string name="room_participants_invite_search_another_user">ID de Usuario, Nombre o correo electrónico</string>
     <string name="room_participants_action_mention">Mencionar</string>
     <string name="room_participants_action_devices_list">Mostrar Lista de Sesiones</string>
@@ -660,10 +657,6 @@ Advertencia: este archivo puede ser eliminado si la aplicación se desinstala.</
     <string name="encryption_information_verify_device_warning2">Si coincide, presione el botón de verificar a continuación. Si no coincide, entonces alguien está interceptando esta sesión y probablemente debería prohibirlo. En el futuro, este proceso de verificación será más sofisticado.</string>
     <string name="encryption_information_verify_key_match">Verifico que las claves coinciden</string>
 
-    <string name="e2e_enabling_on_app_update">Element ahora admite cifrado de extremo a extremo pero debes volver a iniciar sesión para habilitarlo.
-
-Puedes hacerlo ahora o más tarde desde los ajustes de la aplicación.</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">La sala contiene sesiones desconocidas</string>
     <string name="unknown_devices_alert_message">Esta sala contiene sesiones desconocidas que no han sido verificados. Esto significa que no hay garantía de que las sesiones pertenezcan a los usuarios a los que dicen pertenecer. Recomendamos que pases por el proceso de verificación para cada sesión antes de continuar. Puedes reenviar el mensaje sin verificarlas si prefieres. Sesiones desconocidas:</string>
@@ -723,8 +716,6 @@ Puedes hacerlo ahora o más tarde desde los ajustes de la aplicación.</string>
     <string name="option_take_photo">Tomar foto</string>
     <string name="option_take_video">Tomar vídeo</string>
 
-    <string name="login_mobile_device">Móvil</string>
-
     <string name="call">Llamar</string>
     <string name="settings_notification_ringtone">Sonido de notificación</string>
     <string name="settings_containing_my_display_name">Mensajes que contienen mi nombre público</string>
@@ -1064,7 +1055,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="auth_accept_policies">Por favor revisa y acepta las reglas de este servidor doméstico:</string>
 
     <string name="settings_call_category">Llamadas</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Usar el tono de llamada normal de Element para llamadas entrantes</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Usar el tono de llamada normal de Element para llamadas entrantes</string>
     <string name="settings_call_ringtone_title">Tono para llamadas entrantes</string>
     <string name="settings_call_ringtone_dialog_title">Elegir sonido de llamadas:</string>
 
@@ -1099,7 +1090,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="auth_login_sso">Iniciar sesión con single-sign-on</string>
     <string name="login_error_ssl_handshake">Tu dispositivo usa una versión anticuada e insegura del protocolo de seguridad TLS. Por tu seguridad no puedes conectarte</string>
     <string name="settings_notification_advanced">Ajustes avanzados de notificaciones</string>
-    <string name="settings_notification_advanced_summary">Ajusta la importancia de las notificaciones por evento, configura el sonido, LED y vibración</string>
     <string name="settings_notification_by_event">Importancia de notificación por evento</string>
 
     <string name="settings_troubleshoot_test_system_settings_title">Ajustes de sistema.</string>
@@ -1246,8 +1236,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="encryption_message_recovery">Recuperación de mensajes cifrados</string>
     <string name="encryption_settings_manage_message_recovery_summary">Gestionar copia de seguridad clave</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d clave(s) importada(s) satisfactoriamente.</string>
-
     <plurals name="notification_compat_summary_line_for_room">
         <item quantity="one">%1$s: 1 mensaje</item>
         <item quantity="other">%1$s: %2$d mensajes</item>
@@ -1286,23 +1274,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">No se ha encontrado ningún APK válido de Servicios de Google Play. Las notificaciones podrían no funcionar correctamente.</string>
 
-    <string name="store_title">Element - Comunicate a tu manera</string>
-    <string name="store_whats_new">Siempre estamos haciendo cambios y mejoras para Element. Puedes encontrar el registro de cambios aquí: %1$s. Para asegurarte de que no te pierdes nada, tan solo mantén las actualizaciones activadas.</string>
-    <string name="store_short_description">Una app de chat universal completamente bajo tu control.</string>
-    <string name="store_full_description">Una app de chat, bajo tu total control y completamente flexible. Element deja que te comuniques de la manera que prefieras. Hecho para [matrix] - el estándar para la comunicación abierta y descentralizada.
-\nConsigue tu cuenta de matrix.org gratis. Consigue tu servidor en https://modular.im o usa otro servidor de Matrix.
-\nPor qué escoger a Element\?
-\n
-\n• COMUNICACIÓN COMPLETA: Crea salas para tus equipos, tus amigos, vuestra comunidad - de la forma que quieras! Chatea, comparte archivos, añade widgets y haz llamadas de voz y video - Todo de forma gratuita.
-\n
-\n• POTENTES INTEGRACIONES: Usa Element con las herramientas que conoces y que mas te gustan. Con Element puedes hasta chatear con usuarios y grupos de otras apps de chat.
-\n
-\n• PRIVADA Y SEGURA: Mantén privadas tus conversaciones. La condición de encriptación de extremo a extremo asegura que las conversaciones privadas sigan siendo siempre privadas.
-\n
-\n• ABIERTO, NO CERRADO: Código abierto y construido en Matrix. Posee tus propios datos alojando tu propio servidor o selecciona uno en el que confíes.
-\n
-\n• ALLÁ DONDE ESTÉS: Mantente en contacto dondequiera que estés con el historial de mensajes totalmente sincronizado a través de todos tus dispositivos online en http://riot.im.</string>
-
     <string name="passphrase_empty_error_message">Por favor introduzca una contraseña</string>
     <string name="passphrase_passphrase_too_weak">La contraseña que has introducido es muy débil</string>
 
@@ -1372,7 +1343,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="keys_backup_recovery_code_error_decrypt">La copia de seguridad no se ha podido descifrar con esta contraseña: por favor verificar que has introducido la contraseña de recuperación correcta.</string>
 
     <string name="keys_backup_restore_success_title">Copia de seguridad restaurada %s !</string>
-    <string name="keys_backup_restore_success_description">Se han restaurado %1$d claves de sesión y se han añadido %2$d nuevas claves que esta sesión no conocía</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Copia de seguridad restaurada con la clave %d.</item>
         <item quantity="other">Copia de seguridad restaurada con las claves %d.</item>
@@ -1548,7 +1518,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="keys_backup_unable_to_get_keys_backup_data">Error obteniendo claves para copias de respaldo</string>
 
     <string name="room_list_catchup_empty_title">!Estás al día!</string>
-    <string name="alpha_disclaimer_content_line_1">Mientras Element esté en desarrollo, algunas características pueden faltar y existir fallas.</string>
     <string name="settings_preferences">Preferencias</string>
     <string name="settings_security_and_privacy">Seguridad &amp; Privacidad</string>
     <string name="preference_voice_and_video">Voz &amp; Video</string>
@@ -1594,7 +1563,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="login_error_no_homeserver_found">Esta no es una dirección de servidor Matrix válida</string>
     <string name="login_error_homeserver_not_found">No se puede acceder al servidor en esta URL, por favor, compruébelo</string>
     <string name="sas_error_m_mismatched_sas">El SAS no coincidió</string>
-    <string name="alpha_disclaimer_title">¡Bienvenido a la beta!</string>
     <string name="auth_add_phone_message_2">Pon un número de teléfono para que las personas que conoces te puedan encontrar.</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Se usará %s como asistencia cuando el servidor doméstico no la ofrezca (su dirección IP se compartirá durante una llamada)</string>
     <string name="settings_background_fdroid_sync_mode">Modo sincronización en segundo plano (Experimental)</string>
@@ -1648,17 +1616,8 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="identity_server_not_defined">No estás usando ningún Servidor de Identidad</string>
     <string name="identity_server_not_defined_for_password_reset">No hay ningún Servidor de Identidad configurado, esto es requerido para restablecer tu contraseña.</string>
 
-    <string name="security_warning_identity_server">Las versiones anteriores de Element tenían un error de seguridad que podía dar a su Servidor de Identidad (%1$s) acceso a su cuenta. Si confías en %2$s, puedes ignorar esto; de lo contrario, por favor cierra la sesión y vuelve a entrar.
-\n
-\nLee más detalles aquí:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="error_user_already_logged_in">Parece que estás intentando conectarte a otro servidor doméstico. ¿Quieres cerrar sesión\?</string>
 
-    <string name="alpha_disclaimer_content_line_2_gplay">La última lista de características está siempre en %1$s, y si encuentras errores por favor envía un informe des del menú superior izquierdo de Inicio, y los arreglaremos tan rápido como podamos.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Descripción de Play Store</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Si encuentras errores por favor envía un informe de errores des del menú superior izquierdo del menú de Inicio. Resolveremos el error tan rápido como podamos.</string>
-
     <string name="import_e2e_keys_from_file">Importar llaves E2E des del fichero \"%1$s\".</string>
 
     <string name="settings_sdk_version">Versión del SDK de Matrix</string>
@@ -1689,16 +1648,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
 
     <string name="settings_labs_show_hidden_events_in_timeline">Mostrar eventos ocultos en la línea de tiempo</string>
 
-    <string name="store_riotx_title">Element - Cliente Matrix de Futura Generación</string>
-    <string name="store_riotx_short_description">Un cliente para Matrix más rápido y ligero que usa los últimos frameworks de Android</string>
-    <string name="store_riotx_full_description">Element es un nuevo cliente del protocolo Matrix (Matrix.org): una red abierta para una comunicación segura y descentralizada. Element es una reescritura completa del cliente Riot Android, basada en una reescritura completa del SDK Matrix Android.
-\n
-\nDescargo de responsabilidad: Esta es una versión beta. Element está actualmente en desarrollo activo y contiene limitaciones y (esperamos que no demasiados) errores. Todas las sugerencias son bienvenidas!
-\n
-\nElement soporta: - Entrar en una cuenta existente - Crear una sala y unirse a las salas públicas - Aceptar y rechazar invitaciones - Listar las salas de los usuarios - Ver los detalles de la sala - Enviar mensajes de texto - Enviar archivos adjuntos - Leer y escribir mensajes en salas cifradas - Criptografía: Copia de seguridad de claves E2E, verificación avanzada de dispositivos, solicitud y respuesta de compartir claves - Notificación push - Temas claros, oscuros y negros
-\n
-\nNo todas las características de Element están implementadas en Element todavía. Principales características que faltan (¡pronto disponibles!): - Configuración de la sala (lista de miembros de la sala, etc.) - Llamadas - Widgets - …</string>
-
     <string name="bottom_action_people_x">Mensajes Directos</string>
 
     <string name="send_file_step_idle">Esperando…</string>
@@ -1712,9 +1661,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
 
     <string name="edited_suffix">(editado)</string>
 
-    <string name="riotx_no_registration_notice">%1$s para crear una cuenta.</string>
-    <string name="riotx_no_registration_notice_colored_part">Usar la app antigua</string>
-
 
     <string name="message_edits">Modificación de mensajes</string>
     <string name="no_message_edits_found">No se han encontrado modificaciones</string>
@@ -1793,7 +1739,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="a11y_hide_password">Esconder contraseña</string>
     <string name="a11y_jump_to_bottom">Saltar al final</string>
 
-    <string name="two_and_some_others_read">Leído por %1$s, %2$s, %3$d y otros</string>
     <string name="three_users_read">Leído por %1$s, %2$s y %3$s</string>
     <string name="two_users_read">Leído por %1$s y %2$s</string>
     <string name="one_user_read">Leído por %s</string>
@@ -1887,7 +1832,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="login_server_url_form_modular_notice">Introduzca la dirección de Modular Element o servidor que quieres usar</string>
     <string name="login_server_url_form_other_notice">Introduzca la dirección del servidor Element al que quieres conectarte</string>
 
-    <string name="login_sso_error_message">Se produjo un error al cargar la pagina: %1$s (%2$d)</string>
+    <string name="login_sso_error_message">Se produjo un error al cargar la página: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">"La aplicación no es capaz de iniciar sesión en este servidor. Este solo soporta el acceso mediante:  %1$s.
 \n
 \n¿Quieres acceder usando un cliente web\?"</string>
@@ -1901,4 +1846,74 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="login_reset_password_on">Reiniciar contraseña en %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">¡Las claves ya están al día!</string>
 
+    <string name="play_video">Reproducir</string>
+    <string name="pause_video">Pausar</string>
+    <string name="dismiss">Descartar</string>
+
+
+    <string name="action_copy">Copiar</string>
+    <string name="dialog_title_success">Correcto</string>
+
+    <string name="bottom_action_notification">Notificaciones</string>
+    <string name="call_failed_no_connection">Element Fallo la Llamada</string>
+    <string name="call_failed_no_connection_description">Fallo al intentar establecer conexion.
+\nTURN Server fallo. Por favor, contacte con el administrador de su Servidor y notifique el fallo.</string>
+
+    <string name="call_select_sound_device">Seleccionar Dispositivo de Sonido</string>
+    <string name="sound_device_phone">Telefono</string>
+    <string name="sound_device_speaker">Altavoz</string>
+    <string name="sound_device_headset">Auricular</string>
+    <string name="sound_device_wireless_headset">Auriculares inalámbricos</string>
+    <string name="call_switch_camera">Cambiar cámara</string>
+    <string name="call_camera_front">Frontal</string>
+    <string name="call_camera_back">Tracera</string>
+    <string name="call_format_turn_hd_off">Apagar HD</string>
+    <string name="call_format_turn_hd_on">Activar HD</string>
+
+    <string name="login_error_ssl_peer_unverified">Error SSl: la identidad del par no a sido verificada.</string>
+    <string name="login_error_ssl_other">Error SSL.</string>
+    <string name="settings_call_ringtone_use_default_stun">Permitir servidor de asistencia de llamadas</string>
+    <string name="active_call_with_duration">Llamada activa (%s)</string>
+    <string name="return_to_call">Regresar a la llamada</string>
+
+    <string name="room_participants_action_cancel_invite">Cancelar invitación</string>
+    <string name="room_participants_action_ignore_title">Ignorar Usuario</string>
+    <string name="room_participants_action_cancel_invite_title">Cancelar Invitacion</string>
+    <string name="error_empty_field_choose_user_name">Por favor, elija un nombre de usuario.</string>
+    <string name="error_empty_field_choose_password">Por favor, elija una contraseña.</string>
+    <string name="external_link_confirmation_title">Verifica este enlace</string>
+    <string name="external_link_confirmation_message">Este link %1$s loredirecciona a otro sitio %2$s. .
+\nEsta seguro de continuar\?</string>
+
+    <string name="add_members_to_room">Adicionar miembros</string>
+    <string name="invite_users_to_room_action_invite">INVITAR</string>
+    <string name="inviting_users_to_room">Invitando usuarios…</string>
+    <string name="invite_users_to_room_title">Invitar Usuarios</string>
+    <string name="invitation_sent_to_one_user">Invitación enviada a %1$s</string>
+    <string name="invitations_sent_to_two_users">Invitación enviada a %1$s y %2$s</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="one">Invitaciones enviadas a % $s y a uno más</item>
+        <item quantity="other">Invitaciones enviadas a %$s y a %2$d más</item>
+    </plurals>
+    <string name="invite_users_to_room_failure">No se pudo invitar el usuario. Por favor, intente nuevamente.</string>
+
+    <string name="choose_locale_current_locale_title">Idioma actual</string>
+    <string name="choose_locale_other_locales_title">Otros idiomas disponibles</string>
+    <string name="choose_locale_loading_locales">Cargando lenguajes disponibles</string>
+
+    <string name="open_terms_of">Leer los terminos de %s</string>
+    <string name="disconnect_identity_server_dialog_content">Desconectarse del servidor de Identidad %s\?</string>
+    <string name="identity_server_error_outdated_identity_server">Servidor de identidad desactualizado. Element solo soporta API V2.</string>
+    <string name="identity_server_error_outdated_home_server">Operación no posible. Servidor desactualizado.</string>
+    <string name="identity_server_error_no_identity_server_configured">Por favor, configure primero un Servidor de Identidad.</string>
+    <string name="element_disclaimer_title">Riot ahora es Element!</string>
+    <string name="element_disclaimer_negative_button">Entendido</string>
+    <string name="element_disclaimer_positive_button">Aprender Mas</string>
+
+    <string name="element_login_splash_brand">Element</string>
+
+
+    <string name="search_in_my_contacts">Buscar en mis contactos</string>
+    <string name="three_pid_revoke_invite_dialog_title">Rechazar invitación</string>
+    <string name="auth_pin_confirm_to_disable_title">Confirma PIN para desabilitarlo</string>
 </resources>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index a259d5cb4c..b5dea7d957 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -127,7 +127,7 @@
     <string name="home_filter_placeholder_groups">Filtreeri kogukondasid</string>
 
     <string name="invitations_header">Kutsed</string>
-    <string name="low_priority_header">Madal prioriteet</string>
+    <string name="low_priority_header">Vähetähtis</string>
     <string name="system_alerts_header">Süsteemi hoiatused</string>
 
     <string name="direct_chats_header">Vestlused</string>
@@ -273,11 +273,1931 @@
     <string name="login_error_no_homeserver_found">See ei ole toimiv Matrix\'i serveri aadress</string>
     <string name="login_error_homeserver_not_found">Sellel aadressil ei leidu koduserverit, palun kontrolli aadressi õigsust</string>
     <string name="login_error_ssl_handshake">Sinu seade kasutab aegunud versiooni TLS-protokollist ning seal leiduvate turvanõrkuste tõttu ja sinu turvalisuse tagamiseks ühendust serveriga ei algatata</string>
-    <string name="login_mobile_device">Mobiiltelefon</string>
 
     <string name="login_error_forbidden">Vigane kasutajanimi või salasõna</string>
     <string name="login_error_bad_json">Vigane JSON</string>
     <string name="login_error_not_json">Ei sisaldanud korrektset JSON\'it</string>
     <string name="login_error_limit_exceeded">Liiga palju samaaegseid sisselogimispäringuid</string>
     <string name="login_error_user_in_use">See kasutajanimi on juba kasutusel</string>
+    <string name="play_video">Esita</string>
+    <string name="pause_video">Peata</string>
+    <string name="dismiss">Loobu</string>
+
+
+    <string name="action_copy">Kopeeri</string>
+    <string name="dialog_title_success">Õnnestus</string>
+
+    <string name="bottom_action_notification">Teavitused</string>
+    <string name="call_failed_no_connection">Kõne ebaõnnestus</string>
+    <string name="call_failed_no_connection_description">Reaalajas ühenduse loomine ei õnnestunud.
+\nPalu oma koduserveri %@ haldajat, et ta seadistaks kõnede kindlamaks toimimiseks TURN serveri.</string>
+
+    <string name="call_select_sound_device">Vali heliseade</string>
+    <string name="sound_device_phone">Telefon</string>
+    <string name="sound_device_speaker">Kõlar</string>
+    <string name="sound_device_headset">Kõrvaklapid</string>
+    <string name="sound_device_wireless_headset">Traadita kõrvaklapid</string>
+    <string name="call_switch_camera">Vaheta kaamerat</string>
+    <string name="call_camera_front">Esikaamera</string>
+    <string name="call_camera_back">Tagakaamera</string>
+    <string name="call_format_turn_hd_off">Lülita kõrglahutusega video välja</string>
+    <string name="call_format_turn_hd_on">Lülita kõrglahutusega video sisse</string>
+
+    <string name="auth_login_sso">Logi sisse ühekordse sisselogimise abil</string>
+    <string name="login_error_ssl_other">SSL-ühenduse viga.</string>
+    <string name="login_error_unknown_token">Sisestatud tunnusluba ei ole õige</string>
+    <string name="login_error_login_email_not_yet">E-posti teel saadetud linki pole veel klõpsitud</string>
+
+    <string name="e2e_re_request_encryption_key">Küsi oma muudest sessioonidest krüptimisvõtmed uuesti.</string>
+
+    <string name="e2e_re_request_encryption_key_sent">Võtmete jagamise päring on saadetud.</string>
+
+    <string name="e2e_re_request_encryption_key_dialog_title">Päring on saadetud</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Palun käivita Element mõnes muus seadmes, mis suudab neid sõnumeid dekrüptoda ja seega saata krüptovõtmeid siia sessiooni.</string>
+
+    <string name="read_receipts_list">Lugemisteatiste loend</string>
+
+    <string name="groups_list">Gruppide loend</string>
+
+    <plurals name="membership_changes">
+        <item quantity="one">1 liikmelisuse muutus</item>
+        <item quantity="other">%d liikmelisuse muutust</item>
+    </plurals>
+
+    <string name="compression_options">Saada pilt</string>
+    <string name="compression_opt_list_original">Algses suuruses</string>
+    <string name="compression_opt_list_large">Suurena</string>
+    <string name="compression_opt_list_medium">Keskmisena</string>
+    <string name="compression_opt_list_small">Väikesena</string>
+
+    <string name="attachment_cancel_download">Kas katkestame allalaadimise\?</string>
+    <string name="attachment_cancel_upload">Kas katkestame üleslaadimise\?</string>
+    <string name="attachment_remaining_time_seconds">%d sekundit</string>
+    <string name="attachment_remaining_time_minutes">%1$d min %2$d sek</string>
+
+    <string name="yesterday">Eile</string>
+    <string name="today">Täna</string>
+
+    <string name="room_info_room_name">Jututoa nimi</string>
+    <string name="room_info_room_topic">Jututoa teema</string>
+
+    <string name="settings_call_category">Kõned</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Kasuta saabuvate kõnede jaoks Element\'i vaikimisi helinat</string>
+    <string name="settings_call_ringtone_use_default_stun">Kasuta kõnehõlbustusserverit</string>
+    <string name="settings_call_ringtone_title">Saabuva kõne helin</string>
+    <string name="settings_call_ringtone_dialog_title">Vali helin kõnede jaoks:</string>
+
+    <string name="call">Kõne</string>
+    <string name="call_connected">Vastuvõetud kõne</string>
+    <string name="call_connecting">Kõne ühendus on loomisel…</string>
+    <string name="call_ended">Kõne lõppes</string>
+    <string name="call_ring">Helistan…</string>
+    <string name="incoming_call">Saabuv kõne</string>
+    <string name="incoming_video_call">Saabuv videokõne</string>
+    <string name="incoming_voice_call">Saabuv häälkõne</string>
+    <string name="call_in_progress">Kõne on pooleli…</string>
+    <string name="video_call_in_progress">Videokõne on pooleli…</string>
+    <string name="active_call_with_duration">Käsilolev kõne (%s)</string>
+    <string name="return_to_call">Pöördu tagasi kõne juurde</string>
+
+    <string name="call_error_user_not_responding">Teine osapool ei võtnud kõnet vastu.</string>
+    <string name="call_error_camera_init_failed">Kaamerat ei õnnestu kasutusele võtta</string>
+    <string name="call_error_answered_elsewhere">kõnele vastati muust seadmest</string>
+
+    <string name="media_picker_both_capture_title">Tee foto või video</string>
+    <string name="media_picker_cannot_record_video">Video salvestamine ei õnnestu</string>
+
+    <string name="permissions_rationale_popup_title">Lisateave õiguste kohta</string>
+    <string name="permissions_rationale_msg_storage">Element vajab õigusi sinu foto- ja videokataloogide lugemiseks ning manuste salvestamiseks.
+\n
+\nSelleks, et saaksid oma nutiseadmest faile saata palun anna järgmisel lehel vajalikud õigused.</string>
+    <string name="permissions_rationale_msg_camera">Fotode ja videote salvestamiseks ning videokõnede tegemiseks vajab Element õigusi kasutada sinu kaamerat.</string>
+    <string name="permissions_rationale_msg_camera_explanation">"
+\n
+\nKõnede tegemiseks palun anna järgmisel lehel vajalikud õigused."</string>
+    <string name="permissions_rationale_msg_record_audio">Kõnede tegemiseks vajab Element õigusi kasutada sinu mikrofoni.</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">"
+\n
+\nKõnede tegemiseks palun anna järgmisel lehel vajalikud õigused."</string>
+    <string name="permissions_rationale_msg_camera_and_audio">Element vajab videokõnedeks õigusi sinu kaamera ja mikrofoni kasutamiseks.
+\n
+\nKõnede tegemiseks palun anna järgmisel lehel vajalikud õigused.</string>
+    <string name="permissions_action_not_performed_missing_permissions">Vabandust. Kuna vastavaid õigusi ei olnud, siis toimingut ei saanud teha</string>
+
+    <string name="media_slider_saved">Salvestatud</string>
+    <string name="media_slider_saved_message">Kas salvestame allalaetud failide kausta\?</string>
+    <string name="yes">JAH</string>
+    <string name="no">EI</string>
+    <string name="_continue">Jätka</string>
+
+    <string name="remove">Eemalda</string>
+    <string name="join">Liitu</string>
+    <string name="preview">Eelvaade</string>
+    <string name="reject">Hülga</string>
+
+    <string name="room_sync_in_progress">Sünkroniseerin…</string>
+    <string name="room_jump_to_first_unread">Mine esimese lugemata sõnumi juurde.</string>
+
+    <string name="room_preview_invitation_format">Sa oled kutsutud siia jututuppa %s poolt</string>
+    <string name="room_preview_unlinked_email_warning">Kutse saadeti %s e-posti aadressile, aga see ei ole seotud antud kasutajakontoga.
+\nSa kas peaksid logima sisse teise kontoga või lisama selle e-posti aadressi oma kasutajakontole.</string>
+    <string name="room_preview_try_join_an_unknown_room">Sa proovid saada ligipääsu %s jututoale. Kas soovid keskustelus osalemiseks selle jututoaga liituda\?</string>
+    <string name="room_preview_try_join_an_unknown_room_default">jututuba</string>
+    <string name="room_preview_room_interactions_disabled">See on jututoa eelvaade. Seega igasugune suhtlus ei ole võimalik.</string>
+    <string name="room_participants_header_direct_chats">Isiklikud sõnumid</string>
+    <string name="ssl_cert_not_trust">See võib tähendada, et keegi on suuteline pahatahtlikult sinu veebiliiklust pealtkuulama või sinu telefon ei usalda serveri kasutatavat sertifikaati.</string>
+    <string name="ssl_cert_new_account_expl">Kui serveri haldaja on sind teavitanud, et nii võib juhtuda, siis kontrolli, et sertifikaadi sõrmejälg vastab sellele, mille haldaja sulle on andnud.</string>
+    <string name="ssl_unexpected_existing_expl">Võrreldes selle sertifikaadiga, mida sinu nutiseade seni usaldas, on praegune sertifikaat muutunud. See on VÄGA EBATAVALINE. Me soovitame, et ÄRA NÕUSTU selle uue sertifikaadiga.</string>
+    <string name="ssl_expected_existing_expl">Senise usaldusväärse sertifikaadi asemel kasutab server nüüd mitteusaldusväärset sertifikaati. See võib tähendada et haldaja on seda serveris muutnud. Et võrrelda viimase kehtiva sertifikaadi sõrmejälge, palun võta haldajaga ühendust.</string>
+    <string name="ssl_only_accept">NÕUSTU sertifikaadiga vaid siis, kui serveri haldaja antud sõrmejälg klapib sellega, mida sa hetkel siin näed.</string>
+
+    <string name="room_details_title">Jututoa üksikasjad</string>
+    <string name="room_details_people">Inimesed</string>
+    <string name="room_details_files">Failid</string>
+    <string name="room_details_settings">Seadistused</string>
+    <plurals name="room_details_selected">
+        <item quantity="one">1 valitud</item>
+        <item quantity="other">%d valitud</item>
+    </plurals>
+    <string name="malformed_id">Vigane kasutajatunnus. Peaksid kasutama kas e-posti aadressi või õiget Matrix\'i kasutajatunnust vormingus \'@toreinimene:domeen.ee\'</string>
+    <string name="room_details_people_invited_group_name">KUTSUTUD</string>
+    <string name="room_details_people_present_group_name">LIITUNUD</string>
+
+    <string name="room_event_action_report_prompt_reason">Sellest sisust teatamise põhjus</string>
+    <string name="room_event_action_cancel_upload">Katkesta üleslaadimine</string>
+    <string name="room_event_action_cancel_download">Katkesta allalaadimine</string>
+
+    <string name="search_hint">Otsi</string>
+    <string name="search_members_hint">Filtreeri jututoa liikmeid</string>
+    <string name="search_no_results">Tulemusi pole</string>
+    <string name="tab_title_search_rooms">JUTUTOAD</string>
+    <string name="tab_title_search_messages">SÕNUMID</string>
+    <string name="tab_title_search_people">INIMESED</string>
+    <string name="tab_title_search_files">FAILID</string>
+
+    <string name="room_recents_join">LIITU</string>
+    <string name="room_recents_favourites">LEMMIKUD</string>
+    <string name="room_recents_conversations">JUTUTOAD</string>
+    <string name="room_recents_low_priority">VÄHETÄHTIS</string>
+    <string name="room_recents_invites">KUTSED</string>
+    <string name="room_recents_start_chat">Alusta vestlust</string>
+    <string name="room_recents_create_room">Loo jututuba</string>
+    <string name="room_recents_join_room">Liitu jututoaga</string>
+    <string name="room_recents_join_room_title">Liitu jututoaga</string>
+    <string name="room_recents_join_room_prompt">Sisesta jututoa tunnus, nimi või alias</string>
+
+    <string name="directory_search_results_title">Sirvi kataloogi</string>
+    <string name="room_settings_direct_chat">Otsevestlus</string>
+    <string name="active_widget_view_action">VAATA</string>
+    <string name="deactivate_account_delete_checkbox">Minu konto kustutamisel palun unusta minu saadetud sõnumid (Hoiatus: seetõttu näevad tulevased kasutajad poolikuid vestlusi)</string>
+    <string name="sas_view_request_action">Näita päringut</string>
+    <string name="message_view_reaction">Näita reageerimisi</string>
+    <string name="create_new_room">Loo uus jututuba</string>
+    <string name="send_suggestion">Tee ettepanek</string>
+    <string name="send_suggestion_content">Palun kirjuta oma ettepaneku järgnevale väljale.</string>
+    <string name="send_suggestion_report_placeholder">Kirjelda oma ettepanekut siin</string>
+    <string name="send_suggestion_sent">Tänud, ettepaneku saatmine õnnestus</string>
+    <string name="send_suggestion_failed">Ettepaneku saatmine ei õnnestunud (%s)</string>
+
+    <string name="room_filtering_filter_hint">Sõelu vestlustest…</string>
+    <string name="room_filtering_footer_title">Kas sa ei leia seda, mida otsisid\?</string>
+    <string name="room_filtering_footer_create_new_room">Loo uus jututuba</string>
+    <string name="room_filtering_footer_create_new_direct_message">Saada uus otsesõnum</string>
+    <string name="room_filtering_footer_open_room_directory">Vaata jututubade loendit</string>
+
+    <string name="direct_room_filter_hint">Sõelu kasutajanime või kasutajatunnuse alusel…</string>
+
+    <string name="message_view_edit_history">Näita muudatuste ajalugu</string>
+
+    <string name="a11y_create_direct_message">Algata uus otsevestlus</string>
+    <string name="a11y_create_room">Loo uus jututuba</string>
+    <string name="bug_report_error_too_short">Kirjeldus on liiga lühike</string>
+
+    <string name="notification_initial_sync">Teen andmete esmast sünkroonimist…</string>
+
+    <string name="settings_show_devices_list">Näita kõiki minu sessioone</string>
+    <string name="settings_advanced_settings">Lisaseadistused</string>
+    <string name="alert_push_are_disabled_description">Tõuketeavituste kasutuselevõtuks vaata üle seadistused</string>
+    <string name="create_pin_title">Turvaliseks ligipääsuks seadista PIN-kood</string>
+    <string name="create_pin_confirm_title">Korda PIN-koodi</string>
+    <string name="create_pin_confirm_failure">PIN-koodid ei klapi, palun loo uus PIN-kood.</string>
+    <string name="auth_pin_title">Sisesta oma PIN-kood</string>
+    <string name="auth_pin_forgot">Kas unustasid PIN-koodi\?</string>
+    <string name="auth_pin_reset_title">Lähtesta PIN-kood</string>
+    <string name="auth_pin_new_pin_action">Uus PIN-kood</string>
+    <string name="auth_pin_reset_content">PIN-koodi lähtestamiseks peaksid sa uuesti sisse looma ning seadistama uue PIN-koodi.</string>
+    <string name="settings_security_pin_code_title">Võta PIN-kood kasutusele</string>
+    <string name="settings_security_pin_code_summary">Kui sa soovid oma PIN-koodi lähtestada, siis klõpsi nuppu „Unustasin PIN-koodi“.</string>
+    <string name="auth_pin_confirm_to_disable_title">PIN-koodi kasutuselt eemaldamiseks korda PIN-koodi</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">Kasuta krüptimist vaid verifitseeritud sessioonides</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse selles jututoas.</string>
+
+    <string name="room_settings_addresses_no_local_addresses">Sellel jututoal puuduvad kohalikud aadressid</string>
+    <string name="room_settings_addresses_add_new_address">Uus aadress (näiteks #seltskond:matrix.org)</string>
+
+    <string name="room_settings_no_flair">Sellele jututoale ei ole jagatud ühtegi kogukonna rinnasilti</string>
+    <string name="room_settings_add_new_group">Uus kogukonna tunnus (näiteks +meieseltsing:matrix.org)</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Vigane kogukonna tunnus</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' ei ole korrektne kogukonna tunnus</string>
+
+
+    <string name="room_settings_addresses_invalid_format_dialog_title">Vigane aliase vorming</string>
+    <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' ei ole lubatud aliase vorming</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_msg">Sel jututoal ei saa olema põhiaadressi.</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_title">Põhiaadressi hoiatus</string>
+
+    <string name="room_settings_set_main_address">Määra põhiaadressiks</string>
+    <string name="room_settings_unset_main_address">Eemalda põhiaadressiks määramine</string>
+    <string name="room_settings_copy_room_id">Kopeeri jututoa tunnus</string>
+    <string name="room_settings_copy_room_address">Kopeeri jututoa aadress</string>
+
+    <string name="room_settings_addresses_e2e_enabled">Krüptimine on selles jututoas kasutusel.</string>
+    <string name="room_settings_addresses_e2e_disabled">Krüptimine ei ole selles jututoas kasutusel.</string>
+    <string name="room_settings_addresses_e2e_encryption_warning">Võta krüptimine kasutusele 
+\n(hoiatus: seda ei saa hiljem enam välja lülitada!)</string>
+
+    <string name="directory_title">Kaust</string>
+    <string name="settings_theme">Teema</string>
+
+    <string name="font_size">Fontide suurus</string>
+    <string name="tiny">Pisike</string>
+    <string name="small">Väike</string>
+    <string name="normal">Tavaline</string>
+    <string name="large">Suur</string>
+    <string name="larger">Suurem</string>
+    <string name="largest">Veel suurem</string>
+    <string name="huge">Hiidsuur</string>
+
+    <string name="widget_no_power_to_manage">Sul on vaja õigusi, et selles jututoas hallata vidinaid</string>
+    <string name="widget_creation_failure">Vidina loomine ei õnnestunud</string>
+    <string name="settings_labs_create_conference_with_jitsi">Algata rühmakõnesid jitsi vahendusel</string>
+    <string name="widget_delete_message_confirmation">Kas oled kindel, et soovid siit jututoast selle vidina kustutada\?</string>
+    <plurals name="active_widgets">
+        <item quantity="one">Kasutusel on üks vidin</item>
+        <item quantity="other">Kasutusel on %d vidinat</item>
+    </plurals>
+    <string name="active_widgets_title">Kasutusel vidinad</string>
+
+
+    <string name="room_widget_activity_title">Vidin</string>
+    <string name="room_widget_permission_title">Lae vidin</string>
+    <string name="room_widget_permission_added_by">Selle vidina lisaja:</string>
+    <string name="room_widget_permission_webview_shared_info_title">Vidina kasutamine võib tuua kaasa küpsiste salvestamise ja andmete jagamise serveriga %s:</string>
+    <string name="room_widget_permission_shared_info_title">Selle kasutamine võib tuua kaasa andmete jagamise serveriga %s:</string>
+    <string name="room_widget_failed_to_load">Vidina laadimine ei õnnestunud.
+\n%s</string>
+    <string name="room_widget_reload">Lae vidin uuesti</string>
+    <string name="room_widget_open_in_browser">Ava veebibrauseris</string>
+    <string name="room_widget_revoke_access">Eemalda minu ligipääsuõigused</string>
+
+    <string name="room_widget_permission_display_name">Sinu kuvatav nimi</string>
+    <string name="room_widget_permission_avatar_url">Sinu avatari aadress</string>
+    <string name="room_widget_permission_user_id">Sinu kasutajatunnus</string>
+    <string name="room_widget_permission_theme">Sinu teema</string>
+    <string name="room_widget_permission_widget_id">Vidina tunnus</string>
+    <string name="room_widget_permission_room_id">Jututoa tunnus</string>
+
+
+    <string name="has_been_banned">%2$s seadis sulle ligipääsukeelu %1$s jututuppa</string>
+    <string name="reason_colon">Põhjus: %1$s</string>
+    <string name="rejoin">Liitu uuesti</string>
+    <string name="forget_room">Unusta jututuba ära</string>
+
+    <string name="keys_backup_setup_step1_advanced">(Lisaseadistused)</string>
+    <string name="keys_backup_setup_step1_manual_export">Ekspordi võtmed käsitsi</string>
+
+    <string name="keys_backup_setup_step2_text_title">Krüpti oma varukoopia paroolifraasiga.</string>
+    <string name="keys_backup_setup_step2_text_description">Me salvestame krüptitud varukoopia sinu krüptovõtmetest meie serveris. Tagamaks, et keegi ei saa seda kasutada, krüpti varukoopia paroolifraasiga.
+\n
+\n Parima turvalisuse jaoks peaks paroolifraas olema erinev sinu konto salasõnast.</string>
+    <string name="keys_backup_setup_step2_button_title">Loo paroolifraas</string>
+    <string name="keys_backup_setup_creating_backup">Teen varukoopiat</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Või krüpti oma varukoopia taastevõtmega ning hoia taastevõtit turvalises kohas.</string>
+    <string name="keys_backup_setup_step2_skip_button_title">Võta kasutusele taastevõti</string>
+    <string name="keys_backup_setup_step3_success_title">Õnnestus!</string>
+    <string name="keys_backup_setup_step3_text_line1">Sinu krüptovõtmeid parasjagu varundatakse.</string>
+    <string name="keys_backup_setup_step3_text_line2">Sinu taastevõti toimib turvavõrguna - juhul, kui sa unustad taastamiseks mõeldud paroolifraasi, siis sa saad seda kasutada taastamaks ligipääsu krüptitud sõnumitele.
+\nHoia taastevõtit turvalises kohas, nagu näiteks salasõnahalduris või vana kooli seifis</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Hoia oma taastevõtit väga turvalises kohas, nagu näiteks salasõnahalduris või vana kooli seifis</string>
+    <string name="keys_backup_setup_step3_button_title">Valmis</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Ma olen juba teinud koopia</string>
+    <string name="keys_backup_setup_step3_copy_button_title">Salvesta taastevõti</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">Jaga</string>
+    <string name="keys_backup_setup_step3_save_button_title">Salvesta failina</string>
+    <string name="keys_backup_unlock_button">Võta ajalugu lukust lahti</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Palun sisesta taastevõti</string>
+    <string name="sas_emoji_description">Verifitseeri see sessioon tehes kindlaks et järgnev emoji kuvatakse partneri ekraanil</string>
+    <string name="sas_decimal_description">Verifitseeri see sessioon tehes kindlaks, et järgnevad numbrid kuvatakse partneri ekraanil</string>
+
+    <string name="sas_incoming_verification_request_dialog">Sa võtsid vastu saabuva verifitseerimispalve.</string>
+    <string name="sas_waiting_for_partner">Ootan teise osapoole kinnitust…</string>
+
+    <string name="sas_verified">Verifitseeritud!</string>
+    <string name="sas_verified_successful">Sa oled edukalt verifitseerinud selle sessiooni.</string>
+    <string name="sas_verified_successful_description">Turvalised sõnumid selle kasutajaga on läbivalt krüptitud ning kolmandad osapooled ei saa neid lugeda.</string>
+    <string name="sas_got_it">Selge lugu</string>
+
+    <string name="sas_verifying_keys">Mitte midagi huvitavat ei paista\? Kõik kliendid ei toeta veel interaktiivset verifitseerimist. Selle asemel kasuta vana kooli verifitseerimist.</string>
+    <string name="sas_legacy_verification_button_title">Kasuta vana kooli verifitseerimist.</string>
+
+    <string name="sas_verification_request_notification_channel_title">Krüptovõtmete verifitseerimine</string>
+    <string name="sas_cancelled_dialog_title">Päring on tühistatud</string>
+    <string name="sas_cancelled_by_other">Teine osapool tühistas verifitseerimise.
+\n%s</string>
+    <string name="sas_cancelled_by_me">Verifitseerimine on tühistatud.
+\nPõhjus %s</string>
+
+    <string name="sas_verification_request_notification_channel">Vastastikune sessioonide verifitseerimine</string>
+    <string name="sas_incoming_request_notif_title">Verifitseerimispäring</string>
+    <string name="sas_incoming_request_notif_content">%s soovib verifitseerida sinu sessiooni</string>
+
+    <string name="sas_error_m_user">Kasutaja tühistas verifitseerimise</string>
+    <string name="sas_error_m_timeout">Verifitseerimisprotsess aegus</string>
+    <string name="room_list_rooms_empty_body">Sinu jututoad kuvatakse siin</string>
+
+    <string name="title_activity_emoji_reaction_picker">Reageerimised</string>
+    <string name="reactions_agree">Nõus</string>
+    <string name="reactions_like">Meeldib</string>
+    <string name="message_add_reaction">Lisa reaktsioon</string>
+    <string name="reactions">Reageerimised</string>
+
+    <string name="event_redacted">Sõnum on kustutatud</string>
+    <string name="settings_show_redacted">Näita kustutatud sõnumeid</string>
+    <string name="settings_show_redacted_summary">Näita kustutatud sõnumite asemel kohatäidet</string>
+    <string name="event_redacted_by_user_reason">Kasutaja kustutas sündmuse</string>
+    <string name="event_redacted_by_admin_reason">Jututoa haldur on sündmust modereerinud</string>
+    <string name="last_edited_info_message">Viimati muudetud %1$s poolt, muutmise aeg %2$s</string>
+
+
+    <string name="malformed_message">Vigaselt vormindatud sündmus ja kuvamine pole seetõttu võimalik</string>
+    <string name="error_no_network">Võrguühendus puudub. Palun kontrolli oma internetiühendust.</string>
+    <string name="action_change">Muuda</string>
+    <string name="change_room_directory_network">Vaheta võrku</string>
+    <string name="please_wait">Palun oota…</string>
+    <string name="group_all_communities">Kõik kogukonnad</string>
+
+    <string name="room_preview_no_preview">Sellel jututoal puudub eelvaade</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Element ei toeta veel kõigile nähtavate jututubade eelvaadet</string>
+
+    <string name="fab_menu_create_room">Jututoad</string>
+    <string name="fab_menu_create_chat">Isiklikud sõnumid</string>
+
+    <string name="create_room_title">Uus jututuba</string>
+    <string name="create_room_action_create">LOO</string>
+    <string name="create_room_name_hint">Jututoa nimi</string>
+    <string name="create_room_public_title">Avalik</string>
+    <string name="create_room_public_description">Kõik võivad selle jututoaga liituda</string>
+    <string name="create_room_directory_title">Jututubade loend</string>
+    <string name="create_room_directory_description">Avalda see jututuba jututubade loendis</string>
+
+    <string name="send_attachment">Saada manus</string>
+
+    <string name="uploads_media_no_result">Selles jututoas pole meediafaile</string>
+    <string name="uploads_files_title">FAILID</string>
+    <string name="uploads_files_subtitle">Lisaja %1$s, lisamise aeg %2$s</string>
+    <string name="uploads_files_no_result">Selles jututoas pole faile</string>
+
+    <string name="report_content_spam">Tegemist on spämmiga</string>
+    <string name="report_content_inappropriate">See on ebasobilik</string>
+    <string name="report_content_custom">Kohandatud põhjus…</string>
+    <string name="report_content_custom_title">Teata kahtlasest sisust</string>
+    <string name="report_content_custom_hint">Sellest sisust teatamise põhjus</string>
+    <string name="report_content_custom_submit">SAADA TEADE</string>
+    <string name="login_reset_password_success_notice">Sinu salasõna on muudetud.</string>
+    <string name="login_reset_password_success_notice_2">Sa oled kõikidest sessioonidest välja logitud ning enam ei saa tõuketeavitusi. Nende taaskuvamiseks logi sisse kõikides oma seadmetes.</string>
+    <string name="login_reset_password_success_submit">Tagasi sisselogimise lehele</string>
+
+    <string name="login_reset_password_cancel_confirmation_title">Hoiatus</string>
+    <string name="verification_request_start_notice">"Turvalisuse mõttes on oluline, et teed seda nii, et kas olete  üheskoos või kasutate suhtluskanalit, mida mõlemad usaldate."</string>
+
+    <string name="verification_emoji_notice">Võrdle unikaalset emoji\'de kombinatsiooni ja vaata, et nad oleksid samas järjekorras.</string>
+    <string name="verification_code_notice">Võrdle koodi sellega, mida kuvatakse teise kasutaja ekraanil.</string>
+    <string name="verification_conclusion_ok_notice">Sõnumid selle kasutajaga on läbivalt krüptitud ning kolmandad osapooled ei saa neid lugeda.</string>
+    <string name="verification_conclusion_ok_self_notice">Sinu uus sessioon on nüüd verifitseeritud. Selles sessioonis saad lugeda oma krüptitud sõnumeid ja teiste kasutajate jaoks on ta usaldusväärne.</string>
+
+    <string name="encryption_information_cross_signing_state">Risttunnustamine</string>
+    <string name="encryption_information_dg_xsigning_complete">Risttunnustamine on kasutusel
+\nPrivaatvõtmed asuvad seadmes.</string>
+    <string name="encryption_information_dg_xsigning_trusted">Risttunnustamine on kasutusel
+\nVõtmed on usaldusväärsed
+\nPrivaatvõtmed ei ole teada</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">Risttunnustamine on kasutusel
+\nVõtmed ei ole usaldusväärsed</string>
+    <string name="encryption_information_dg_xsigning_disabled">Risttunnustamine ei ole kasutusel</string>
+
+    <string name="settings_hs_admin_e2e_disabled">Sinu serveri haldur on lülitanud läbiva krüptimise omavahelistes jututubades ja otsesõnumites välja.</string>
+    <string name="settings_active_sessions_list">Aktiivsed sessioonid</string>
+    <string name="settings_active_sessions_show_all">Näita kõiki sessioone</string>
+    <string name="settings_active_sessions_manage">Halda sessioone</string>
+    <string name="settings_active_sessions_signout_device">Logi sellest sessioonist välja</string>
+
+    <string name="settings_failed_to_get_crypto_device_info">Teave krüptograafia kohta puudub</string>
+
+    <string name="settings_active_sessions_verified_device_desc">Kuna sina oled selle sessiooni verifitseerinud, siis see sessioon on krüptitud sõnumite saatmiseks usaldusväärne:</string>
+    <string name="identity_server_error_outdated_identity_server">See isikutuvastusserver kasutab vana API\'t. Element toetab aga vaid API versiooni 2.</string>
+    <string name="identity_server_error_outdated_home_server">See tegevus ei ole võimalik. Koduserveri versioon on liiga vana.</string>
+    <plurals name="directory_search_rooms">
+        <item quantity="one">1 jututuba</item>
+        <item quantity="other">%d jututuba</item>
+    </plurals>
+    <plurals name="directory_search_rooms_for">
+        <item quantity="one">Otsingusõnaga %2$s leidsin %1$s jututoa</item>
+        <item quantity="other">Otsingusõnaga %2$s leidsin %1$s jututuba</item>
+    </plurals>
+    <string name="directory_searching_title">Otsin kataaloogist…</string>
+
+    <string name="room_settings_all_messages_noisy">Kõik sõnumid (lärmakas)</string>
+    <string name="room_settings_all_messages">Kõik sõnumid</string>
+    <string name="room_settings_mention_only">Ainult mainimised</string>
+    <string name="room_settings_mute">Summuta</string>
+    <string name="room_settings_favourite">Lemmik</string>
+    <string name="room_settings_de_prioritize">Vähetähtis</string>
+    <string name="room_settings_leave_conversation">Lahku vestlusest</string>
+    <string name="room_settings_forget">Unusta</string>
+    <string name="room_settings_add_homescreen_shortcut">Lisa otsetee avalehele</string>
+
+    <string name="room_sliding_menu_messages">Sõnumid</string>
+    <string name="room_sliding_menu_settings">Seadistused</string>
+    <string name="room_sliding_menu_version">Versioon</string>
+    <string name="room_sliding_menu_version_x">Versioon %s</string>
+    <string name="room_sliding_menu_term_and_conditions">Kasutustingimused</string>
+    <string name="room_sliding_menu_third_party_notices">Kolmandate osapoolte litsentsid</string>
+    <string name="room_sliding_menu_copyright">Autoriõigused</string>
+    <string name="room_sliding_menu_privacy_policy">Privaatsuspoliitika</string>
+
+    <string name="settings_profile_picture">Profiilipilt</string>
+    <string name="settings_display_name">Kuvatav nimi</string>
+    <string name="settings_email_address">E-posti aadress</string>
+    <string name="settings_add_email_address">Lisa e-posti aadress</string>
+    <string name="settings_phone_number">Telefon</string>
+    <string name="settings_add_phone_number">Lisa telefoninumber</string>
+    <string name="settings_app_info_link_title">Rakenduse teave</string>
+    <string name="settings_app_info_link_summary">Näita rakenduse teavet süsteemi seadistustes.</string>
+    <string name="settings_add_3pid_confirm_password_title">Kinnitage oma salasõna</string>
+    <string name="settings_add_3pid_flow_not_supported">Seda tegevust ei saa teha Element\'i nutirakendusest</string>
+    <string name="settings_add_3pid_authentication_needed">Autentimine on nõutav</string>
+
+
+    <string name="settings_notification_advanced">Teavituste lisaseadistused</string>
+    <string name="settings_notification_by_event">Teavituse olulisus sündmuse alusel</string>
+
+    <string name="settings_notification_privacy">Teavituste privaatsus</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Süsteemiseadistused.</string>
+    <string name="settings_troubleshoot_test_account_settings_title">Kasutajakonto seadistused.</string>
+    <string name="settings_troubleshoot_test_account_settings_success">Sinu kontol on teavitused kasutusel.</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Sinu kontol ei ole teavitusi kasutusel.
+\nSeda saad muuta konto seadistuses.</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">Võta kasutusele</string>
+
+    <string name="settings_troubleshoot_test_device_settings_title">Sessiooni seadistused.</string>
+    <string name="settings_troubleshoot_test_device_settings_success">Selles sessioonis on teavitused kasutusel.</string>
+    <string name="settings_troubleshoot_test_device_settings_failed">Selles sessioonis ei ole teavitusi kasutusel.
+\nSeda saad muuta Element\'i seadistuses.</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">Võta kasutusele</string>
+
+    <string name="settings_troubleshoot_test_bing_settings_title">Kohandatud seadistused.</string>
+    <string name="settings_12_24_timestamps">Näita ajatempleid 12-tunnises vormingus</string>
+    <string name="settings_show_read_receipts">Näita lugemisteatiseid</string>
+    <string name="settings_phone_number_label">Telefoninumber</string>
+    <string name="settings_phone_number_error">Valitud maa jaoks on see vale telefoninumber</string>
+    <string name="settings_phone_number_verification">Telefoninumbri kontrollimine</string>
+    <string name="settings_phone_number_verification_instruction">Me oleme SMS\'iga saatnud aktiveerimiskoodi. Palun sisesta see kood siia.</string>
+    <string name="settings_phone_number_verification_error_empty_code">Sisesta SMS\'iga saadetud aktiveerimiskood</string>
+    <string name="settings_phone_number_verification_error">Viga sinu telefoninumbri kontrollimisel</string>
+    <string name="settings_phone_number_code">Kood</string>
+    <string name="account_phone_number_error">Sinu telefoninumbri kontrollimisel tekkis viga.</string>
+    <string name="account_additional_info">Lisateave: %s</string>
+
+    <string name="settings_media">Meedia</string>
+    <string name="settings_default_compression">Vaikimisi pakkimine</string>
+    <string name="compression_opt_list_choose">Vali</string>
+    <string name="settings_default_media_source">Vaikimisi meediaallikas</string>
+    <string name="media_source_choose">Vali</string>
+    <string name="settings_play_shutter_sound">Tee katiku klõpsu</string>
+
+    <string name="settings_flair">Kogukonna rinnasilt</string>
+    <string name="settings_without_flair">Sa ei ole hetkel ainsamagi kogukonna liige.</string>
+
+    <string name="media_saving_period_3_days">3 päeva</string>
+    <string name="media_saving_period_1_week">1 nädal</string>
+    <string name="media_saving_period_1_month">1 kuu</string>
+    <string name="media_saving_period_forever">Igavesti</string>
+
+    <string name="room_settings_room_photo">Jututoa foto</string>
+    <string name="room_settings_room_name">Jututoa nimi</string>
+    <string name="room_settings_topic">Jututoa teema</string>
+    <string name="room_settings_room_tag">Jututoa silt</string>
+    <string name="room_settings_tag_pref_dialog_title">Sildistatud kui:</string>
+
+    <string name="room_settings_tag_pref_entry_favourite">Lemmik</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Vähetähtis</string>
+    <string name="room_settings_tag_pref_entry_none">Ei midagi</string>
+
+    <string name="room_settings_category_access_visibility_title">Ligipääs ja nähtavus</string>
+    <string name="room_settings_directory_visibility">Näita seda jututuba jututubade kataloogis</string>
+    <string name="room_settings_room_notifications_title">Teavitused</string>
+    <string name="room_settings_room_access_rules_pref_title">Ligipääs jututuppa</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Jututoa ajaloo loetavus</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Kes võivad lugeda ajalugu\?</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">Kes pääsevad ligi siia jututuppa\?</string>
+
+    <string name="room_settings_read_history_entry_anyone">Kõik kasutajad</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Ainult liikmetele (alates selle seadistuse kasutuselevõtmisest)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Ainult liikmetele (alates nende kutsumise ajast)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Ainult liikmetele (alates liitumisest)</string>
+
+    <string name="room_settings_room_access_warning">Sellele jututoale viitamiseks peab tal olema aadress.</string>
+    <string name="room_settings_room_access_entry_only_invited">Vaid kutsutud kasutajad</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Kõik, kes teavad jututoa viidet, välja arvatud külalised</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Kõik, kes teavad jututoa viidet, kaasa arvatud külalised</string>
+
+    <string name="room_settings_banned_users_title">Suhtluskeelu saanud kasutajad</string>
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d suhtluskeelu saanud kasutaja</item>
+        <item quantity="other">%d suhtluskeelu saanud kasutajat</item>
+    </plurals>
+
+    <string name="room_settings_category_advanced_title">Lisaseadistused</string>
+    <string name="room_settings_room_internal_id">Selle jututoa sisemine tunnus</string>
+    <string name="room_settings_addresses_pref_title">Aadressid</string>
+    <string name="room_settings_labs_pref_title">Katsed</string>
+    <string name="room_settings_labs_warning_message">Need on alles katsejärgus olevad funktsionaalsused. Ole kasutamisel ettevaatlik.</string>
+    <string name="room_settings_labs_end_to_end">Läbiv krüptimine</string>
+    <string name="room_settings_labs_end_to_end_is_active">Läbiv krüptimine on kasutusel</string>
+    <string name="room_settings_labs_end_to_end_warnings">Läbiva krüptimise kasutuselevõtuks pead korraks välja logima.</string>
+    <string name="failed_to_load_timeline_position">%s üritas laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida.</string>
+
+    <string name="encryption_information_title">Läbiva krüptimise teave</string>
+
+    <string name="encryption_information_device_info">Sündmuse teave</string>
+    <string name="encryption_information_user_id">Kasutajatunnus</string>
+    <string name="encryption_information_curve25519_identity_key">Curve25519 identiteedi võti</string>
+    <string name="encryption_information_claimed_ed25519_fingerprint_key">Väidetav Ed25519 allkirja sõrmejälje võti</string>
+    <string name="encryption_information_algorithm">Algoritm</string>
+    <string name="encryption_information_session_id">Sessiooni tunnus</string>
+    <string name="encryption_information_decryption_error">Dekrüptimise viga</string>
+
+    <string name="encryption_information_sender_device_information">Saatja sessiooni teave</string>
+    <string name="encryption_information_device_name">Avalik nimi</string>
+    <string name="encryption_information_device_name_with_warning">Avalik nimi (nähtav neile, kellega sa suhtled)</string>
+    <string name="device_name_warning">Sessiooni avalik nimi on nähtav neile, kellega sa suhtled</string>
+    <string name="encryption_information_name">Avalik nimi</string>
+    <string name="encryption_information_device_id">Seadme tunnus</string>
+    <string name="encryption_information_device_key">Sessiooni võti</string>
+    <string name="encryption_information_verification">Verifitseerimine</string>
+    <string name="encryption_information_ed25519_fingerprint">Ed25519 sõrmejälg</string>
+
+    <string name="encryption_export_e2e_room_keys">Ekspordi jututubade läbiva krüptimise võtmed</string>
+    <string name="encryption_export_room_keys">Ekspordi jututoa võtmed</string>
+    <string name="encryption_export_room_keys_summary">Ekspordi võtmed kohalikku faili</string>
+    <string name="encryption_export_export">Ekspordi</string>
+    <string name="room_join_rules_invite_by_you">Sina määrasid, et jututuppa pääseb vaid kutsega.</string>
+    <string name="timeline_unread_messages">Lugemata sõnumid</string>
+
+    <string name="login_splash_text2">Krüptimise abil hoiad vestlused privaatsena</string>
+    <string name="login_splash_text3">Laienda ja kohanda oma kasutuskogemust</string>
+    <string name="login_splash_submit">Alusta</string>
+
+    <string name="login_server_title">Vali server</string>
+    <string name="login_server_text">Nii nagu e-posti puhul, siis kasutajakonto asub ühes serveris, kuid saab suhelda kasutajatega üle ilma</string>
+    <string name="login_server_matrix_org_text">Liitu tasuta miljonite teistega suurimas tasuta Matrix\'i serveris</string>
+    <string name="login_server_modular_text">Tasuline Matrix\'i majutusteenus organisatsioonidele</string>
+    <string name="login_server_modular_learn_more">Lisateave</string>
+    <string name="login_server_other_title">Muud serverid</string>
+    <string name="login_server_other_text">Kohandatud seadistused</string>
+
+    <string name="login_continue">Jätka</string>
+    <string name="login_connect_to">Ühenda koduserveriga %1$s</string>
+    <string name="login_connect_to_modular">Ühenda teenusepakkujaga Element Matrix Services</string>
+    <string name="login_connect_to_a_custom_server">Ühenda kohandatud koduserveriga</string>
+    <string name="login_signin_to">Logi sisse koduserverisse %1$s</string>
+    <string name="login_signup">Registreeru</string>
+    <string name="login_signin">Logi sisse</string>
+    <string name="login_signin_sso">Jätka kasutades SSO\'d ehk ühekordset autentimist</string>
+
+    <string name="login_server_url_form_modular_hint">Element Matrix Services teenuse aadress</string>
+    <string name="login_server_url_form_other_hint">Aadress</string>
+    <string name="login_server_url_form_modular_text">Tasuline Matrix\'i majutusteenus organisatsioonidele</string>
+    <string name="login_server_url_form_modular_notice">Sisesta Modular Element teenuse või muu serveri aadress, mida sa soovid kasutada</string>
+    <string name="login_server_url_form_other_notice">Sisesta serveri või Element\'i aadress, mida sa soovid kasutada</string>
+    <string name="login_server_url_form_common_notice">Sisesta serveri aadress, mida sa soovid kasutada</string>
+
+    <string name="login_sso_error_message">Lehe laadimisel tekkis viga %1$s (%2$d)</string>
+    <string name="login_mode_not_supported">See rakendus ei saa sisse logida antud koduserverisse. See koduserver toetab järgmisi sisselogimise tüüp(e): %1$s.
+\n
+\nKas sa soovid sisse logida kasutades veebibrauseri põhist klienti\?</string>
+    <string name="login_registration_disabled">Vabandust, aga siia serverisse ei saa luua uusi kasutajakontosid.</string>
+    <string name="login_registration_not_supported">See rakendus ei saa antud koduserveris uut kasutajakontot.
+\n
+\nKas sa soovid registreerida kasutades veebibrauseri põhist klienti\?</string>
+
+    <string name="login_login_with_email_error">See e-posti aadress ei ole seotud ühegi kasutajakontoga.</string>
+
+    <string name="login_reset_password_on">Loo uus salasõna koduserveris %1$s</string>
+    <string name="login_reset_password_notice">Kontrollimaks, et just sina sina ise sisestasid uue salasõna, siis saadame sulle kinnituskirja.</string>
+    <string name="login_reset_password_submit">Järgmine</string>
+    <string name="login_reset_password_email_hint">E-posti aadress</string>
+    <string name="login_reset_password_password_hint">Uus salasõna</string>
+
+    <string name="login_reset_password_warning_title">Hoiatus!</string>
+    <string name="login_reset_password_warning_content">Salasõna muutmine tühistab kõik läbiva krüptimise võtmed sinu kõikides sessioonides ning seega muutub kogu sinu vestluste ajalugu loetamatuks. Palun kindlasti kas sea üles võtmete varundamine või ekspordi mõnest muust sessioonist jututubade võtmed enne senise salasõna tühistamist.</string>
+    <string name="login_reset_password_warning_submit">Jätka</string>
+
+    <string name="login_reset_password_error_not_found">See e-posti aadress ei ole seotud ühegi kasutajakontoga</string>
+
+    <string name="login_reset_password_mail_confirmation_title">Vaata oma saabuvate e-kirjade postkasti</string>
+    <string name="login_reset_password_mail_confirmation_notice">Verifitseerimise jaoks saatsime e-kirja aadressile %1$s.</string>
+    <string name="soft_logout_signin_submit">Logi sisse</string>
+    <string name="soft_logout_signin_password_hint">Salasõna</string>
+    <string name="soft_logout_clear_data_title">Kustuta privaatsed andmed</string>
+    <string name="soft_logout_clear_data_notice">Hoiatus: Sinu privaatsed andmed (sealhulgas krüptimisvõtmed) on jätkuvalt salvestatud selles seadmes.
+\n
+\nEemalda nad, kui oled lõpetanud selle seadme kasutamise või soovid sisse logida muu kasutajakontoga.</string>
+    <string name="soft_logout_clear_data_submit">Eemalda kõik andmed</string>
+
+    <string name="soft_logout_clear_data_dialog_title">Eemalda andmed</string>
+    <string name="soft_logout_clear_data_dialog_content">Kas sa oled kindel, et soovid kustutada kõik andmed, mis on hetkel siin seadmes salvestatud\?
+\nOma sõnumite ja kontoandmete nägemiseks logi uuesti sisse.</string>
+    <string name="login_error_ssl_peer_unverified">SSL\'i viga: teise osapoole identiteeti ei õnnestu kontrollida.</string>
+    <string name="settings_call_show_confirmation_dialog_title">Väldi juhuslikke kõnesid</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Enne kõne algatamist küsi kinnitust</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Kasuta %s kõnehõlbustusserverina siis, kui sinu koduserveris ei ole see funktsionaalsus seadistatud (kõne ajal jagatakse temaga nii sinu avalikku, kui privaatvõrgu IP-aadressi)</string>
+    <string name="call_error_ice_failed">Meedia ühendamine ei õnnestunud</string>
+    <string name="list_members">Osalejate loend</string>
+    <string name="open_chat_header">Ava päis</string>
+    <string name="invite_no_identity_server_error">Selle tegevuse jaoks palun lisa seadistustes isikutuvastusserver.</string>
+    <string name="room_creation_title">Uus vestlus</string>
+    <string name="room_creation_add_member">Lisa osaleja</string>
+    <plurals name="room_header_active_members_count">
+        <item quantity="one">1 aktiivne osaleja</item>
+        <item quantity="other">%d aktiivset osalejat</item>
+    </plurals>
+    <plurals name="room_title_members">
+        <item quantity="one">1 osaleja</item>
+        <item quantity="other">%d osalejat</item>
+    </plurals>
+    <string name="room_title_one_member">1 osaleja</string>
+
+    <plurals name="format_time_s">
+        <item quantity="one">1 sekund</item>
+        <item quantity="other">%d sekundit</item>
+    </plurals>
+    <plurals name="format_time_m">
+        <item quantity="one">1 minut</item>
+        <item quantity="other">%d minutit</item>
+    </plurals>
+    <plurals name="format_time_h">
+        <item quantity="one">1 tund</item>
+        <item quantity="other">%d tundi</item>
+    </plurals>
+    <plurals name="format_time_d">
+        <item quantity="one">1 päev</item>
+        <item quantity="other">%d päeva</item>
+    </plurals>
+
+    <string name="room_participants_leave_prompt_title">Lahku jututoast</string>
+    <string name="room_participants_leave_prompt_msg">Kas oled kindel, et soovid lahkuda jututoast\?</string>
+    <string name="room_participants_remove_prompt_msg">Kas sa oled kindel, et soovid eemaldada %s sellest vestlusest\?</string>
+    <string name="room_participants_create">Loo</string>
+
+    <string name="room_participants_online">Võrgus</string>
+    <string name="room_participants_offline">Võrgust väljas</string>
+    <string name="room_participants_idle">Jõude</string>
+    <string name="room_participants_now">Nüüd %1$s</string>
+    <string name="room_participants_ago">Oli %1$s %2$s tagasi</string>
+
+    <string name="room_participants_header_admin_tools">HALDUSTARVIKUD</string>
+    <string name="room_participants_header_call">KÕNED</string>
+    <string name="room_participants_header_devices">SESSIOONID</string>
+
+    <string name="room_participants_action_invite">Kutsu</string>
+    <string name="room_participants_action_cancel_invite">Tühista kutse</string>
+    <string name="room_participants_action_leave">Lahku sellest jututoast</string>
+    <string name="room_participants_action_remove">Eemalda sellest jututoast</string>
+    <string name="room_participants_action_ban">Keela ligipääs</string>
+    <string name="room_participants_action_unban">Taasta ligipääs</string>
+    <string name="room_participants_action_kick">Müksa välja</string>
+    <string name="room_participants_action_set_default_power_level">Muuda tavakasutajaks</string>
+    <string name="room_participants_action_set_moderator">Määra moderaatoriks</string>
+    <string name="room_participants_action_set_admin">Määra peakasutajaks</string>
+    <string name="room_participants_invite_search_another_user">Kasutajatunnus, nimi või e-posti aadress</string>
+    <string name="room_participants_action_mention">Maini</string>
+    <string name="room_participants_action_devices_list">Näita sessioonide loendit</string>
+    <string name="recovery_key_export_saved_as_warning">Taastevõti on salvestatud kausta \'%s\'.
+\n
+\nHoiatus: rakenduse eemaldamisel ka see fail ilmselt kustutatakse.</string>
+    <string name="recovery_key_export_saved">Taastevõti on salvestatud.</string>
+
+    <string name="keys_backup_setup_override_backup_prompt_tile">Varukoopia on juba olemas sinu koduserveris</string>
+    <string name="keys_backup_setup_override_replace">Asenda</string>
+    <string name="keys_backup_setup_override_stop">Peata</string>
+
+    <string name="keys_backup_setup_step3_please_make_copy">Palun tee koopia</string>
+    <string name="settings_discovery_mail_pending">Ootel</string>
+
+    <string name="settings_discovery_enter_identity_server">Sisesta uue isikutuvastusserveri aadress</string>
+    <string name="settings_discovery_bad_identity_server">Ei saanud ühendust isikutuvastusserveriga</string>
+    <string name="settings_discovery_please_enter_server">Palun sisesta isikutuvastusserveri aadress</string>
+    <string name="settings_discovery_no_terms_title">Isikutuvastusserveril puuduvad kasutustingimused</string>
+    <string name="settings_discovery_no_terms">Sinu valitud isikutuvastusserveril pole kasutustingimusi. Jätka vaid siis, kui sa usaldad serveri omanikku ja haldajat</string>
+    <string name="settings_text_message_sent">Saatsime tekstisõnumi numbrile %s. Palun sisesta seal kuvatud kontrollkood.</string>
+    <string name="settings_text_message_sent_wrong_code">Kontrollkood ei ole õige.</string>
+
+    <string name="room_list_sharing_header_other_rooms">Muud jututoad</string>
+
+    <string name="command_description_rainbow">Saadab selle sõnumi vikerkaarevärvilisena</string>
+    <string name="command_description_rainbow_emote">Saadab antud emote vikerkaarevärvides</string>
+
+    <string name="settings_category_timeline">Ajajoon</string>
+
+    <string name="settings_category_composer">Sõnumite kirjutamine</string>
+
+    <string name="room_settings_enable_encryption">Võta läbiv krüptimine kasutusele</string>
+    <string name="room_settings_enable_encryption_warning">"Kui krüptimine on  juba kasutusele võetud, siis ei saa seda enam eemaldada."</string>
+
+    <string name="room_settings_enable_encryption_dialog_title">Kas võtame krüptimise kasutusele\?</string>
+    <string name="room_settings_enable_encryption_dialog_content">Kui kord juba kasutusele võetud, siis krüptimist enam hiljem ära lõpetada ei saa. Krüptitud sõnumeid ei saa lugeda ei vaheapealses veebiliikluses ega serveris ja vaid jututoa liikmed saavad neid lugeda. Krüptimise kasutusele võtmine võib takistada nii robotite kui sõnumisildade tööd.</string>
+    <string name="room_settings_enable_encryption_dialog_submit">Võta jututoas krüptimine kasutusele</string>
+
+    <string name="verification_request_notice">Lisaturvalisus mõttes verifitseeri %s võrreldes selleks üheks korraks loodud koodi mõlemas seadmes.</string>
+    <string name="settings_active_sessions_unverified_device_desc">Verifitseeri see sessioon selleks, et teda võiks lugeda usaldusväärseks ja saaks ligipääsu krüptitud sõnumitele. Kui sina pole sellesse sessiooni sisse loginud, siis sinu kasutajakonto võib olla sattunud võõraste kontrolli alla:</string>
+
+    <plurals name="settings_active_sessions_count">
+        <item quantity="one">%d aktiivne sessioon</item>
+        <item quantity="other">%d aktiivset sessiooni</item>
+    </plurals>
+
+    <string name="crosssigning_verify_this_session">Verifitseeri see sisselogimissessioon</string>
+    <string name="crosssigning_other_user_not_trust">Teised kasutajad ei pruugi seda usaldada</string>
+    <string name="complete_security">Vormista turvaseadistused lõpuni</string>
+
+    <string name="verification_open_other_to_verify">Kasuta olemasolevat sessiooni selle sessiooni verifitseerimiseks, andes sellega ligipääsu krüptitud sõnumitele.</string>
+
+
+    <string name="verification_profile_verify">Verifitseeri</string>
+    <string name="verification_profile_verified">Verifitseeritud</string>
+    <string name="verification_profile_warning">Hoiatus</string>
+
+    <string name="room_member_profile_failed_to_get_devices">Sessionide loendi laadimine ei õnnestunud</string>
+    <string name="room_member_profile_sessions_section_title">Sessioonid</string>
+    <string name="trusted">Usaldusväärne</string>
+    <string name="not_trusted">Ei ole usaldusväärne</string>
+
+    <string name="verification_profile_device_verified_because">Kuna %1$s (%2$s) on selle sessiooni verifitseerinud, siis see sessioon on krüptitud sõnumite saatmiseks usaldusväärne:</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) logis sisse uues sessioonis:</string>
+    <string name="room_participants_power_level_prompt">Sa ei saa seda muudatust hiljem tagasi pöörata, sest annad teisele kasutajale samad õigused, mis sinul on.
+\nKas sa oled ikka kindel\?</string>
+
+    <string name="room_participants_power_level_demote_warning_title">Kas vähendad enda õigusi\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Kuna sa vähendad enda õigusi, siis sul ei pruugi enam olla võimalik seda muutust tagasi pöörata. Kui sa juhtumisi oled viimane haldusõigustega kasutaja jututoas, siis hiljem on võimatu samu õigusi tagasi saada.</string>
+    <string name="room_participants_power_level_demote">Vähenda enda õigusi</string>
+
+
+    <string name="room_participants_action_ignore_title">Eira kasutajat</string>
+    <string name="room_participants_action_ignore_prompt_msg">Selle kasutaja eiramine eemaldab teie jagatud jututoast tema sõnumid.
+\n
+\nÜldistest seadistustest saad seda alati muuta.</string>
+    <string name="room_participants_action_ignore">Eira selle kasutaja sõnumeid</string>
+
+    <string name="room_participants_action_unignore_title">Lõpeta selle kasutaja eiramine</string>
+    <string name="room_participants_action_unignore_prompt_msg">Selle kasutaja eiramise lõpetamine teeb tema sõnumid uuesti nähtavaks.</string>
+    <string name="room_participants_action_unignore">Lõpeta eiramine</string>
+
+    <string name="room_participants_action_cancel_invite_title">Tühista kutse</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Kas oled kindel et sa soovid tühistada kutse sellele kasutajale\?</string>
+    <string name="room_participants_kick_title">Müksa kasutaja välja</string>
+    <string name="room_participants_kick_reason">Jututoast väljamüksamise põhjus</string>
+    <string name="room_participants_kick_prompt_msg">jututoast välja müksamine eemaldab ta praeguseks jututoast.
+\n
+\nKui soovid, et ta ei saaks uuesti liituda, siis peaksid seadma suhtluskeelu.</string>
+    <string name="room_participants_ban_title">Määra kasutajale suhtluskeeld</string>
+    <string name="room_participants_ban_reason">Suhtluskeelu põhjus</string>
+    <string name="room_participants_unban_title">Taasta selle kasutaja ligipääs</string>
+    <string name="room_participants_ban_prompt_msg">Sellele kasutajale suhtluskeelu seadmine tõstab ta jututoast välja ning ei võimalda uuesti liitumist.</string>
+    <string name="room_participants_unban_prompt_msg">Suhtluskeelu eemaldamine võimaldab jututoaga uuesti liituda.</string>
+
+    <string name="reason_hint">Põhjus</string>
+
+    <string name="room_participants_invite_prompt_msg">Kas sa oled kindel, et soovid kutsuda %s vestlusele\?</string>
+    <string name="room_participants_invite_join_names">"%1$s, "</string>
+    <string name="room_participants_invite_join_names_and">%1$s ja %2$s</string>
+    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
+
+    <string name="people_search_invite_by_id"><u>Kutsu tunnuse alusel</u></string>
+    <string name="people_search_local_contacts">KONTAKTID SIIN SEADMES (%d)</string>
+    <string name="people_search_user_directory">KASUTAJATE LOEND (%s)</string>
+    <string name="people_search_filter_text">Vaid Matrix\'i kasutajad</string>
+
+    <string name="people_search_invite_by_id_dialog_title">Kutsu kasutajat tunnuse alusel</string>
+    <string name="people_search_invite_by_id_dialog_description">Palun sisesta üks või enam e-posti aadressi või Matrix\'i kasutajatunnust</string>
+    <string name="people_search_invite_by_id_dialog_hint">E-posti aadress või Matrix\'i kasutajatunnus</string>
+
+    <string name="room_menu_search">Otsi</string>
+    <string name="room_one_user_is_typing">%s kirjutab…</string>
+    <string name="room_two_users_are_typing">%1$s &amp; %2$s kirjutavad…</string>
+    <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; teised kirjutavad…</string>
+    <string name="room_message_placeholder_encrypted">Saada krüptitud sõnum…</string>
+    <string name="room_message_placeholder_not_encrypted">Saada krüptimata sõnum…</string>
+    <string name="room_message_placeholder_reply_to_encrypted">Saada krüptitud vastus…</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">Saada krüptimata vastus…</string>
+    <string name="room_offline_notification">Ühendus sinu serveriga on katkenud.</string>
+    <string name="room_unsent_messages_notification">Sõnumid pole saadetud. %1$s või %2$s nüüd\?</string>
+    <string name="room_unknown_devices_messages_notification">Kuna leidub tundmatuid sessioone, siis sõnumid pole saadetud. %1$s või %2$s nüüd\?</string>
+    <string name="room_prompt_resend">Saada kõik uuesti</string>
+    <string name="room_prompt_cancel">Tühista kõik</string>
+    <string name="room_resend_unsent_messages">Saada saatmata sõnumid uuesti</string>
+    <string name="room_delete_unsent_messages">Kustuta saatmata sõnumid</string>
+    <string name="room_message_file_not_found">Faili ei leidunud</string>
+    <string name="room_do_not_have_permission_to_post">Sul ei ole õigusi siia jututuppa kirjutamiseks</string>
+    <plurals name="room_new_messages_notification">
+        <item quantity="one">1 uus sõnum</item>
+        <item quantity="other">%d uut sõnumit</item>
+    </plurals>
+
+    <string name="ssl_trust">Usalda</string>
+    <string name="ssl_do_not_trust">Ära usalda</string>
+    <string name="ssl_logout_account">Logi välja</string>
+    <string name="ssl_remain_offline">Eira</string>
+    <string name="ssl_fingerprint_hash">Sõrmejälg (%s):</string>
+    <string name="ssl_could_not_verify">Serveri õigsust ei olnud võimalik kontrollida.</string>
+    <string name="room_recents_directory">LOEND</string>
+    <string name="settings_notification_troubleshoot">Lahenda teavitustega seotud vigu</string>
+    <string name="settings_troubleshoot_diagnostic">Vigade tuvastamine</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">Käivita testid</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">Parasjagu testime… (%1$d / %2$d)</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">Esmasel vaatlusel vigu ei leidu. Kui sa jätkuvalt ei saa teavitusi, siis palun saada edaspidise uurimise jaoks meile veateade.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Üks või enam testi andis tulemuseks vea, palun proovi pakutud lahendusi.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Üks või enam testi andis tulemuseks vea, palun saada edaspidise uurimise jaoks meile veateade.</string>
+
+    <string name="settings_troubleshoot_test_system_settings_success">Süsteemi seadistustes on teavitused kasutusel.</string>
+    <string name="settings_troubleshoot_test_system_settings_failed">Süsteemi seadistustes ei ole teavitusi kasutusel.
+\nPalun vaata need üle.</string>
+    <string name="open_settings">Ava seadistused</string>
+
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Pane tähele, et mõned teavitused on seadistatud vaiksetena (teavitus kuvatakse ilma helilise märguandeta).</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">Mõned teavitused on sinu kohandatud seadistustes kinni keeratud.</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Kohandatud reeglite laadimine ei õnnestunud. Palun proovi uuesti.</string>
+    <string name="settings_troubleshoot_test_bing_settings_quickfix">Palun kontrolli seadistusi</string>
+
+    <string name="settings_troubleshoot_test_play_services_title">Goolge Play teenuste kontrollimine</string>
+    <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK on kättesaadav ja uuendatud.</string>
+    <string name="settings_troubleshoot_test_play_services_failed">Element kasutab Google Play teenuseid tõuketeavituste edastamiseks, kui see ei tundu olema korrektselt seadistatud:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_play_services_quickfix">Paranda Google Play teenused</string>
+
+    <string name="settings_troubleshoot_test_fcm_title">Firebase tunnusluba</string>
+    <string name="settings_troubleshoot_test_fcm_success">FCM tunnusloa laadimine õnnestus:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_failed">FCM tunnusloa laadimine ei õnnestunud:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nSee viga on väljaspool Element\'i kontrolli ning vastavalt Google infole liiga palju rakendusi kasutavad FCM\'i. Selline olukord peaks tekkima vaid siis kui kasutusel on hiidpalju selliseid rakendusi ning ei peaks mõjutama tavakasutajaid.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nSee viga on väljaspool Element\'i kontrolli ning võib juhtuda eri põhjustel. Võib-olla hilisemal proovimisel seda viga enam ei teki, kuid igaks juhuks vaata, et Google Play teenustele ei oleks süsteemi seadetes määratud andmesidepiirangut ning seadme kell on õige. Samuti võib see viga tekkida, kui sa pruugid kohandatud Androidi varianti (custom ROM).</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nSee viga on väljaspool Element\'i kontrolli. Telefoni ei ole seadistatud Google\'i kontot. Palun ava seadistustes kontohaldur ning lisa üks Google\'i konto.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Lisa Google\'i konto</string>
+
+    <string name="settings_troubleshoot_test_token_registration_title">Tunnusloa registreerimine</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCM tunnusloa registreerimine koduserveris õnnestus.</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">FCM tunnusloa registreerimine koduserveris ei õnnestunud:
+\n%1$s</string>
+
+    <string name="settings_troubleshoot_test_foreground_service_started_title">Teavituste teenus</string>
+    <string name="settings_troubleshoot_test_foreground_service_startedt_success">Teavituste teenus töötab.</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_failed">Teavituste teenus ei tööta.
+\nProovi, kas Element\'i uuesti käivitamine aitab.</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Käivita teenus</string>
+
+    <string name="settings_troubleshoot_test_service_restart_title">Teavituste teenuse automaatne taaskäivitamine</string>
+    <string name="settings_troubleshoot_test_service_restart_success">Teenus suleti ja käivitati automaatselt uuesti.</string>
+    <string name="settings_troubleshoot_test_service_restart_failed">Teenuse uuesti käivitamine ei õnnestunud</string>
+
+    <string name="settings_troubleshoot_test_service_boot_title">Käivita teenus seadme käivitamisel</string>
+    <string name="settings_troubleshoot_test_service_boot_success">Teenus käivitatakse nutiseadme käivitamisel.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Seda teenust ei käivitatata nutiseadme käivitamisel. Sa ei saa teavitusi enne, kui Element on vähemalt korra avatud.</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">Käivita teenus nutiseadme käivitamisel</string>
+
+    <string name="settings_troubleshoot_test_bg_restricted_title">Kontrolli taustapiiranguid</string>
+    <plurals name="notification_unread_notified_messages_in_room_rooms">
+        <item quantity="one">1 jututuba</item>
+        <item quantity="other">%d jututuba</item>
+    </plurals>
+
+    <plurals name="notification_compat_summary_line_for_room">
+        <item quantity="one">%1$s: 1 sõnum</item>
+        <item quantity="other">%1$s: %2$d sõnumit</item>
+    </plurals>
+    <plurals name="notification_compat_summary_title">
+        <item quantity="one">%d teavitus</item>
+        <item quantity="other">%d teavitust</item>
+    </plurals>
+
+    <string name="notification_unread_notified_messages_in_room">%1$s -&gt; %2$s</string>
+    <string name="notification_unknown_new_event">Uus sündmus</string>
+    <string name="notification_unknown_room_name">Jututuba</string>
+    <string name="notification_new_messages">Uued sõnumid</string>
+    <string name="notification_new_invitation">Uus kutse</string>
+    <string name="notification_sender_me">Mina</string>
+    <string name="notification_inline_reply_failed">** Saatmine ei õnenstunud - palun ava jututoa vaade</string>
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+
+    <string name="historical_placeholder">Otsi ajaloost</string>
+
+    <string name="error_jitsi_not_supported_on_old_device">Vabandust, aga rühmakõned Jitsi vahendusel ei ole vanades seadmetes toetatud (Androidi versioon alla 5.0)</string>
+    <string name="room_widget_resource_permission_title">See vidin soovib kasutada järgmisi andmeid:</string>
+    <string name="room_widget_resource_grant_permission">Luba</string>
+    <string name="room_widget_resource_decline_permission">Ära luba mitte midagi</string>
+    <string name="room_widget_webview_access_camera">Luba kaamera kasutamine</string>
+    <string name="room_widget_webview_access_microphone">Luba mikrofoni kasutamine</string>
+    <string name="room_widget_webview_read_protected_media">Luba DRM\'iga kaitstud meedia avamine</string>
+
+    <string name="widget_integration_unable_to_create">Vidina loomine ei õnnestunud.</string>
+    <string name="widget_integration_failed_to_send_request">Päringu saatmine ei õnnestunud.</string>
+    <string name="widget_integration_positive_power_level">Õiguste tase peab olema positiivne täisarv.</string>
+    <string name="widget_integration_must_be_in_room">Sa ei asu selles jututoas.</string>
+    <string name="widget_integration_no_permission_in_room">Sinul pole selle toimingu jaoks selles jututoas õigusi.</string>
+    <string name="widget_integration_missing_room_id">Päringus puudub jututoa tunnus ehk room_id.</string>
+    <string name="widget_integration_missing_user_id">Päringus puudub kasutaja tunnus ehk user_id.</string>
+    <string name="widget_integration_room_not_visible">Jututuba %s ei ole nähtav.</string>
+    <string name="widget_integration_missing_parameter">Nõutav parameeter on puudu.</string>
+    <string name="widget_integration_invalid_parameter">Parameeter ei ole sobilik.</string>
+    <string name="integration_manager_not_configured">Lõiminguhaldur on seadistamata.</string>
+    <string name="room_add_matrix_apps">Lisa Matrix\'i rakendusi</string>
+    <string name="settings_labs_native_camera">Luba süsteemi poolt hallatud kaamera kasutamine</string>
+    <string name="settings_labs_native_camera_summary">Käivita kohandatud vaate asemel süsteemne kaamera vaade.</string>
+    <string name="settings_labs_keyboard_options_to_send_message">Kasuta reavahetuse klahvi sõnumi saatmiseks</string>
+    <string name="settings_labs_enable_send_voice">Saada häälsõnumeid</string>
+    <string name="permissions_rationale_msg_contacts">Element saab kontrollida teie aadressiraamatut, et leida teisi Matrixi kasutajaid nende e-posti aadressi ja telefoninumbrite põhjal. Kui sa nõustud oma aadressiraamatut sel eesmärgil jagama, luba juurdepääs järgmisel hüpikaknal.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element saab kontrollida teie aadressiraamatut, et leida teisi Matrixi kasutajaid nende e-posti aadresside ja telefoninumbrite põhjal.
+\n
+\nKas sa oled nõus oma aadressiraamatut sel eesmärgil jagama\?</string>
+
+    <string name="room_event_action_report_prompt_ignore_user">Kas sa soovid peita selle kasutaja kõik sõnumid\?
+\n
+\nPane tähele, et antud toiming taaskäivitab rakenduse ja see võib võtta veidi aega.</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">Taustapiirangud on Elemendi jaoks keelatud. Seda testi tuleks läbi viia mobiilse andmeside abil (WIFI puudub).
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Elemendi jaoks on taustpiirangud lubatud.
+\nTöö, mida rakendus proovib teha, on agressiivselt piiratud, kui see on taustal ja see võib mõjutada teavituste kättesaamist.
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">Keela piirangud</string>
+
+    <string name="settings_troubleshoot_test_battery_title">Aku optimeerimine</string>
+    <string name="settings_troubleshoot_test_battery_success">Aku optimeerimine ei mõjuta Elementi.</string>
+    <string name="settings_troubleshoot_test_battery_failed">Kui kasutaja jätab seadme mõneks ajaks vooluvõrgust välja ja ühele kohale paigale ning ekraan on välja lülitatud, lülitub seade Doze režiimi. See takistab rakendustel juurdepääsu võrgule ja lükkab edasi nende töö, sünkroonimise ja tavalised teated.</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">Eira optimeerimist</string>
+
+    <string name="settings_notification_privacy_normal">Tavaline</string>
+    <string name="settings_notification_privacy_reduced">Vähendatud privaatsus</string>
+    <string name="settings_notification_privacy_need_permission">See rakendus vajab taustal toimimiseks õigusi</string>
+    <string name="settings_notification_privacy_no_background_sync">See rakendus <b>ei pea</b> taustal võtma ühendust koduserveriga ning see võiks parandada aku kestust</string>
+    <string name="settings_notification_privacy_fcm">• teavitusi saadetakse Firebase Cloud Messaging teenuse vahendusel</string>
+    <string name="settings_notification_privacy_metadata">• teavitustes leidub vaid metainfo</string>
+    <string name="settings_notification_privacy_secure_message_content">• teavitusega märgitud sõnumi sisu <b>laetakse turvaliselt ja otse sinu Matrix\'i koduserverist</b></string>
+    <string name="settings_notification_privacy_nosecure_message_content">• teavitused sisaldavad nii <b>metainfot kui sõnumi sisu</b></string>
+    <string name="settings_notification_privacy_message_content_not_shown">• teavitused <b>ei näita sõnumi sisu</b></string>
+
+    <string name="settings_notification_ringtone">Teavituste heli</string>
+    <string name="settings_enable_all_notif">Võta teavitused sellel kontol kasutusele</string>
+    <string name="settings_enable_this_device">Võta teavitused selles sessioonis kasutusele</string>
+    <string name="settings_turn_screen_on">Lülita ekraan sisse kolmeks sekundiks</string>
+    <string name="settings_noisy_notifications_preferences">Seadista lärmakad teavitused</string>
+    <string name="settings_call_notifications_preferences">Seadista kõneteavitused</string>
+    <string name="settings_silent_notifications_preferences">Seadista vaiksed teavitused</string>
+    <string name="settings_system_preferences_summary">Vali LED-tule värv, värin ning heli…</string>
+
+
+    <string name="settings_containing_my_display_name">Sõnumid, mis sisaldavad minu kuvatavat nime</string>
+    <string name="settings_containing_my_user_name">Sõnumid, mis sisaldavad minu kasutajatunnust</string>
+    <string name="settings_messages_in_one_to_one">Kahepoolsete vestluste sõnumid</string>
+    <string name="settings_messages_in_group_chat">Rühmavestluste sõnumid</string>
+    <string name="settings_invited_to_room">Kui mind kutsutakse jututuppa</string>
+    <string name="settings_call_invitations">Saabuvad kõned</string>
+    <string name="settings_messages_sent_by_bot">Robotite saadetud sõnumid</string>
+
+    <string name="settings_background_sync">Andmete sünkroniseerimine taustal</string>
+    <string name="settings_background_fdroid_sync_mode">Andmete taustal sünkroniseerimise režiim (katseline)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimeeritud akukestust silmas pidades</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element sünkroniseerib taustal nii, et see arvestab seadme piiratud ressursse (aku).
+\nSõltuvalt seadme olekust võib operatsioonisüsteem sünkroniseerimist edasi lükata.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Optimeeritud reaalajas</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element sünkroniseerib sõnumeid taustal etteantud aja järel (aeg on seadistatav).
+\nSee mõjutab seadme saatjat/vastuvõtjat ja akukasutust ning kuvatakse püsiteade, et Element kuulab sündmusi.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Taustasünkroonimine puudub</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Kui rakendus töötab taustal, siis sa ei saa saabunud sõnumite kohta teavitusi.</string>
+    <string name="settings_background_sync_update_error">Seadistuste uuendamine ei õnnestunud.</string>
+
+
+    <string name="settings_start_on_boot">Käivita teenus seadme käivitamisel</string>
+    <string name="settings_enable_background_sync">Kasuta taustasünkroonimist</string>
+    <string name="settings_set_sync_timeout">Sünkroniseerimispäring aegus</string>
+    <string name="settings_set_workmanager_delay">Eelistatud sünkroniseerimisvälp</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nSünkroniseerimine võib jääda vahele, kui aku täituvus on madal või seade energiasäästurežiimil.</string>
+    <string name="settings_set_sync_delay">Viivitus sünkroonimiste vahel</string>
+    <string name="settings_second">sekund</string>
+    <string name="settings_seconds">sekundit</string>
+
+    <string name="settings_version">Versioon</string>
+    <string name="settings_olm_version">olm-teegi versioon</string>
+    <string name="settings_app_term_conditions">Kasutustingimused</string>
+    <string name="settings_third_party_notices">Kolmandate osapoolte litsentsid</string>
+    <string name="settings_copyright">Autoriõigused</string>
+    <string name="settings_privacy_policy">Privaatsuspoliitika</string>
+    <string name="settings_keep_media">Säilita meedia</string>
+    <string name="settings_clear_cache">Tühjenda puhver</string>
+    <string name="settings_clear_media_cache">Tühjenda meedia puhver</string>
+
+    <string name="settings_user_settings">Kasutaja seadistused</string>
+    <string name="settings_notifications">Teavitused</string>
+    <string name="settings_ignored_users">Eiratud kasutajad</string>
+    <string name="settings_other">Muud seadistused</string>
+    <string name="settings_advanced">Lisaseadistused</string>
+    <string name="settings_integrations">Lõiminguid</string>
+    <string name="settings_integrations_summary">Kasuta lõiminguhadurit robotite, võrgusildade, vidinate ja kleepsupakkide seadistamiseks.
+\nLõiminguhalduritel on laiad volitused - nad võivad sinu nimel lugeda seadistusi, kohandada vidinaid, saata jututubade kutseid ning määrata õigusi.</string>
+    <string name="settings_cryptography">Krüptimine</string>
+    <string name="settings_cryptography_manage_keys">Krüptovõtmete haldus</string>
+    <string name="settings_notifications_targets">Teavituste eesmärgid</string>
+    <string name="settings_contact">Kohalikud kasutajad</string>
+    <string name="settings_contacts_app_permission">Õigused telefoniraamatu lugemiseks</string>
+    <string name="settings_contacts_phonebook_country">Telefoniraamatu riik</string>
+    <string name="settings_home_display">Avaleht</string>
+    <string name="settings_pin_missed_notifications">Klammerda jututoad, kus leidub lugemata teavitusi</string>
+    <string name="settings_pin_unread_messages">Klammerda jututoad, kus leidub lugemata sõnumeid</string>
+    <string name="settings_devices_list">Sessioonid</string>
+    <string name="settings_inline_url_preview">URL\'ide lõimitud eelvaade</string>
+    <string name="settings_inline_url_preview_summary">Kui koduserver sellist funktsionaalsust toetab, siis kuva vestluses linkide eelvaade.</string>
+    <string name="settings_send_typing_notifs">Anna märku teisele osapoolele, kui mina sõnumit kirjutan</string>
+    <string name="settings_send_typing_notifs_summary">Anna märku teisele osapoolele, kui olen parasjagu sõnumit kirjutamas.</string>
+    <string name="settings_send_markdown">Markdown-vorming</string>
+    <string name="settings_send_markdown_summary">Enne sõnumite saatmist vorminda neid markdown-süntaksi abil. See võimaldab teksti mitmekülgselt kujundada, näiteks tekst tärnide vahel teeb kaldkirja.</string>
+    <string name="settings_always_show_timestamps">Näita kõikide sõnumite ajatempleid</string>
+    <string name="settings_show_read_receipts_summary">Lugemisteatisele klõpsimine kuvab detailsema loendi.</string>
+    <string name="settings_show_join_leave_messages">Näita jututubadega liitumised ja neist lahkumised</string>
+    <string name="settings_show_join_leave_messages_summary">Siia alla ei kuulu kutsed, müksamised ja suhtluskeelud.</string>
+    <string name="settings_show_avatar_display_name_changes_messages">Näita kontoga seotud sündmusi</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">Sealhulgas tunnuspildi ja kuvatava nime muutusi.</string>
+    <string name="settings_vibrate_on_mention">Kasutaja mainimisel anna väringa märku</string>
+    <string name="settings_preview_media_before_sending">Enne meedia saatmist näita eelvaadet</string>
+    <string name="settings_send_message_with_enter">Saada sõnum reavahetusklahvi vajutamisel</string>
+    <string name="settings_send_message_with_enter_summary">Tarkvaralise klaviatuuri reavahetusklahvi vajutus saadab sõnumi ning ei tee reavahetust</string>
+
+    <string name="settings_secure_backup_section_title">Turvaline varundus</string>
+    <string name="settings_secure_backup_manage">Halda</string>
+    <string name="settings_secure_backup_setup">Võta kasutusele turvaline varundus</string>
+    <string name="settings_secure_backup_reset">Lähtesta turvaline varundus</string>
+    <string name="settings_secure_backup_enter_to_setup">Seadista siin seadmes</string>
+    <string name="settings_secure_backup_section_info">Tagamaks, et sa ei kaota ligipääsu krüptitud sõnumitele ja andmetele, varunda krüptimisvõtmed oma serveris.</string>
+    <string name="reset_secure_backup_title">Loo uus turvavõti või seadista olemaoleva varukoopia jaoks uus turvafraas.</string>
+    <string name="reset_secure_backup_warning">Sellega asendad olemasoleva turvavõtme või turvafraasi.</string>
+
+    <string name="settings_deactivate_account_section">Deaktiveeri kasutajakonto</string>
+    <string name="settings_deactivate_my_account">Eemalda minu konto kasutusest</string>
+    <string name="settings_discovery_category">Leia kasutajaid</string>
+    <string name="settings_discovery_manage">Halda kasutajate otsingu seadistusi.</string>
+    <string name="startup_notification_privacy_title">Teavituste privaatsus</string>
+    <string name="startup_notification_privacy_message">Element võib taustal töötamise ajal hallata sinu teavitusi turvaliselt ja privaatselt. Aga see võib mõjutada akukasutust.</string>
+    <string name="startup_notification_privacy_button_grant">Anna õigused</string>
+    <string name="startup_notification_privacy_button_other">Tee muu valik</string>
+
+    <string name="startup_notification_fdroid_battery_optim_title">Taustaühendus</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Selleks et teavitused toimiksid korralikult peab Element kasutama vähese kõrvalmõjuga taustaühendust.
+\nKui järgmisel lehel sinult küsitakse kas lubada, et Element töötab kogu aeg taustal, siis palun nõustu.</string>
+    <string name="startup_notification_fdroid_battery_optim_button_grant">Anna õigused</string>
+
+    <string name="settings_analytics">Analüütika</string>
+    <string name="settings_opt_in_of_analytics">Saada arendajatele analüütikat</string>
+    <string name="settings_opt_in_of_analytics_summary">Võimaldamaks meil rakendust parandada kogub Element anonüümset teavet rakenduse kasutuse kohta.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Selleks, et saaksime Element\'i paremaks teha, palun luba analüütika.</string>
+    <string name="settings_opt_in_of_analytics_ok">Jah, ma soovin aidata!</string>
+
+    <string name="settings_data_save_mode">Võrguliikluse mahu säästmise režiim</string>
+    <string name="settings_data_save_mode_summary">Võrguliikluse andmemahu säästmiseks kasutatakse filtrit, mille puhul kasutajate olekuid ei uuendata ja sõnumite kirjutamise teavitusi ei laeta.</string>
+
+    <string name="devices_details_dialog_title">Sessiooniteave</string>
+    <string name="devices_details_id_title">Seadme tunnus</string>
+    <string name="devices_details_name_title">Avalik nimi</string>
+    <string name="devices_details_device_name">Uuenda avalikku nime</string>
+    <string name="devices_details_last_seen_title">Viimati nähtud</string>
+    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
+    <string name="devices_delete_dialog_text">See tegevus vajab täiendavat autentimist.
+\nJätkamaks palun sisesta oma salasõna.</string>
+    <string name="devices_delete_dialog_title">Autentimine</string>
+    <string name="devices_delete_pswd">Salasõna:</string>
+    <string name="devices_delete_submit_button_label">Saada</string>
+
+    <string name="settings_logged_in">Sisselogitud kui</string>
+    <string name="settings_home_server">Koduserver</string>
+    <string name="settings_identity_server">Isikutuvastusserver</string>
+    <string name="settings_integration_allow">Luba lõimingud</string>
+    <string name="settings_integration_manager">Lõiminguhaldur</string>
+
+    <string name="disabled_integration_dialog_title">Lõimingud ei ole kasutusel</string>
+    <string name="disabled_integration_dialog_content">Selle tegevuse kasutuselevõetuks lülita seadetes sisse „Luba lõiminguid“ valik.</string>
+
+    <string name="settings_user_interface">Kasutajaliides</string>
+    <string name="settings_interface_language">Keel</string>
+    <string name="settings_select_language">Vali keel</string>
+
+    <string name="account_email_validation_title">Verifikatsioon on ootel</string>
+    <string name="account_email_validation_message">Palun vaata oma e-kirju ning klõpsi meie saadetud kirjas leiduvat linki. Kui see on tehtud, siis vajuta Jätka-nuppu.</string>
+    <string name="account_email_validation_error">E-posti aadressi õigsust pole veel õnnestunud kontrollida. Palun vaata oma e-kirju ning klõpsi meie saadetud kirjas leiduvat linki. Kui see on tehtud, siis vajuta Jätka-nuppu.</string>
+    <string name="account_email_already_used_error">See e-posti aadress on juba kasutusel.</string>
+    <string name="account_email_not_found_error">Seda e-posti aadressi ei leidunud.</string>
+    <string name="account_phone_number_already_used_error">See telefoninumber on juba kasutusel.</string>
+    <string name="account_email_error">Sinu e-posti aadressi kontrollimisel tekkis viga.</string>
+
+    <string name="settings_password">Salasõna</string>
+    <string name="settings_change_password">Muuda salasõna</string>
+    <string name="settings_old_password">Praegune salasõna</string>
+    <string name="settings_new_password">Uus salasõna</string>
+    <string name="settings_confirm_password">Kinnitage oma uus salasõna</string>
+    <string name="settings_change_password_submit">Uuenda salasõna</string>
+    <string name="settings_fail_to_update_password">Salasõna uuendamine ei õnnestunud</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">Salasõna ei ole sobilik</string>
+    <string name="settings_password_updated">Sinu salasõna on muudetud</string>
+    <string name="settings_unignore_user">Kas sa soovid näha kasutaja %s kõiki sõnumeid\?
+\n
+\nPane tähele, et antud toiming taaskäivitab rakenduse ja see võib võtta veidi aega.</string>
+    <string name="passwords_do_not_match">Salasõnad ei klapi omavahel</string>
+
+    <string name="settings_delete_notification_targets_confirmation">Kas sa oled kindel et soovid eemaldada antud teavituse liigi\?</string>
+
+    <string name="settings_delete_threepid_confirmation">Kas sa oled kindel, et soovid eemaldada %1$s %2$s\?</string>
+
+    <string name="settings_select_country">Vali riik</string>
+
+    <string name="settings_phone_number_country_label">Riik</string>
+    <string name="settings_phone_number_country_error">Palun vali riik</string>
+    <string name="encryption_export_notice">Eksporditavate võtmete krüptimiseks palun sisesta paroolifraas. Võtmete importimisel pead kasutama sama paroolifraasi.</string>
+    <string name="encryption_export_saved_as">Jututoas kasutatavad läbiva krüptimise võtmed on salvestatud faili \'%s\'.
+\n
+\nHoiatus: rakenduse eemaldamisel ka see fail ilmselt kustutatakse.</string>
+    <string name="encryption_exported_successfully">Võtmete eksportimine õnnestus</string>
+
+    <string name="encryption_message_recovery">Krüptitud sõnumite taastamine</string>
+    <string name="encryption_settings_manage_message_recovery_summary">Halda võtmete varundust</string>
+
+    <string name="encryption_import_e2e_room_keys">Impordi E2E läbiva krüptimise võtmed jututubade jaoks</string>
+    <string name="encryption_import_room_keys">Impordi jututoa krüptovõtmed</string>
+    <string name="encryption_import_room_keys_summary">Impordi võtmed kohalikust failist</string>
+    <string name="encryption_import_import">Impordi</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Kasuta krüptimist vaid verifitseeritud sessioonides</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse.</string>
+
+    <string name="encryption_information_not_verified">Ei ole verifitseeritud</string>
+    <string name="encryption_information_verified">Verifitseeritud</string>
+    <string name="encryption_information_blocked">Mustas nimekirjas</string>
+
+    <string name="encryption_information_unknown_device">tundmatu sessioon</string>
+    <string name="encryption_information_unknown_ip">tundmatu ip-aadress</string>
+    <string name="encryption_information_none">ei midagi</string>
+
+    <string name="encryption_information_verify">Verifitseeri</string>
+    <string name="encryption_information_unverify">Eemalda verifitseerimine</string>
+    <string name="encryption_information_block">Lisa musta nimekirja</string>
+    <string name="encryption_information_unblock">Eemalda mustast nimekirjast</string>
+
+    <string name="encryption_information_verify_device">Verifitseeri sessioon</string>
+    <string name="encryption_information_verify_device_warning">Kinnita seda võrreldes järgnevaid andmeid oma teise sessiooni kasutajaseadetes:</string>
+    <string name="encryption_information_verify_device_warning2">Kui nad omavahel ei klapi, siis teie suhtluse turvalisus võib olla ohus.</string>
+    <string name="encryption_information_verify_key_match">Kinnitan, et võtmed klapivad omavahel</string>
+
+    <string name="unknown_devices_alert_title">Jututoas leidub tundmatuid sessioone</string>
+    <string name="unknown_devices_alert_message">Siin jututoas leidub tundmatuid ja verifitseerimata sessioone.
+\nSee tähendab, et pole mitte mingit kindlust selles osas, et teised kasutajad on ka tegelikult need, keda nad väidavad end olevat.
+\nKui sa tõesti soovid, siis sa võid saata sõnumi ka verifitseerimata kasutajatele, kuid meie soovitame, et sa esmalt läbid verifitseerimise kõikide nende sessioonidega.
+\n
+\nTundmatud sessioonid:</string>
+
+    <string name="select_room_directory">Vali jututubade loend</string>
+    <string name="directory_server_fail_to_retrieve_server">Server kas pole kättesaadav või on ülekoormatud</string>
+    <string name="directory_server_type_homeserver">Sisesta koduserveri nimi, mille avalike jututubade loendit soovid näha</string>
+    <string name="directory_server_placeholder">Koduserveri aadress</string>
+    <string name="directory_server_all_rooms_on_server">Kõik jututoad %s serveris</string>
+    <string name="directory_server_native_rooms">Kõik %s jututoad</string>
+
+    <string name="lock_screen_hint">Kirjuta siia…</string>
+
+    <plurals name="notification_unread_notified_messages">
+        <item quantity="one">1 lugemata teavitatud sõnum</item>
+        <item quantity="other">%d lugemata teavitatud sõnumit</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages_in_room_msgs">
+        <item quantity="one">1 lugemata teavitatud sõnum</item>
+        <item quantity="other">%s lugemata teavitatud sõnumit</item>
+    </plurals>
+    <string name="settings_labs_enable_send_voice_summary">Selle valiku kasutamine eeldab kolmanda osapoole rakendust sõnumite salvestamiseks.</string>
+    <string name="widget_integration_review_terms">Jätkamaks pead nõustuma kasutustingimustega.</string>
+
+    <string name="you_added_a_new_device">Sa oled lisanud uue sessiooni \'%s\', mis soovib saada krüptimisvõtmeid.</string>
+    <string name="you_added_a_new_device_with_info">Uus sessioon soovib krüptovõtmeid.
+\nSessiooni nimi: %1$s 
+\nViimati nähtud: %2$s
+\nKui sa pole mõnes muus seadmes sisse loginud, siis ära pane seda teadet tähele.</string>
+    <string name="your_unverified_device_requesting">Sinu verifitseerimata sessioon \'%s\' soovib saada krüptimisvõtmeid.</string>
+    <string name="your_unverified_device_requesting_with_info">Verifitseerimata sessioon soovib krüptovõtmeid.
+\nSessiooni nimi: %1$s 
+\nViimati nähtud: %2$s
+\nKui sa pole mõnes muus seadmes sisse loginud, siis ära pane seda teadet tähele.</string>
+
+    <string name="start_verification">Alusta verifitseerimist</string>
+    <string name="start_verification_short_label">Verifitseeri</string>
+    <string name="share_without_verifying">Jaga ilma verifitseerimata</string>
+    <string name="share_without_verifying_short_label">Jaga</string>
+    <string name="key_share_request">Krüptovõtmete jagamise päring</string>
+    <string name="ignore_request">Eira päringut</string>
+    <string name="ignore_request_short_label">Eira</string>
+
+    <string name="conference_call_warning_title">Hoiatus!</string>
+    <string name="conference_call_warning_message">Rühmakõnede funktsionaalsus on veel arendamisel ja ei pruugi hetkel olla töökindel.</string>
+
+    <string name="command_error">Käsu viga</string>
+    <string name="unrecognized_command">Tundmatu käsk: %s</string>
+    <string name="command_problem_with_parameters">Käsk „%s“ eeldab rohkem parameetreid või mõni neist on vigane.</string>
+    <string name="command_description_emote">Näitab tegevusi</string>
+    <string name="command_description_ban_user">Keela ligipääs antud tunnusega kasutajale</string>
+    <string name="command_description_unban_user">Taasta ligipääs antud tunnusega kasutajale</string>
+    <string name="command_description_op_user">Määra kasutaja õigused</string>
+    <string name="command_description_deop_user">Eemalda antud tunnusega kasutajalt haldusõigused selles jututoas</string>
+    <string name="command_description_invite_user">Kutsub nimetatud kasutajatunnusega kasutaja sellesse jututuppa</string>
+    <string name="command_description_join_room">Liitu antud aadressiga jututoaga</string>
+    <string name="command_description_part_room">Lahku jututoast</string>
+    <string name="command_description_topic">Määra jututoa teema</string>
+    <string name="command_description_kick_user">Müksa selle tunnusega kasutaja jututoast välja</string>
+    <string name="command_description_nick">Muudab sinu kuvatavat nime</string>
+    <string name="command_description_markdown">Lülita markdown-vormingu kasutamine sisse või välja</string>
+    <string name="command_description_clear_scalar_token">Paranda Matrix\'i rakenduse haldust</string>
+
+    <string name="markdown_has_been_enabled">Markdown-vormindus on kasutusel.</string>
+    <string name="markdown_has_been_disabled">Markdown-vormindus ei ole kasutusel.</string>
+
+    <string name="notification_off">Välja lülitatud</string>
+    <string name="notification_silent">Vaikne</string>
+    <string name="notification_noisy">Jutukas</string>
+
+    <string name="create">Loo</string>
+    <string name="create_community">Loo kogukond</string>
+    <string name="community_name">Kogukonna nimi</string>
+    <string name="community_name_hint">Näiteks</string>
+    <string name="community_id">Kogukonna tunnus</string>
+    <string name="community_id_hint">näiteks</string>
+
+    <string name="group_details_home">Avaleht</string>
+    <string name="group_details_people">Inimesed</string>
+    <string name="group_details_rooms">Jututoad</string>
+    <string name="no_users_placeholder">Kasutajaid ei ole</string>
+
+    <string name="rooms">Jututoad</string>
+    <string name="joined">Liikmed</string>
+    <string name="invited">Kutsutud</string>
+    <string name="filter_group_members">Filtreeri kogukonna liikmeid</string>
+    <string name="filter_group_rooms">Filtreeri kogukonna jututubasid</string>
+
+    <plurals name="group_members">
+        <item quantity="one">1 liige</item>
+        <item quantity="other">%d liiget</item>
+    </plurals>
+
+    <plurals name="group_rooms">
+        <item quantity="one">1 jututuba</item>
+        <item quantity="other">%d jututuba</item>
+    </plurals>
+    <string name="group_no_long_description">Kogukonna haldur ei ole kogukonna pikka kirjeldust koostanud.</string>
+
+    <string name="has_been_kicked">%2$s müksas sind välja %1$s jututoast</string>
+    <string name="receipt_avatar">Lugemisteatise tunnuspilt</string>
+    <string name="notice_avatar">Teavituse tunnuspilt</string>
+    <string name="avatar">Tunnuspilt</string>
+
+    <string name="dialog_user_consent_content">Selleks et jätkata koduserveri %1$s kasutamist sa pead üle vaatama ja nõustuma meie kasutustingimustega.</string>
+    <string name="dialog_user_consent_submit">Vaata üle</string>
+
+    <string name="deactivate_account_title">Deaktiveeri konto</string>
+    <string name="deactivate_account_content">See muudab sinu konto jäädavalt mittekasutatavaks. Sina ei saa enam sisse logida ja keegi teine ei saa seda kasutajatunnust uuesti pruukida. Samuti logitakse sind välja kõikidest jututubadest, kus sa osaled ning eemaldatakse kõik sinu andmed sinu isikutuvastusserverist. <b>Seda tegevust ei saa tagasi pöörata.</b>
+\n
+\nSinu konto kustutamine <b>vaikimisi ei tähenda, et unustatakse ka sinu saadetud sõnumid.</b> Kui sa siiski soovid seda, siis palun tee märge alljärgnevasse kasti.
+\n
+\nMatrix\'i sõnumite nähtavus on sarnane e-posti kirjadega. Sõnumite unustamine tegelikult tähendab seda, et sinu varemsaadetud sõnumeid ei jagata uute või veel registreerumata kasutajatega, kuid registeerunud kasutajad, kes juba on need sõnumid saanud, võivad neid ka jätkuvalt lugeda.</string>
+    <string name="deactivate_account_prompt_password">Jätkamiseks palun sisesta oma salasõna:</string>
+    <string name="deactivate_account_submit">Deaktiveeri konto</string>
+
+    <string name="error_empty_field_enter_user_name">Palun sisesta kasutajanimi.</string>
+    <string name="error_empty_field_your_password">Palun sisesta oma salasõna.</string>
+    <string name="room_tombstone_versioned_description">See jututuba on asendatud teise jututoaga ning ei ole enam kasutusel</string>
+    <string name="room_tombstone_continuation_link">Vestlus jätkub siin</string>
+    <string name="room_tombstone_continuation_description">See jututuba on järg varasemale vestlusele</string>
+    <string name="room_tombstone_predecessor_link">Vanemate sõnumite nägemiseks klõpsi siin</string>
+
+    <string name="resource_limit_exceeded_title">Ressursipiir on ületatud</string>
+    <string name="resource_limit_contact_action">Võta ühendust teenuse haldajaga</string>
+
+    <string name="resource_limit_contact_admin">palun võta ühendust oma teenuse haldajaga</string>
+
+    <string name="resource_limit_soft_default">See koduserver ületanud ühe oma ressursipiirangutest, seega <b>mõned kasutajad ei saa sisse logida</b>.</string>
+    <string name="resource_limit_hard_default">See koduserver ületanud ühe oma ressursipiirangutest.</string>
+
+    <string name="resource_limit_soft_mau"> See koduserver on saavutanud igakuise aktiivsete kasutajate piiri, seega <b>mõned kasutajad ei saa sisse logida</b>.</string>
+    <string name="resource_limit_hard_mau">See koduserver on saavutanud igakuise aktiivsete kasutajate piiri.</string>
+
+    <string name="resource_limit_soft_contact">Selle piiri suurendamiseks palun %s.</string>
+    <string name="resource_limit_hard_contact">Jätkamaks selle teenuse kasutamist palun %s.</string>
+
+    <string name="settings_lazy_loading_title">Lae jututoa kasutajad aeglaselt</string>
+    <string name="settings_lazy_loading_description">Paranda jõudlust ja lae jututoa liikmed alles selle esimese vaatamise ajal.</string>
+    <string name="error_lazy_loading_not_supported_by_home_server">Sinu koduserver ei võimalda jututoa kasutajate aeglast laadimist. Proovi hiljem uuesti.</string>
+
+    <string name="unknown_error">Vabandust, aga tekkis viga</string>
+
+    <string name="merged_events_expand">laienda</string>
+    <string name="merged_events_collapse">ahenda</string>
+
+    <string name="settings_info_area_show">Näita teabevälja</string>
+    <string name="show_info_area_always">Alati</string>
+    <string name="show_info_area_messages_and_errors">Sõnumite ja vigade puhul</string>
+    <string name="show_info_area_only_errors">Ainult vigade puhul</string>
+
+    <string name="generic_label">%1$s:</string>
+    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="plus_x">+%d</string>
+    <string name="x_plus">%d+</string>
+    <string name="no_valid_google_play_services_apk">Ühtegi Google Play teenuste rakendusefaili ei leidunud. Teavitused ei pruugi korralikult toimida.</string>
+
+    <string name="passphrase_create_passphrase">Loo paroolifraas</string>
+    <string name="passphrase_confirm_passphrase">Sisesta paroolifraas veel üks kord</string>
+    <string name="passphrase_enter_passphrase">Sisesta paroolifraas</string>
+    <string name="passphrase_passphrase_does_not_match">Paroolifraasid ei klappi mitte</string>
+    <string name="passphrase_empty_error_message">Palun sisesta paroolifraas</string>
+    <string name="passphrase_passphrase_too_weak">Paroolifraas on liiga nõrk</string>
+
+    <string name="keys_backup_passphrase_not_empty_error_message">"Kui sa soovid, et Element looks taastevõtme, siis  palun kustuta paroolifraas."</string>
+    <string name="keys_backup_no_session_error">Matrix\'i sessioone ei leidu</string>
+
+    <string name="keys_backup_setup_step1_title">Ära kunagi kaota krüptitud sõnumeid</string>
+    <string name="keys_backup_setup_step1_description">Sõnumid krüptitud jututubades kasutavad läbivat krüptimist. Ainult sinul ja saaja(te)l on võtmed selliste sõnumite lugemiseks.
+\n
+\nVältimaks krüptovõtmete kadumist, varunda nad turvaliselt.</string>
+    <string name="keys_backup_setup">Võta kasutusele krüptovõtmete varundamine</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Tundub, et sul juba on olemas teises sessioonis tehtud krüptovõtmete varukoopia. Kas sa soovid selle asendada varukoopiaga, mida just hakkasid tegema\?</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Jaga taastevõtit…</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Loon taastevõtit ja krüptin seda paroolifraasiga. Võib kuluda üsna mitu sekundit.</string>
+    <string name="recovery_key">Taastevõti</string>
+    <string name="unexpected_error">Ootamatu viga</string>
+    <string name="keys_backup_setup_backup_started_title">Alustasin varukoopia tegemist</string>
+    <string name="keys_backup_setup_backup_started_message">Teen taustal sinu krüptovõtmetest varukoopia sinu koduserverisse. Esimese varukoopia tegemine võib võtta paar minutit.</string>
+
+
+    <string name="keys_backup_setup_skip_title">Kas sa oled kindel\?</string>
+    <string name="keys_backup_setup_skip_msg">Kui sa logid välja või kaotad seadme, siis sa ei saa enam lugeda oma krüptitud sõnumeid.</string>
+
+    <string name="keys_backup_restore_is_getting_backup_version">Laen varukoopia versiooni…</string>
+    <string name="keys_backup_restore_with_passphrase">Selleks, et krüptitud sõnumite ajalugu lukust lahti võtta, kasuta oma taastamiseks mõeldud paroolifraasi</string>
+    <string name="keys_backup_restore_use_recovery_key">kasuta oma taastevõtit</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Kas sa ei tea oma taastamiseks mõeldud paroolifraasi\? Siis sa võid %s.</string>
+
+    <string name="keys_backup_restore_with_recovery_key">Selleks, et krüptitud sõnumite ajalugu lukust lahti võtta, kasuta oma taastevõtit</string>
+    <string name="keys_backup_restore_key_enter_hint">Sisesta taastevõti</string>
+
+    <string name="keys_backup_restore_setup_recovery_key">Sõnumite taastamine</string>
+
+    <string name="keys_backup_restore_with_key_helper">Kas sa kaotasid oma taastevõtme\? Sa võid seadistustes määrata uue.</string>
+    <string name="keys_backup_passphrase_error_decrypt">Selle paroolifraasiga ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget taastamiseks mõeldud paroolifraasi.</string>
+    <string name="network_error_please_check_and_retry">Võrguühenduse viga: palun kontrolli, kas võrguühendus on olemas ja proovi uuesti.</string>
+
+    <string name="keys_backup_restoring_waiting_message">Taastan võtmed varundusest:</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Arvutan taastevõtit…</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">Laen alla krüptovõtmeid…</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">Impordin krüptovõtmeid…</string>
+    <string name="keys_backup_recovery_code_error_decrypt">Selle taastevõtmega ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget taastevõtit.</string>
+
+    <string name="keys_backup_restore_success_title">Varukoopiast taastatud %s!</string>
+    <plurals name="keys_backup_restore_success_description_part1">
+        <item quantity="one">Taastasin varukoopiast ühe võtmega.</item>
+        <item quantity="other">Taastasin varukoopiast %d võtmega.</item>
+    </plurals>
+    <plurals name="keys_backup_restore_success_description_part2">
+        <item quantity="one">Üks uus võti on lisatud siia sessiooni.</item>
+        <item quantity="other">%d uut võtit on lisatud siia sessiooni.</item>
+    </plurals>
+
+    <string name="keys_backup_get_version_error">Ei õnnestunud laadida taastevõtmete versiooni (%s).</string>
+    <string name="keys_backup_no_keysbackup_sdk_error">Sessioonis pole krüptograafia kasutusel</string>
+
+
+    <string name="keys_backup_settings_restore_backup_button">Taasta varundusest</string>
+    <string name="keys_backup_settings_delete_backup_button">Kustuta varukoopia</string>
+
+    <string name="keys_backup_settings_status_ok">Võtmete varundus on selles sesioonis korrektselt üles seatud.</string>
+    <string name="keys_backup_settings_status_ko">Krüptovõtmete varundamine ei ole selles sessioonis kasutusel.</string>
+    <string name="keys_backup_settings_status_not_setup">Sinu selle sessiooni krüptovõtmeid ei varundata.</string>
+
+    <string name="keys_backup_settings_signature_from_unknown_device">Varukoopial on allkiri tundmatult sessioonilt tunnusega %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">Varukoopial on selle sessiooni kehtiv allkiri.</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">Varukoopial on kehtiv allkiri verifitseeritud sessioonilt tunnusega %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">Varukoopial on kehtiv allkiri verifitseerimata sessioonilt tunnusega %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">Varukoopial on vigane allkiri verifitseeritud sessioonilt tunnusega %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Varukoopial on vigane allkiri verifitseerimata sessioonilt tunnusega %s</string>
+    <string name="keys_backup_get_trust_error">Ei õnnestunud laadida teavet varukoopia usaldamiseks (%s).</string>
+
+    <string name="keys_backup_settings_untrusted_backup">Selleks, et saaksid selles sessioonis kasutada krüptovõtmete varundamist, pead esmalt võtmed taastama oma paroolifraasi või taastevõtme abil.</string>
+    <string name="keys_backup_settings_deleting_backup">Kustutan varukoopia…</string>
+    <string name="keys_backup_settings_delete_backup_error">Varukoopia kustutamine ei õnnestunud (%s)</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Kontrollin varukoopia olekut</string>
+    <string name="keys_backup_settings_delete_confirm_title">Kustuta varukoopia</string>
+    <string name="keys_backup_settings_delete_confirm_message">Kas kustutame krüptovõtmete varukoopia serverist\? Sellisel juhul sa ei saa kasutada ka taastevõtit krüptitud sõnumite ajaloo loetavaks muutmseks.</string>
+
+    <string name="new_recovery_method_popup_title">Uus võtmete varukoopia</string>
+    <string name="new_recovery_method_popup_description">Tuvastasin uue krüptovõtmete varukoopia.
+\n
+\nKui sa ei ole ise uusi taastamise meetodeid lisanud, siis võib olla tegemist ründega sinu konto vastu. Palun vaheta koheselt oma kasutajakonto salasõna ning määra seadistustes uus taastemeetod.</string>
+    <string name="new_recovery_method_popup_was_me">See olin mina</string>
+
+    <string name="keys_backup_banner_setup_line1">Ära kunagi kaota krüptitud sõnumeid</string>
+    <string name="keys_backup_banner_setup_line2">Võta kasutusele krüptovõtmete varundamine</string>
+
+    <string name="secure_backup_banner_setup_line1">Turvaline varundus</string>
+    <string name="secure_backup_banner_setup_line2">Hoia ära, et kaotad ligipääsu krüptitud sõnumitele ja andmetele</string>
+
+    <string name="keys_backup_banner_recover_line1">Ära kunagi kaota krüptitud sõnumeid</string>
+    <string name="keys_backup_banner_recover_line2">Kasuta varundatud võtmeid</string>
+
+    <string name="keys_backup_banner_update_line1">Uued sõnumite krüptovõtmed</string>
+    <string name="keys_backup_banner_update_line2">Halda võtmete varunduses</string>
+
+    <string name="keys_backup_banner_in_progress">Varundan sinu krüptovõtmeid. Selleks võib kuluda mitu minutit…</string>
+
+
+    <string name="secure_backup_setup">Võta kasutusele turvaline varundus</string>
+
+    <string name="keys_backup_info_keys_all_backup_up">Kõik krüptovõtmed on varundatud</string>
+    <plurals name="keys_backup_info_keys_backing_up">
+        <item quantity="one">Varundan üht krüptovõtit…</item>
+        <item quantity="other">Varundan %d krüptovõtit…</item>
+    </plurals>
+
+    <string name="keys_backup_info_title_version">Versioon</string>
+    <string name="keys_backup_info_title_algorithm">Algoritm</string>
+    <string name="keys_backup_info_title_signature">Allkiri</string>
+
+    <string name="autodiscover_invalid_response">Vigane vastus koduserveri tuvastamise päringule</string>
+    <string name="autodiscover_well_known_autofill_dialog_title">Serveriseadistuste automaatne sõnalõpetus</string>
+    <string name="autodiscover_well_known_autofill_dialog_message">Element tuvastas kohandatud serveriseadistused sinu kasutajanime domeenis „%1$s“:
+\n%2$s</string>
+    <string name="autodiscover_well_known_autofill_confirm">Kasuta seadistusi</string>
+
+    <string name="invalid_or_expired_credentials">Oled kehtetu või aegunud kasutajanime või salasõna tõttu välja logitud.</string>
+
+    <string name="sas_verify_title">Verifitseeri lühikese sõne võrdlemise teel.</string>
+    <string name="sas_security_advise">"Parima turvalisuse mõttes on oluline, et teed seda nii, et kas olete  üheskoos või kasutate muud suhtluskanalit, mida mõlemad usaldate."</string>
+    <string name="sas_verify_start_button_title">Alusta verifitseerimist</string>
+    <string name="sas_incoming_request_title">Saabuv verifitseerimispalve</string>
+    <string name="sas_incoming_request_description">Selle sessiooni usaldamiseks peaksid ta verifitseerima. Kui sa pruugid läbivalt krüptitud sõnumeid, siis partnerite sessioonide verifitseerimine tagab sulle täiendava meelerahu.</string>
+    <string name="sas_incoming_request_description_2">Selle sessiooni verifitseerimisel loetakse ta usaldusväärseks ning samuti märgitakse sinu sessioon tema jaoks usaldusväärseks.</string>
+
+    <string name="sas_error_m_unknown_transaction">See sessioon ei tea midagi antud toimingust</string>
+    <string name="sas_error_m_unknown_method">Sessioon ei suuda kokku leppida võtmete, räsi, MAC\'i või SAS\'i meetodi osas</string>
+    <string name="sas_error_m_mismatched_commitment">Räsid ei klapi</string>
+    <string name="sas_error_m_mismatched_sas">SAS ei klapi</string>
+    <string name="sas_error_m_unexpected_message">Sessioon sai ootamatu sõnumi</string>
+    <string name="sas_error_m_invalid_message">Võtsin vastu vigase sõnumi</string>
+    <string name="sas_error_m_key_mismatch">Krüptovõtmed ei klapi</string>
+    <string name="sas_error_m_user_error">Kasutajad ei klapi</string>
+    <string name="sas_error_unknown">Teadmata viga</string>
+
+    <string name="identity_server_not_defined">Sa ei kasuta ühtegi isikutuvastusserverit</string>
+    <string name="identity_server_not_defined_for_password_reset">Ühtegi isikutuvastusserverit pole seadistatud, aga salasõna muutmiseks on see oluline.</string>
+
+    <string name="error_user_already_logged_in">Tundub, et sa üritad luua ühendust teise koduserveriga. Kas sa soovid välja logida\?</string>
+
+    <string name="edit">Muuda</string>
+    <string name="reply">Vasta</string>
+
+    <string name="global_retry">Proovi uuesti</string>
+    <string name="room_list_empty">Selleks, et asuda rakendust kasutama, liitu mõne jututoaga.</string>
+    <string name="send_you_invite">Saatis sulle kutse</string>
+    <string name="invited_by">%s kutsus</string>
+
+    <string name="room_list_catchup_empty_title">Ei tea… kõik vist on nüüd tehtud!</string>
+    <string name="room_list_catchup_empty_body">Sul ei ole rohkem lugemata sõnumeid</string>
+    <string name="room_list_catchup_welcome_title">Tere tulemast koju!</string>
+    <string name="room_list_catchup_welcome_body">Leiad lugemata sõnumid siit</string>
+    <string name="room_list_people_empty_title">Vestlused</string>
+    <string name="room_list_people_empty_body">Sinu otsevestlused kuvatakse siin</string>
+    <string name="room_list_rooms_empty_title">Jututoad</string>
+    <string name="keys_backup_unable_to_get_trust_info">Usaldamiseks vajaliku teabe laadimisel tekkis viga</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">Krüptovõtmete varukoopia andmete laadimisel tekkis viga</string>
+
+    <string name="import_e2e_keys_from_file">Impordi läbiva krüptimise võtmed failist „%1$s“.</string>
+
+    <string name="settings_sdk_version">Matrix\'i SDK versioon</string>
+    <string name="settings_other_third_party_notices">Muud kolmandate osapoolte litsentsid</string>
+    <string name="navigate_to_room_when_already_in_the_room">Sa juba vaatad seda jututuba!</string>
+
+    <string name="quick_reactions">Reageeri lennult</string>
+
+    <string name="settings_general_title">Üldist</string>
+    <string name="settings_preferences">Eelistused</string>
+    <string name="settings_security_and_privacy">Turvalisus ja privaatsus</string>
+    <string name="settings_expert">Ekspertidele</string>
+    <string name="settings_push_rules">Tõuketeavituste reeglid</string>
+    <string name="settings_push_rules_no_rules">Tõuketeavituste reegleid pole kirjeldatud</string>
+    <string name="settings_push_gateway_no_pushers">Tõuketeavituste võrguväravaid pole registreeritud</string>
+
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_url">URL:</string>
+    <string name="push_gateway_item_format">Vorming:</string>
+
+    <string name="preference_voice_and_video">Heli ja video</string>
+    <string name="preference_root_help_about">Abiteave ning info meie kohta</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Registreeri tunnusluba</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Näita peidetud sündmusi ajajoonel</string>
+
+    <string name="bottom_action_people_x">Isiklikud sõnumid</string>
+
+    <string name="send_file_step_idle">Ootan…</string>
+    <string name="send_file_step_encrypting_thumbnail">Krüptin pisipilti…</string>
+    <string name="send_file_step_sending_thumbnail">Saadan pisipilti (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Krüptin faili…</string>
+    <string name="send_file_step_sending_file">Saadan faili (%1$s / %2$s)</string>
+
+    <string name="downloading_file">Laen alla faili %1$s…</string>
+    <string name="downloaded_file">%1$s on alla laetud!</string>
+
+    <string name="edited_suffix">(muudetud)</string>
+
+    <string name="message_edits">Sõnumite muutmised</string>
+    <string name="no_message_edits_found">Muutmisi ei leidunud</string>
+
+    <string name="room_directory_search_hint">Nimi või kasutajatunnus (#example:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Luba vastamine ajajoonel viipamisega</string>
+    <string name="link_copied_to_clipboard">Link on kopeeritud lõikelauale</string>
+
+    <string name="add_by_matrix_id">Lisa Matrix\'i tunnuse alusel</string>
+    <string name="creating_direct_room">Loon jututuba…</string>
+    <string name="direct_room_no_known_users">Tulemusi ei leidunud. Otsinguks serverist kasuta „Lisa Matrix\'i tunnuse alusel“.</string>
+    <string name="direct_room_start_search">Otsingutulemuste jaoks kirjuta midagi</string>
+    <string name="joining_room">Liitun jututoaga …</string>
+
+    <string name="terms_of_service">Kasutustingimused</string>
+    <string name="review_terms">Vaata kasutustingimused üle</string>
+    <string name="terms_description_for_identity_server">Ole teiste poolt leitav</string>
+    <string name="terms_description_for_integration_manager">Kasuta roboteid, võrgusildu, vidinaid või kleepsupakke</string>
+
+    <string name="read_at">Loe aadressil</string>
+
+
+    <string name="identity_server">Isikutuvastusserver</string>
+    <string name="disconnect_identity_server">Katkesta ühendus isikutuvastusserveriga</string>
+    <string name="add_identity_server">Seadista isikutuvastusserverit</string>
+    <string name="change_identity_server">Muuda isikutuvastusserverit</string>
+    <string name="settings_discovery_identity_server_info">Sa hetkel kasutad %1$s serverit, et olla leitav ja ise leida sinule teadaolevaid inimesi.</string>
+    <string name="settings_discovery_identity_server_info_none">Sa hetkel ei kasuta isikutuvastusserverit. Et olla leitav ja ise leida sinule teadaolevaid inimesi seadista ta alljärgnevalt.</string>
+    <string name="settings_discovery_emails_title">Leitavad e-posti aadressid</string>
+    <string name="settings_discovery_no_mails">Otsinguvõimaluste loend kuvatakse, kui oled sisestanud e-posti aadressi.</string>
+    <string name="settings_discovery_no_msisdn">Otsinguvõimaluste loend kuvatakse, kui oled sisestanud telefoninumbri.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Isikutuvastusserveri kasutamise lõpetamine tähendab, et sa ei ole leitav teiste kasutajate poolt ega sulle ei saa telefoninumbri või e-posti aadressi alusel kutset saata. Küll aga saab kutset saata Matrix\'i kasutajatunnuse alusel.</string>
+    <string name="settings_discovery_msisdn_title">Leitavad telefoninumbrid</string>
+    <string name="labs_show_unread_notifications_as_tab">Lisa avaekraanile eraldi sakk lugemata teavituste jaoks.</string>
+
+    <string name="settings_discovery_confirm_mail">Saatsime kinnituskirja e-posti aadressile %s. Palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Saatsime kinnituskirja e-posti aadressile %s. Esmalt palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
+    <string name="settings_agree_to_terms">Selleks, et sind võiks leida e-posti aadressi või telefoninumbri alusel, nõustu isikutuvastusserveri (%s) kasutustingimustega.</string>
+
+    <string name="labs_allow_extended_logging">Lülita sisse detailsete logide salvestamine.</string>
+    <string name="no_ignored_users">Sa parasjagu ei eira ühtegi kasutajat</string>
+
+    <string name="help_long_click_on_room_for_more_options">Lisavalikute nägemiseks vajuta jututoa nimel kaua</string>
+
+
+    <string name="room_join_rules_public">%1$s muutis selle jututoa avalikuks kõigile, kes teavad tema aadressi.</string>
+    <string name="room_join_rules_public_by_you">Sina muutsid selle jututoa avalikuks kõigile, kes teavad tema aadressi.</string>
+    <string name="room_join_rules_invite">%1$s määras, et jututuppa pääseb vaid kutsega.</string>
+    <string name="login_splash_text1">Vestle kahekaupa või rühmiti</string>
+    <string name="login_reset_password_mail_confirmation_submit">Ma olen verifitseerinud oma e-posti aadressi</string>
+
+    <string name="login_reset_password_success_title">Õnnestus!</string>
+    <string name="login_reset_password_cancel_confirmation_content">Sinu salasõna ei ole veel muutunud.
+\n
+\nKas katkestame muutmise\?</string>
+
+    <string name="login_set_email_title">Määra e-posti aadress</string>
+    <string name="login_set_email_notice">Seadista e-posti aadress, mis võimaldaks sul vajadusel taastada ligipääsu oma kontole. Lisaks võid kasutada e-posti aadressi või telefoninumbrit, et need inimesed, kes sind tunnevad, saaks sind leida.</string>
+    <string name="login_set_email_mandatory_hint">E-posti aadress</string>
+    <string name="login_set_email_optional_hint">E-posti aadress (kui soovid)</string>
+    <string name="login_set_email_submit">Järgmine</string>
+
+    <string name="login_set_msisdn_title">Lisa telefoninumber</string>
+    <string name="login_set_msisdn_notice">Salvesta oma telefoninumber selleks, et teised kasutajad saaks sind leida.</string>
+    <string name="login_set_msisdn_notice2">Palun kasuta rahvusvahelist numbrivormingut.</string>
+    <string name="login_set_msisdn_mandatory_hint">Telefoninumber</string>
+    <string name="login_set_msisdn_optional_hint">Telefoninumber (kui soovid)</string>
+    <string name="login_set_msisdn_submit">Järgmine</string>
+
+    <string name="login_msisdn_confirm_title">Kinnita telefoninumbri lisamine</string>
+    <string name="login_msisdn_confirm_notice">Me just saatsime tuvastuskoodi telefoninumbrile %1$s. Kinnitamaks, et see on sinu number, palun sisesta ta alljärgnevalt.</string>
+    <string name="login_msisdn_confirm_hint">Sisesta tuvastuskood</string>
+    <string name="login_msisdn_confirm_send_again">Saada uuesti</string>
+    <string name="login_msisdn_confirm_submit">Järgmine</string>
+
+    <string name="login_msisdn_error_not_international">Rahvusvahelise telefoninumbri alguses peaks olema „+“</string>
+    <string name="login_msisdn_error_other">Telefoninumber ei tundu olema õige. Palun kontrolli seda veel üks kord</string>
+
+    <string name="login_signup_to">Logi sisse koduserverisse %1$s</string>
+    <string name="login_signin_username_hint">Kasutajanimi või e-posti aadress</string>
+    <string name="login_signup_username_hint">Kasutajanimi</string>
+    <string name="login_signup_password_hint">Salasõna</string>
+    <string name="login_signup_submit">Järgmine</string>
+    <string name="login_signup_error_user_in_use">Selline kasutajanimi on juba olemas</string>
+    <string name="login_signup_cancel_confirmation_title">Hoiatus</string>
+    <string name="login_signup_cancel_confirmation_content">Sinu kasutajakonto pole veel loodud.
+\n
+\nKas katkestame konto registreerimise\?</string>
+
+    <string name="login_a11y_choose_matrix_org">Vali matrix.org</string>
+    <string name="login_a11y_choose_modular">Vali teenusepakkujaks Element Matrix Services</string>
+    <string name="login_a11y_choose_other">Vali mõni muu koduserver</string>
+    <string name="login_a11y_captcha_container">Palun tee läbi robotilõksu katse</string>
+    <string name="login_terms_title">Jätkamiseks nõustu kasutustingimustega</string>
+
+    <string name="login_wait_for_email_title">Palun kontrolli oma e-kirju</string>
+    <string name="login_wait_for_email_notice">Saatsime e-kirja %1$s aadressile.
+\nKonto loomisega jätkamiseks palun klõpsi selles kirjas leiduvat linki.</string>
+    <string name="login_validation_code_is_not_correct">Sisestatud kood ei ole õige. Palun kontrolli seda.</string>
+    <string name="login_error_outdated_homeserver_title">Iganenud koduserver</string>
+    <string name="login_error_outdated_homeserver_content">Selle koduserveri versioon on ühenduse loomiseks liiga vana. Palu oma koduserveri haldajal seda uuendada.</string>
+
+    <plurals name="login_error_limit_exceeded_retry_after">
+        <item quantity="one">Liiga palju samaaegseid päringuid. Proovi uuesti ühe sekundi pärast…</item>
+        <item quantity="other">Liiga palju samaaegseid päringuid. Proovi uuesti %1$d sekundi pärast…</item>
+    </plurals>
+
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">See ei ole õige kasutajatunnus. Õige vorming on: \'@torekasutaja:koduserver.ee\'</string>
+    <string name="autodiscover_well_known_error">Ei leia toimivat koduserverit. Palun vaata, et kasutajatunnus oleks õige</string>
+
+    <string name="soft_logout_signin_title">Logi sisse</string>
+    <string name="soft_logout_signin_notice">"Sinu koduserveri (%1$s) haldur on sind sinu kontolt  %2$s (%3$s) välja loginud."</string>
+    <string name="soft_logout_signin_e2e_warning_notice">Selleks, et laadida vaid siin seadmes kasutatud krüptovõtmeid, palun logi sisse. Sa vajad neid võtmeid selleks, et lugeda kõiki oma krüptitud sõnumeid kõikides oma seadmetes.</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">Kui sa oma krüptovõtmete taastamiseks ei logi sisse, siis sa kaotad ligipääsu oma krüptitud sõnumitele.</string>
+    <string name="soft_logout_clear_data_dialog_submit">Eemalda andmed</string>
+    <string name="permalink_malformed">Sinu matrix.to link oli vigane</string>
+    <string name="settings_developer_mode">Arendusrežiim</string>
+    <string name="settings_developer_mode_summary">Arendusrežiimis on võimalik kasutada varjatud töövahendeid ning võib rakenduse teha ebastabiilsemaks. Soovitame vaid arendajatele!</string>
+    <string name="settings_rageshake">Seadme tõsine raputamine</string>
+    <string name="settings_rageshake_detection_threshold">Tuvastamise lävi</string>
+    <string name="settings_rageshake_detection_threshold_summary">Läve testimiseks raputa oma nutiseadet</string>
+    <string name="rageshake_detected">Raputamine tuvastatud!</string>
+    <string name="settings">Seadistused</string>
+    <string name="devices_current_device">Praegune sessioon</string>
+    <string name="devices_other_devices">Muud sessioonid</string>
+
+    <string name="autocomplete_limited_results">Kuvan vaid esimesi tulemusi, kirjuta natuke pikemalt…</string>
+
+    <string name="settings_developer_mode_fail_fast_title">Kiire lõppmäng</string>
+    <string name="settings_developer_mode_fail_fast_summary">Teadmata vigade puhul võib Element sagedamini kokku joosta</string>
+
+    <string name="command_description_shrug">Lisa ¯\\_(ツ)_/¯ smaili vormindamata teksti algusesse</string>
+
+    <string name="create_room_encryption_title">Võta jututoas krüptimine kasutusele</string>
+    <string name="create_room_encryption_description">"Kui krüptimine on  juba kasutusele võetud, siis ei saa seda enam eemaldada."</string>
+
+    <string name="login_error_threepid_denied">Sinu e-posti domeeni ei saa kasutada selles serveris registreerimisel</string>
+
+    <string name="verification_conclusion_warning">Sisselogimine ei ole usaldusväärne</string>
+    <string name="verification_sas_match">Nad klapivad</string>
+    <string name="verification_sas_do_not_match">Nad ei klapi</string>
+    <string name="verify_user_sas_emoji_help_text">Verifitseeri see sessioon tehes kindlaks et järgnev emoji kuvatakse samas järjekorras partneri ekraanil.</string>
+    <string name="verify_user_sas_emoji_security_tip">Parima turvalisuse nimel palun kasuta mõnda muud usaldusväärset suhtlusvahendit või kohtu silmast silma.</string>
+    <string name="verification_green_shield">Roheline kilp näitab, et kasutaja on usaldusväärne. Tagamaks, et kogu jututuba on usaldusväärne, siis peaks kõikidel selle liikmetel olema roheline kilp.</string>
+
+    <string name="verification_conclusion_not_secure">Ei ole turvaline</string>
+    <string name="send_a_sticker">Kleeps</string>
+
+    <string name="verification_request_waiting">Ootan…</string>
+    <string name="verification_request_other_cancelled">%s tühistas</string>
+    <string name="verification_request_you_cancelled">Sa tühistasid</string>
+    <string name="verification_request_other_accepted">%s nõustus</string>
+    <string name="verification_request_you_accepted">Sa nõustusid</string>
+    <string name="verification_sent">Verifitseerimispäring on saadetud</string>
+    <string name="verification_request">Verifitseerimispäring</string>
+    <string name="verification_verify_device">Verifitseeri see sessioon</string>
+    <string name="verification_verify_device_manually">Verifitseeri käsitsi</string>
+
+    <string name="you">Sina</string>
+
+    <string name="verification_scan_notice">Selleks, et üksteist turvaliselt verifitseerida, skaneeri see QR-koodi teise kasutaja seadmest</string>
+    <string name="verification_scan_their_code">Skaneeri teise osapoole QR-koodi</string>
+    <string name="verification_scan_emoji_title">Kas sa ei saa skaneerida</string>
+    <string name="verification_scan_emoji_subtitle">Kui te pole üheskoos, siis võrrelge selle asemel pilte</string>
+
+    <string name="verification_no_scan_emoji_title">Verifitseeri võrreldes emoji\'sid</string>
+
+    <string name="verify_by_emoji_title">Verifitseeri emoji\'de abil</string>
+    <string name="verify_by_emoji_description">Kui sa ei saa skaneerida eespool kuvatud koodi, siis verifitseeri unikaalsete emoji\'de kombinatsiooni võrdlemise teel.</string>
+
+    <string name="a13n_qr_code_description">QR-kood</string>
+
+    <string name="verification_verify_user">Verifitseeri %s</string>
+    <string name="verification_verified_user">%s on verifitseeritud</string>
+    <string name="verification_request_waiting_for">Ootan vastust kasutajalt %s…</string>
+    <string name="verify_new_session_notice">Kasuta seda sessiooni uute sessioonide verifitseerimiseks, andes sellega ligipääsu krüptitud sõnumitele.</string>
+    <string name="verify_new_session_was_not_me">See ei olnud mina</string>
+    <string name="verify_new_session_compromized">Sinu kasutajakonto võib olla sattunud valedesse kätesse</string>
+
+    <string name="use_recovery_key">Kasuta taastevõtit</string>
+    <string name="enter_secret_storage_input_key">Vali oma taastevõti, sisesta ta käsitsi või aseta lõikelaualt</string>
+    <string name="keys_backup_recovery_key_error_decrypt">Selle taastevõtmega ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget taastevõtit.</string>
+    <string name="failed_to_access_secure_storage">Turvahoidla kasutamine ei õnnestu</string>
+
+    <string name="unencrypted">Krüptimata</string>
+    <string name="encrypted_unverified">Krüptitud verifitseerimata seadme poolt</string>
+    <string name="review_logins">Vaata üle, kust sa oled Matrix\'i võrku loginud</string>
+    <string name="verify_other_sessions">Selleks et sinu konto ja sõnumid oleks turvatud, verifitseeri kõik oma sessioonid</string>
+    <string name="verify_this_session">Verifitseeri uus kasutajasessioon, mis pruugib sinu kontot: %1$s</string>
+
+    <string name="cross_signing_verify_by_text">"Verifitseeri  käsitsi etteantud teksti abil"</string>
+    <string name="crosssigning_verify_session">Verifitseeri sisselogimissessioon</string>
+    <string name="cross_signing_verify_by_emoji">Verifitseeri interaktiivselt Emoji abil</string>
+    <string name="confirm_your_identity">Kinnita oma isikusamasust verifitseerides seda sisselogimissessiooni mõnest oma muust sessioonist. Sellega tagad ka ligipääsu krüptitud sõnumitele.</string>
+    <string name="mark_as_verified">Märgi usaldusväärseks</string>
+
+    <string name="error_empty_field_choose_user_name">Palun vali kasutajanimi.</string>
+    <string name="error_empty_field_choose_password">Palun vali salasõna.</string>
+    <string name="external_link_confirmation_title">Kontrolli seda linki veel üks kord</string>
+    <string name="external_link_confirmation_message">See %1$s link viib sind teise veebisaiti: %2$s.
+\n
+\nKas sa kindlasti soovid jätkata\?</string>
+
+    <string name="create_room_dm_failure">Otsevestluse loomine ei õnnestunud. Palun kontrolli, et kasutajanimed oleks õiged ja proovi uuesti.</string>
+
+    <string name="add_members_to_room">Lisa liikmeid</string>
+    <string name="invite_users_to_room_action_invite">KUTSU</string>
+    <string name="inviting_users_to_room">Kutsun kasutajaid…</string>
+    <string name="invite_users_to_room_title">Kutsu kasutajaid</string>
+    <string name="invitation_sent_to_one_user">Kutse saadetud kasutajale %1$s</string>
+    <string name="invitations_sent_to_two_users">Kutsed saadetud kasutajatele %1$s ja %2$s</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="one">Kutsed saadetud kasutajatele %1$s ja veel ühele teisele kasutajale</item>
+        <item quantity="other">Kutsed saadetud kasutajatele %1$s ja veel %2$d\'le kasutajale</item>
+    </plurals>
+    <string name="invite_users_to_room_failure">Meil ei õnnestunud neile kasutajatele kutset saata. Palun kontrolli, keda soovid kutsuda ning proovi uuesti.</string>
+
+    <string name="choose_locale_current_locale_title">Hetkel kasutatav keel</string>
+    <string name="choose_locale_other_locales_title">Muud saadaval olevad keeled</string>
+    <string name="choose_locale_loading_locales">Laen saadaval olevaid keeli…</string>
+
+    <string name="open_terms_of">Ava %s kasutustingimused</string>
+    <string name="disconnect_identity_server_dialog_content">Kas katkestame ühenduse isikutuvastusserveriga %s\?</string>
+    <string name="identity_server_error_no_identity_server_configured">Palun esmalt seadista isikutuvastusserver.</string>
+    <string name="identity_server_error_terms_not_signed">Palun esmalt nõustu seadistustes isikutuvastusserveri kasutustingimustega.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Sinu privaatsuse nimel saadab Element e-posti aadressid ja telefoninumbrid serverisse vaid räsituna.</string>
+    <string name="identity_server_error_binding_error">Seoste loomine ei õnnestunud.</string>
+    <string name="identity_server_error_no_current_binding_error">Selle tunnusega ei ole hetkel ühtegi seost.</string>
+
+    <string name="identity_server_set_default_notice">Sinu koduserver (%1$s) soovitab kasutada sinu isikutuvastusserverina %2$s teenust</string>
+    <string name="identity_server_set_default_submit">Kasuta %1$s teenust</string>
+    <string name="identity_server_set_alternative_notice">Alternatiivina või sa sisestada ükspuha missuguse isikutuvastusserveri aadressi</string>
+    <string name="identity_server_set_alternative_notice_no_default">Sisesta isikutuvastusserveri aadress</string>
+    <string name="identity_server_set_alternative_submit">Saada</string>
+    <string name="power_level_edit_title">Seadista õigusi</string>
+    <string name="power_level_title">Roll</string>
+    <string name="a11y_open_chat">Alusta vestlust</string>
+    <string name="a11y_mute_microphone">Summuta mikrofon</string>
+    <string name="a11y_unmute_microphone">Eemalda mikrofoni summutamine</string>
+    <string name="a11y_stop_camera">Lõpeta kaamera kasutamine</string>
+    <string name="a11y_start_camera">Võta kaamera kasutusele</string>
+
+    <string name="settings_setup_secure_backup">Võta kasutusele turvaline varundus</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">Turvaline varundus</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Tagamaks, et sa ei kaota ligipääsu krüptitud sõnumitele ja andmetele, varunda krüptimisvõtmed oma serveris.</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Võta kasutusele</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Kasuta turvavõtit</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Loome turvavõtme, mida sa peaksid hoidma turvalises kohas, nagu näiteks arvutis salasõnade halduris või vana kooli seifis.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Kasuta turvafraasi</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Sisesta turvafraas, mida vaid sina tead ning loo võti varukoopia jaoks.</string>
+
+    <string name="bottom_sheet_save_your_recovery_key_title">Salvesta oma turvavõti</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Salvesta turvavõti turvalisesse kohta, nagu näiteks arvutis salasõnade haldur või vana kooli seif.</string>
+
+    <string name="set_a_security_phrase_title">Määra turvafraas</string>
+    <string name="set_a_security_phrase_notice">Andmete kaitsmiseks sinu koduserveris sisesta turvafraas, mida vaid sina tead.</string>
+    <string name="set_a_security_phrase_hint">Turvafraas</string>
+    <string name="set_a_security_phrase_again_notice">Kinnituseks sisesta turvafraas uuesti.</string>
+
+    <string name="save_your_security_key_title">Salvesta oma turvavõti</string>
+    <string name="save_your_security_key_notice">Salvesta oma turvavõti turvalisesse kohta, nagu näiteks arvutis salasõnade haldur või vana kooli seif.</string>
+
+    <string name="room_settings_name_hint">Jututoa nimi</string>
+    <string name="room_settings_topic_hint">Jututoa teema</string>
+    <string name="room_settings_save_success">Jututoa seadistuste muutmine õnnestus</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">Sa ei saa seda sõnumit lugeda</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Ootan kuni sõnumite dekrüptimine lõppeb ja selleks võib kuluda aega</string>
+    <string name="crypto_utd">Dekrüptimine ei ole võimalik</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Kuna kasutusel on läbiv krüptimine ja krüptovõtmeid pole sulle korrektselt edastatud, siis võib-olla pead ootama, kuni saad õige sõnumi.</string>
+    <string name="crypto_error_withheld_blacklisted">Sa ei saa seda sõnumit lugeda, kuna saatja on blokeerinud suhtluse sinuga</string>
+    <string name="crypto_error_withheld_unverified">Sa ei saa seda sõnumit lugeda, kuna saatja ei usalda sinu sessiooni</string>
+    <string name="crypto_error_withheld_generic">Sa ei saa seda sõnumit lugeda, kuna saatja teadlikult ei saatnud vajalikke võtmeid</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Ootan krüptimise ajalugu</string>
+
+    <string name="element_disclaimer_title">Riot\'i uus nimi on Element!</string>
+    <string name="element_disclaimer_content">Meil on hea meel teatada, et oleme muutnud nime! Sinu rakendus on uuendatud ning sa oled oma kontole sisse logitud.</string>
+    <string name="element_disclaimer_negative_button">Selge lugu</string>
+    <string name="element_disclaimer_positive_button">Vaata lisateavet</string>
+
+    <string name="element_login_splash_brand">element</string>
+
+
+    <string name="save_recovery_key_chooser_hint">Salvesta taastevõti järgnevalt</string>
+
+    <string name="add_from_phone_book">Lisa telefoniraamatust</string>
+    <string name="empty_phone_book">Sinu telefoniraamat on tühi</string>
+    <string name="phone_book_title">Telefoniraamat</string>
+    <string name="search_in_my_contacts">Otsi minu kontaktide seast</string>
+    <string name="loading_contact_book">Laen sinu kontaktide loendit…</string>
+    <string name="empty_contact_book">Sinu kontaktide loend on tühi</string>
+    <string name="contacts_book_title">Sinu kontaktide loend</string>
+
+    <string name="three_pid_revoke_invite_dialog_title">Tühista kutse</string>
+    <string name="three_pid_revoke_invite_dialog_content">Kas tühistame kasutaja %1$s kutse\?</string>
+
+    <string name="member_banned_by">Suhtluskeeld on seatud kasutaja %1$s poolt</string>
+    <string name="failed_to_unban">Kasutaja ligipääsu taastamine ei õnnestunud</string>
+
+    <string name="alert_push_are_disabled_title">Tõuketeavitused on välja lülitatud</string>
+    <string name="enter_account_password">Jätkamaks sisesta oma %s.</string>
+
+    <string name="bootstrap_info_text">%s abil krüpti ja loe oma sõnumeid ning taga usaldusseosed.</string>
+    <string name="bootstrap_info_confirm_text">Kinnituseks sisesta %s uuesti.</string>
+    <string name="bootstrap_dont_reuse_pwd">Palun ära kasuta selleks oma tavalist konto salasõna.</string>
+
+    <string name="bootstrap_info_text_2">Andmete kaitsmiseks sinu koduserveris sisesta turvafraas, mida vaid sina tead.</string>
+
+    <string name="bootstrap_loading_text">Selleks võib kuluda mitu sekundit.</string>
+    <string name="bootstrap_loading_title">Alustame taastamist.</string>
+    <string name="your_recovery_key">Sinu taastevõti</string>
+    <string name="bootstrap_finish_title">Valmis!</string>
+    <string name="keep_it_safe">Hoia seda turvaliselt</string>
+    <string name="finish">Lõpeta</string>
+
+    <string name="bootstrap_save_key_description">Kasuta seda %1$s turvavõrguna olukorras, kus unustad oma %2$s.</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">Avaldan justloodud Identiteedivõtmed</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Loon paroolifraasi põhjal turvavõtme</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Määratlen vaikimisi kasutatava SSSS-võtme</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Sünkroniseerin üldvõtit</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Sünkroniseerin kasutaja võtit</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Sünkroniseerin allkirjavõtit</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Teeme võtmetest varukoopia</string>
+
+
+    <string name="bootstrap_crosssigning_print_it">Trüki ta välja ja hoia turvalises kohas</string>
+    <string name="bootstrap_crosssigning_save_usb">Salvesta ta mälupulgale või varunduskettale</string>
+    <string name="bootstrap_crosssigning_save_cloud">Kopeeri ta isiklikku andmehoidlasse mis asub pilves</string>
+
+    <string name="auth_flow_not_supported">Seda tegevust ei saa teha nutiseadmest</string>
+
+    <string name="bootstrap_skip_text">Paroolifraasi kasutusele võtmine võimaldab sul krüptida ja lugeda oma sõnumeid ning tagada usaldusseoseid.
+\n
+\nKui sa ei soovi selleks kasutada sõnumite salasõna, siis võid genereerida ka sõnumivõtme.</string>
+    <string name="bootstrap_skip_text_no_gen_key">Paroolifraasi kasutusele võtmine võimaldab sul krüptida ja lugeda oma sõnumeid ning tagada usaldusseoseid.</string>
+    <string name="bootstrap_cancel_text">Kui sa tühistad nüüd, siis sa võid peale viimasest seadmest välja logimist kaotada ligipääsu oma krüptitud sõnumitele ja andmetele.
+\n
+\nAga sa võid seadistustes võtta kasutusele turvalise varunduse ning hallata oma krüptovõtmeid.</string>
+
+    <string name="encryption_enabled">Krüptimine on kasutusel</string>
+    <string name="encryption_enabled_tile_description">Sõnumid selles jututoas on läbivalt krüptitud. Uuri lisaks ja verifitseeri kasutajad nende kasutajaprofiilides.</string>
+    <string name="encryption_not_enabled">Krüptimine ei ole kasutusel</string>
+    <string name="encryption_unknown_algorithm_tile_description">Selles jututoas kasutatud krüptimine ei ole toetatud</string>
+
+    <string name="room_created_summary_item">%s lõi ja seadistas jututoa.</string>
+    <string name="room_created_summary_item_by_you">Sina lõid ja seadistasid jututoa.</string>
+
+    <string name="qr_code_scanned_self_verif_notice">Peaaegu valmis! Kas teises seadmes kuvatakse sama kilpi\?</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Peaaegu valmis! Ootan kinnitust…</string>
+    <string name="qr_code_scanned_verif_waiting">Ootan vastust kasutajalt %s…</string>
+
+    <string name="error_failed_to_import_keys">Võtmete importimine ei õnnestunud</string>
+
+    <string name="settings_notification_configuration">Teavituste seadistused</string>
+    <string name="settings_messages_at_room">Sõnumid, mis sisaldavad sõna @room</string>
+    <string name="settings_messages_in_e2e_one_to_one">Kahepoolsete vestluste krüptitud sõnumid</string>
+    <string name="settings_messages_in_e2e_group_chat">Rühmavestluste krüptitud sõnumid</string>
+    <string name="settings_when_rooms_are_upgraded">Kui jututubasid uuendatakse</string>
+    <string name="settings_troubleshoot_title">Leia lahendus vigadele</string>
+    <string name="settings_notification_advanced_summary">Seadista teavituse olulisus sündmuse alusel</string>
+
+    <string name="command_description_plain">Saadab sõnumi vormindamata tekstina ega tõlgenda seda markdown-vormindusena</string>
+
 </resources>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 21f71aee49..db7cf62893 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -245,7 +245,6 @@ Baimendu sarbidea hurrengo laster-leihoan deia egin ahal izateko.</string>
     <string name="room_jump_to_first_unread">Jauzi irakurri gabeko lehen mezura.</string>
 
     <string name="room_preview_invitation_format">%s erabiltzaileak gela honetara elkartzera gonbidatu zaitu</string>
-    <string name="e2e_need_log_in_again">Berriro hasi behar duzu saioa muturretik muturrerako zifratzerako saio honentzako gakoak sortzeko eta gako publikoa zure hasiera zerbitzarira bidali. Hau behin bakarrik egin behar duzu. Barkatu eragozpenak.</string>
 
     <string name="permissions_rationale_msg_storage">Elementek zure argazki eta bideoen liburutegia atzitzeko baimena behar du eranskinak gorde ahal izateko.
 
@@ -609,10 +608,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="encryption_information_verify_device_warning2">Bat badator, sakatu beheko egiaztatu botoia. Ez badator bat, beste inor saioa atzematen dago eta zerrenda beltzean sartu beharko zenuke. Etorkizunean egiaztaketa metodoa hobetuko da.</string>
     <string name="encryption_information_verify_key_match">Gakoak bat datozela egiaztatu dut</string>
 
-    <string name="e2e_enabling_on_app_update">Elementek orain muturretik muturrerako zifratzea onartzen du baina berriro hasi behar duzu saioa hau gaitzeko.
-
-Orain egin dezakezu edo gero aplikazioaren ezarpenetatik.</string>
-
     <string name="unknown_devices_alert_title">Gelan saio ezezagunak daude</string>
     <string name="unknown_devices_alert_message">Gela honetan egiaztatu gabeko saio ezezagunak daude. 
 \nEzin da bermatu saioak benetan dioten jabeenak direla. 
@@ -652,8 +647,6 @@ Orain egin dezakezu edo gero aplikazioaren ezarpenetatik.</string>
     <string name="notification_sync_in_progress">Sinkronizatzen…</string>
     <string name="notification_listening_for_events">Entzun gertaerak</string>
 
-    <string name="login_mobile_device">Mugikorra</string>
-
     <string name="settings_notification_ringtone">Jakinarazpen-soinua</string>
     <string name="settings_12_24_timestamps">Erakutsi denbora-zigiluak 12 ordutako formatuan</string>
 
@@ -1007,7 +1000,7 @@ Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ah
 
     <string name="call_anyway">Deitu hala ere</string>
     <string name="settings_call_category">Deiak</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Erabili Elementen lehenetsitako dei-doinua jasotako deientzat</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Erabili Elementen lehenetsitako dei-doinua jasotako deientzat</string>
     <string name="settings_call_ringtone_title">Jasotako deien doinua</string>
     <string name="settings_call_ringtone_dialog_title">Hautatu deientzako doinua:</string>
 
@@ -1037,8 +1030,6 @@ Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ah
 
     <string name="auth_accept_policies">Irakurri eta onartu hasiera-zerbitzari honen baldintzak:</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d gako ongi inportatu dira.</string>
-
     <string name="settings_notification_troubleshoot">Egiaztatu arazoak jakinarazpenekin</string>
     <string name="settings_troubleshoot_diagnostic">Arazoak egiaztatzen</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Abiatu probak</string>
@@ -1118,32 +1109,12 @@ Aplikazioa egiten saiatzen ari dena agresiboki murriztuko zaio bigarren planoan
 
     <string name="no_valid_google_play_services_apk">Ez da baliozko Google Play Services APK-rik aurkitu. Jakinarazpenak agian ez dira ongi ibiliko.</string>
 
-    <string name="store_title">Element - Komunikatu, zure erara</string>
-    <string name="store_short_description">Txat seguru eta unibertsala zure kontrolpean erabat.</string>
     <string name="settings_troubleshoot_test_battery_failed">Erabiltzaile batek gailu bat deskonektatuta eta erabili gabe uzten badu denbora batez, pantaila itzalita duela, gailua kuluxka moduan sartzen da. Honek aplikazioak sarera konektatzea eragozten du eta beraien lanak atzeratzen ditu, baita ohiko alarmak.</string>
     <string name="startup_notification_fdroid_battery_optim_message">Element-ek bigarren planoko konexio arin bat behar du jakinarazpen fidagarriak izateko.
 Hurrengo pantailan Element-i bigarren planoan aritzeko baimena eskatuko zaizu, onartu ezazu mesedez.</string>
-    <string name="store_full_description">"Txaterako aplikazio bat, zure kontrolpean eta erabat malgua. Element-ek zuk nahi duzun eran komunikatzea ahalbidetzen dizu. [matrix] erabiltzeko egina, komunikaziorako estandar ireki eta deszentralizatua.
-\n
-\nEskuratu matrix.org kontu bat doan, ezarri zure zerbitzari propioa  https://modular.im bidez, edo erabili beste Matrix zerbitzari bat.
-\n
-\nZergatik erabili Element\?
-\n
-\n* KOMUNIKAZIO OSOA: Sortu gelak zure lantalde, adiskide, edo komunitateentzat, zuk nahi bezalakoak! Txateatu, partekatu fitxategiak, gehitu trepetak eta egin ahots eta bideo deiak, den dena doan.
-\n
-\n* INTEGRAZIO AHALTSUAK: Erabili Element jada ezagutu eta maite dituzun tresnekin. Element erabiliz beste txat aplikazioetako erabiltzaileekin ere aritu zaitezke.
-\n
-\n* PRIBATUA ETA SEGURUA: Mantendu zure elkarrizketak sekretupean. Muturretik muturrerako zifratzeak pribatua den hori pribatu izaten jarraituko duela bermatzen du.
-\n
-\n* IREKIA, EZ ITXIA; Kode irekikoa, eta Matrix sarearen gainean eraikia. Izan zure datuen jabe zure zerbitzaria ostatatuz, edo zuretzat fidagarria den bat aukeratuz.
-\n
-\n* ZUREKIN EDONON: Mantendu kontaktua zure gailuetan zehar guztiz sinkronizatutako mezuen historial batekin, eta web bidez https://riot.im helbidean."</string>
 
     <string name="video_call_in_progress">Bide-deia abioan…</string>
 
-    <string name="store_whats_new">"Etengabe egiten dizkiogu hobekuntzak eta aldaketak Element aplikazioari.
-Aldaketen zerrenda osoa hemen aurkitu daiteke: %1$s.
-Ezer galtzen ez duzula ziurtatzeko, mantendu eguneraketak piztuta."</string>
     <string name="title_activity_keys_backup_setup">Gakoen babes-kopia</string>
     <string name="title_activity_keys_backup_restore">Erabili gakoen babes-kopia</string>
     <string name="keys_backup_is_not_finished_please_wait">Gakoen babes-kopia ez da amaitu, itxaron mesedez…</string>
@@ -1152,7 +1123,6 @@ Ezer galtzen ez duzula ziurtatzeko, mantendu eguneraketak piztuta."</string>
     <string name="done">Egina</string>
 
     <string name="settings_notification_advanced">Jakinarazpenen ezarpen aurreratuak</string>
-    <string name="settings_notification_advanced_summary">Ezarri jakinarazpenen garrantzia gertaerako, konfiguratu soinua, leda, bibrazioa</string>
     <string name="settings_notification_by_event">Jakinarazpenen garrantzia gertaerako</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Ezarpen pertsonalizatuak.</string>
@@ -1235,7 +1205,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="keys_backup_passphrase_error_decrypt">Ezin izan da babes-kopia deszifratu pasaesaldi honekin: egiaztatu pasaesaldi zuzena idatzi duzula.</string>
     <string name="keys_backup_recovery_code_error_decrypt">Ezin izan da babes-kopia deszifratu berreskuratze gako honekin: egiaztatu berreskuratze gako egokia sartu duzula.</string>
 
-    <string name="keys_backup_restore_success_description">"%1$d  saio gako berrezarri dira, eta saio honek ezagutzen ez zituen %2$d gako berri gehitu dira"</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Berrezarri gako %d duen babes-kopia.</item>
         <item quantity="other">Berrezarri %d gako dituen babes-kopia.</item>
@@ -1500,12 +1469,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="keys_backup_unable_to_get_trust_info">Errore bat gertatu da konfiantzazko informazioa jasotzean</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Errore bat gertatu da gakoen babes-kopiaren datuak jasotzean</string>
 
-    <string name="alpha_disclaimer_title">Ongi etorri betara!</string>
-    <string name="alpha_disclaimer_content_line_1">Element oraindik garapenean dagoenez, ezaugarri batzuk faltan bota ditzakezu eta akatsen bat aurkitu dezakezu.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">Azken ezaugarrien zerrenda hemen dago beti : %1$s, eta akatsak aurkitzen badituzu bidali mesedez akatsen txosten bat Hasiera pantailako goi ezkerreko menua erabiliz, eta ahalik eta lasterren konponduko dugu.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Store-ko deskripzioa</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Akatsak aurkitzen badituzu bidali mesedez akatsen txosten bat Hasiera pantailako goi ezkerreko menua erabiliz, eta ahalik eta lasterren konponduko dugu.</string>
-
     <string name="import_e2e_keys_from_file">"Inportatu e2e gakoak \"%1$s\"  fitxategitik."</string>
 
     <string name="settings_sdk_version">Matrix SDK bertsioa</string>
@@ -1542,16 +1505,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Erakutsi ezkutatutako gertaerak denbora lerroan</string>
 
-    <string name="store_riotx_title">Element - Hurrengo belaunaldiko Matrix bezeroa</string>
-    <string name="store_riotx_short_description">Matrix-erako bezero azkarrago eta arinago bat azken Android tresnak erabiliz eginak</string>
-    <string name="store_riotx_full_description">Element bezero berri bat da Matrix protokoloarentzako (Matrix.org): komunikazioa seguru eta deszentralizatuarentzako sare libre bat. Element Android plataformarako Riot bezeroaren berridazketa oso bat da, erabat berridatzitako Android SDK-n oinarritua.
-\n 
-\nAbisua: hau beta bertsio bat da. Element garapen aktiboan dago eta baditu mugak zein akatsak (gehiegi ez espero dugu). Iruzkin guztiak ongi etorriak dira!
-\n 
-\nElement bezeroak honakoa ahalbidetzen du: • Badagoen kontu batean saioa hasi • Gelak sortu eta gela publikoetara elkartu • Gonbidapenak onartu edo ukatu • Erabiltzailearen gelak zerrendatu • Gelaren xehetasunak ikusi • Testuzko mezuak bidali • Eranskinak bidali • Zifratutako geletan mezuak irakurri eta idatzi • Zifratzea: E2Egakoen babeskopia, gailuaren egiaztaketa aurreratua, gakoa partekatzeko eskaria eta erantzuna • Push jakinarazpena • Azal argia, iluna eta beltza
-\n 
-\nEz dira oraindik Element bezeroaren ezaugarri guztiak ezarri Element bezeroan. Falta diren (eta laster etorriko direnen) artean nabarmenak dira: • Gelaren ezarpenak (gelako kideak zerrendatzea, eta abar.) • Deiak • Trepetak • …</string>
-
     <string name="push_gateway_item_app_display_name">aplikazio_pantaila_izena:</string>
     <string name="bottom_action_people_x">Mezu zuzenak</string>
 
@@ -1566,9 +1519,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="edited_suffix">(editatua)</string>
 
-    <string name="riotx_no_registration_notice">%1$s kontua sortzeko.</string>
-    <string name="riotx_no_registration_notice_colored_part">Erabili aplikazio zaharra</string>
-
 
     <string name="message_edits">Mezuen edizioak</string>
     <string name="no_message_edits_found">Ez da ediziorik aurkitu</string>
@@ -1645,11 +1595,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="identity_server_not_defined">Ez duzu identitate zerbitzaririk erabiltzen</string>
     <string name="identity_server_not_defined_for_password_reset">Ez da identitate zerbitzaririk konfiguratu, zure pasahitza berrezartzeko beharrezkoa da.</string>
 
-    <string name="security_warning_identity_server">Element bertsio zaharrek segurtasun akats bat zuten eta zure identitate zerbitzariak (%1$s) zure kontua atzitu zezakeen. %2$s fidagarritzat jotzen baduzu hau ezikusi dezakezu, bestela maiatu saioa eta hasi berriro.
-\n
-\nXehetasun gehiago hemen:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="error_user_already_logged_in">Badirudi beste hasiera-zerbitzari batera konektatzen saiatzen ari zarela. Saioa amaitu nahi duzu\?</string>
 
     <string name="terms_of_service">Erabilera baldintzak</string>
@@ -1705,7 +1650,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="a11y_hide_password">Ezkutatu pasahitza</string>
     <string name="a11y_jump_to_bottom">Jauzi behera</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s eta beste %3$d erabiltzailek irakurria</string>
     <string name="three_users_read">%1$s, %2$s eta%3$s erabiltzaileek irakurria</string>
     <string name="two_users_read">%1$s eta %2$s erabiltzaileek irakurria</string>
     <string name="one_user_read">%s erabiltzaileak irakurria</string>
@@ -1981,7 +1925,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="settings_developer_mode_fail_fast_title">Hutsegin-azkar</string>
     <string name="settings_developer_mode_fail_fast_summary">Element aplikazioa ustekabeko erroreen aurrean maizago kraskatu daiteke</string>
-    <string name="command_description_verify">Eskatu emandako erabiltzaile IDa egiaztatzea</string>
     <string name="command_description_shrug">"Jarri ¯\\_(ツ)_/¯  testu-soileko mezuaren aurretik"</string>
 
     <string name="create_room_encryption_title">Gaitu zifratzea</string>
@@ -2202,7 +2145,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Gakoak egunean daude jada!</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="settings_key_requests">Gako eskaerak</string>
 
@@ -2301,7 +2244,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="settings_messages_in_e2e_group_chat">Zifratutako mezuak talde-txatetan</string>
     <string name="settings_when_rooms_are_upgraded">Gelak eguneratzean</string>
     <string name="settings_troubleshoot_title">Arazo-ehiza</string>
-    <string name="settings_notification_advanced_summary_riotx">Ezarri jakinarazpenen garrantzia gertaerako</string>
+    <string name="settings_notification_advanced_summary">Ezarri jakinarazpenen garrantzia gertaerako</string>
 
     <string name="command_description_plain">Mezua test arrunt gisa bidaltzen du, markdown den aztertu gabe</string>
 
@@ -2345,12 +2288,12 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
 
     <string name="use_other_session_content_description">Erabili azken Element bertsioa zure beste gailuetan, Element Web, Element Desktop, Element iOS, Element Android plataformarako, edo zeharka sinatzeko gaitasuna duen beste Matrix bezero bat</string>
-    <string name="riot_desktop_web">Element Web
+    <string name="app_desktop_web">Element Web
 \nElement Desktop</string>
-    <string name="riot_ios_android">Element iOS
-\nElement Android plataformarako</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
     <string name="or_other_mx_capabale_client">edo zeharka sinatzeko gaitasuna duen beste Matrix bezero bat</string>
-    <string name="use_latest_riot">Erabili azken Element bertsioa zure beste gailuetan:</string>
+    <string name="use_latest_app">Erabili azken Element bertsioa zure beste gailuetan:</string>
     <string name="command_description_discard_session">Uneko irteerako talde saioa zifratutako gela batean baztertzera behartzen du</string>
     <string name="command_description_discard_session_not_handled">Zifratutako gelatan onartzen da soilik</string>
     <string name="enter_secret_storage_passphrase_or_key">Erabili zure %1$s edo %2$s jarraitzeko.</string>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 88a13d71b8..6e5955ae32 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -60,7 +60,7 @@
     <string name="no_conversation_placeholder">گفتگوای نیست</string>
     <string name="rooms_header">اتاق‌ها</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">%d کاربر</item>
+        <item quantity="one">۱ کاربر</item>
         <item quantity="other">%d کاربر</item>
     </plurals>
 
@@ -110,7 +110,6 @@
     <string name="auth_email_validation_message">برای ادامه‌ی ثبت‌نام، لطفاً ایمیل خود را بررسی کنید</string>
     <string name="auth_reset_password_next_step_button">من آدرس ایمیلم را تایید کرده‌ام</string>
     <string name="login_error_network_error">نمی‌توان وارد شد: خطای شبکه</string>
-    <string name="login_mobile_device">موبایل</string>
 
     <string name="login_error_forbidden">نام کاربری/گذرواژه نامعتبر است</string>
     <string name="login_error_user_in_use">این نام کاربری قبلا استفاده شده است</string>
@@ -244,19 +243,19 @@
     <string name="room_title_one_member">۱ عضو</string>
 
     <plurals name="format_time_s">
-        <item quantity="one">%d ثانیه</item>
+        <item quantity="one">۱ ثانیه</item>
         <item quantity="other">%d ثانیه</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="one">%d دقیقه</item>
+        <item quantity="one">۱ دقیقه</item>
         <item quantity="other">%d دقیقه</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="one">%d ساعت</item>
+        <item quantity="one">۱ ساعت</item>
         <item quantity="other">%d ساعت</item>
     </plurals>
     <plurals name="format_time_d">
-        <item quantity="one">%d روز</item>
+        <item quantity="one">۱ روز</item>
         <item quantity="other">%d روز</item>
     </plurals>
 
@@ -491,7 +490,7 @@
     </plurals>
 
     <plurals name="notification_compat_summary_title">
-        <item quantity="one">%d آگاهی</item>
+        <item quantity="one">۱ آگاهی</item>
         <item quantity="other">%d آگاهی</item>
     </plurals>
 
@@ -586,7 +585,6 @@
 
     <string name="settings_labs_show_hidden_events_in_timeline">نمایش رویدادهای نهفته در خط زمانی</string>
 
-    <string name="store_riotx_title">ریوت‌اکس - نسل بعدی کارخواه ماتریس</string>
     <string name="bottom_action_people_x">پیام‌های مستقیم</string>
 
     <string name="send_file_step_idle">منتظر…</string>
@@ -647,7 +645,7 @@
     <string name="settings_active_sessions_show_all">نمایش تمامی نشست‌ها</string>
     <string name="settings_active_sessions_manage">مدیریت نشست‌ها</string>
     <plurals name="settings_active_sessions_count">
-        <item quantity="one">%d نشست فعّال</item>
+        <item quantity="one">۱ نشست فعّال</item>
         <item quantity="other">%d نشست فعّال</item>
     </plurals>
 
@@ -664,14 +662,14 @@
     <string name="call_failed_no_ice_use_alt">از %s استفاده کنید</string>
     <string name="auth_add_email_phone_message_2">یک ایمیل برای بازیابی ثبت کنید. بعدا در صورت دلخواه می توانید از آن برای شناسایی دوستان خود استفاده کنید.</string>
     <string name="auth_add_email_and_phone_message_2">یک ایمیل برای بازیابی ثبت کنید. بعدا در صورت دلخواه می توانید از آن برای شناسایی دوستان خود استفاده کنید.</string>
-    <string name="auth_reset_password_missing_email">نشانی ایمیل پیوست شده به حساب شما باید وارد شده باشد</string>
+    <string name="auth_reset_password_missing_email">نشانی ایمیل پیوست شده به حساب شما باید وارد شده باشد.</string>
     <string name="auth_reset_password_missing_password">گذرواژه جدیدی باید وارد شود.</string>
     <string name="auth_reset_password_email_validation_message">یک ایمیل به %s فرستاده شد. هنگامی که پیوند همراه را دنبال کردید، در زیر کلیک کنید.</string>
-    <string name="auth_reset_password_error_unauthorized">تایید نشانی ایمیل ناموفق بود: مطمئن شوید که روی پیوند در ایمیل کلیک کرده‌اید.</string>
+    <string name="auth_reset_password_error_unauthorized">تایید نشانی ایمیل ناموفق بود: مطمئن شوید که روی پیوند در ایمیل کلیک کرده‌اید</string>
     <string name="auth_reset_password_success_message">گذرواژه بازنشانی شد.
 \n
 \nشما از همه نشست‌ها خارج شدید و دیگر آگاهی ها را دریافت نخواهید کرد. برای فعال‌سازی دوباره آگاهی‌ها، در هر دستگاه دوباره وارد شوید.</string>
-    <string name="auth_accept_policies">لطفا سیاست‌های این سرور خانه را بررسی کنید و بپذیرید</string>
+    <string name="auth_accept_policies">لطفا سیاست‌های این سرور خانه را بررسی کنید و بپذیرید:</string>
 
     <string name="login_error_must_start_http">نشانی باید با http[s]:// آغاز شود</string>
     <string name="login_error_registration_network_error">نمی‌توان ثبت‌نام کرد: خطای شبکه</string>
@@ -688,7 +686,7 @@
     <string name="login_error_limit_exceeded">درخواست‌های بیش از حد ارسال شده</string>
     <string name="login_error_login_email_not_yet">هنوز روی پیوند ایمیل کلیک نشده</string>
 
-    <string name="settings_call_ringtone_use_riot_ringtone">برای تماس‌های ورودی از آهنگ زنگ پیش‌فرض ریوت استفاده کن</string>
+    <string name="settings_call_ringtone_use_app_ringtone">برای تماس‌های ورودی از آهنگ زنگ پیش‌فرض ریوت استفاده کن</string>
     <string name="settings_call_ringtone_title">آهنگ زنگ تماس ورودی</string>
     <string name="settings_call_ringtone_dialog_title">انتخاب آهنگ زنگ برای تماس‌ها:</string>
 
@@ -749,4 +747,10 @@
     <string name="settings">تنظیمات</string>
     <string name="account_password">گذرواژه حساب</string>
 
+    <string name="play_video">پخش</string>
+    <string name="pause_video">توقف</string>
+    <string name="action_copy">رونوشت</string>
+    <string name="dialog_title_success">موفقیت</string>
+
+    <string name="bottom_action_notification">اعلان‌ها</string>
 </resources>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index be706404e7..6179d13df1 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -201,7 +201,6 @@
     <string name="login_error_login_email_not_yet">Sähköpostiisi lähetetty linkki, jota ei ole vielä klikattu</string> <!-- ??? -->
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">Sinun pitää kirjautua uudelleen, luodaksesi salausavaimet tälle laitteelle.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lukukuittaukset</string>
@@ -661,9 +660,6 @@
 \nTulevaisuudessa tämä varmennusprosessi tulee olemaan hienostuneempi.</string>
     <string name="encryption_information_verify_key_match">Vahvistan, että avaimet täsmäävät</string>
 
-    <string name="e2e_enabling_on_app_update">Element tukee päästä päähän -salausta. Kirjaudu sisään uudelleen ottaaksesi salaus käyttöön.
-\nVoit tehdä sen nyt tai myöhemmin sovelluksen asetuksissa.</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Huoneessa on tuntemattomia istuntoja</string>
     <string name="unknown_devices_alert_message">Huoneessa on tuntemattomia laitteita joita ei ole vahvistettu.\nLaitteet eivät välttämättä kuulu väitetyille omistajilleen.\nJokainen uusi laite kannattaa vahvistaa ennen kuin jatkat, mutta voit myös lähettää viestit vahvistamattomille laitteille.\n\nTuntemattomat laitteet:</string>
@@ -722,8 +718,6 @@
     <string name="option_take_photo">Ota kuva</string>
     <string name="option_take_video">Kaappaa video</string>
 
-    <string name="login_mobile_device">Mobiili</string>
-
     <string name="call">Puhelu</string>
     <string name="settings_notification_ringtone">Ilmoitusääni</string>
     <string name="settings_containing_my_display_name">Viesti sisältää näyttönimeni</string>
@@ -923,7 +917,7 @@ Haluatko lisätä paketteja?</string>
         <item quantity="other">%d jäsenyysmuutosta</item>
     </plurals>
 
-    <string name="settings_call_ringtone_use_riot_ringtone">Käytä Elementin oletussoittoääntä saapuville puheluille</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Käytä Elementin oletussoittoääntä saapuville puheluille</string>
     <string name="settings_call_ringtone_title">Saapuvien puheluiden soittoääni</string>
     <string name="video_call_in_progress">Videopuhelu menossa…</string>
 
@@ -985,7 +979,6 @@ Haluatko lisätä paketteja?</string>
         <item quantity="other">%1$s huonetta löydetty kohteelle %2$s</item>
     </plurals>
     <string name="settings_notification_advanced">Yksityiskohtaiset ilmoitusasetukset</string>
-    <string name="settings_notification_advanced_summary">Aseta ilmoituksien tärkeys kohteittain ja määritä hälytysäänet, ledin värit ja värinähälytykset</string>
     <string name="settings_notification_by_event">Ilmoituksen tärkeys kohteittain</string>
 
     <string name="settings_notification_privacy">Ilmoitusten yksityisyys</string>
@@ -1122,8 +1115,6 @@ Haluatko lisätä paketteja?</string>
     <string name="encryption_message_recovery">Salattujen viestien palautus</string>
     <string name="encryption_settings_manage_message_recovery_summary">Hallitse avainten varmuuskopiointia</string>
 
-    <string name="encryption_import_room_keys_success">%1$d / %2$d avainta tuotu onnistuneesti.</string>
-
     <string name="lock_screen_hint">Kirjoita tähän…</string>
 
     <plurals name="notification_unread_notified_messages">
@@ -1227,11 +1218,6 @@ Haluatko lisätä paketteja?</string>
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Kelvollista Google Play Services APK:ta ei löytynyt. Ilmoitukset eivät ehkä toimi oikein.</string>
 
-    <string name="store_title">Element - Kommunikoi, sinun tavallasi</string>
-    <string name="store_whats_new">"Olemme aina tekemässä muutoksia ja parannuksia Element:ään.
-Täydellisen muutoslokin löydät täältä: %1$s.
-Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytössä."</string>
-    <string name="store_short_description">Universaali ja turvallinen keskusteluohjelma kokonaan sinun hallinnassa.</string>
     <string name="passphrase_create_passphrase">Luo salalause</string>
     <string name="passphrase_passphrase_does_not_match">Salalause ei täsmää</string>
     <string name="passphrase_empty_error_message">Syötä salalause</string>
@@ -1305,7 +1291,6 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="keys_backup_recovery_code_error_decrypt">Varmuuskopiota ei pystytty purkamaan tällä palautusavaimella. Tarkista, että olet syöttänyt oikean palautusavaimen.</string>
 
     <string name="keys_backup_restore_success_title">Varmuuskopio palautettu %s !</string>
-    <string name="keys_backup_restore_success_description">%1$d istuntoavainta palautettu, ja lisättiin %2$d uutta avainta, joita tämä laite ei tuntenut</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Varmuuskopio palautettiin yhdellä avaimella.</item>
         <item quantity="other">Varmuuskopio palautettiin %d avaimella.</item>
@@ -1378,22 +1363,6 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="notification_unread_notified_messages_in_room">%1$s -&gt; %2$s</string>
 
-    <string name="store_full_description">Keskustelusovellus, joka on sinun hallinnassasi ja erittäin joustava. Element antaa sinun viestiä juuri sillä tavalla kuin haluat. Taustalla [matrix] – avoimen ja hajautetun viestinnän standardi.
-\n
-\nHanki ilmainen matrix.org-tili, hanki oma palvelimesi osoitteesta https://modular.im tai käytä muuta Matrix-palvelinta. 
-\n
-\nMiksi valita Element\?
-\n
-\n• Kattavat mahdollisuudet viestintään: rakenna huoneita tiimeillesi, ystävillesi ja yhteisöllesi – juuri niin kuin haluat! Keskustele, jaa tiedostoja, lisää sovelmia ja soita ääni‐ ja videopuheluita – kaikki tämä ilmaiseksi.
-\n 
-\n• Tehokkaat integraatiot: Käytä Elementia tuntemiesi työkalujen kanssa. Element mahdollistaa keskustelut jopa eri keskusteluohjelmia käyttävien ihmisten ja ryhmien kanssa.
-\n
-\n• Yksityinen ja turvallinen: Pidä keskustelusi salaisina. Nykyaikainen osapuolten välinen salaus pitää huolen, että yksityiset keskustelut pysyvät yksityisinä. 
-\n
-\n• Avoin, ei suljettu: Avointa lähdekoodia ja rakennettu käyttämään Matrixia. Voit omistaa oman datasi ylläpitämällä omaa palvelintasi, tai käyttämällä palvelinta, johon luotat. 
-\n
-\n• Kaikkialla, missä olet: pysy yhteydessä missä ikinä oletkin, täysin synkronoidulla viestihistorialla kaikkien laitteidesi ja https://riot.im-verkkopalvelun välillä.</string>
-
     <string name="new_recovery_method_popup_description">Uusi avainvarmuuskopio löydetty.
 \n
 \nJos et asettanut uutta palautustapaa, hyökkääjä saattaa yrittää päästä käsiksi tiliisi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.</string>
@@ -1508,8 +1477,6 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 \nViimeksi nähty: %2$s
 \nJos et kirjautunut toisella laitteella, voit jättää tämän pyynnön huomiotta.</string>
 
-    <string name="alpha_disclaimer_title">Tervetuloa beetaan!</string>
-    <string name="alpha_disclaimer_content_line_1">Element on varhaisessa kehitysvaiheessa, mistä johtuen osa ominaisuuksista puuttuu ja saatat kohdata virheitä.</string>
     <string name="settings_sdk_version">Matrix SDK:n versio</string>
     <string name="settings_other_third_party_notices">Muut kolmansien osapuolten huomautukset</string>
     <string name="quick_reactions">Pikareaktiot</string>
@@ -1536,8 +1503,6 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="settings_labs_show_hidden_events_in_timeline">Näytä piilotetut tapahtumat aikajanalla</string>
 
-    <string name="store_riotx_title">Element - seuraavan sukupolven Matrix-asiakasohjelma</string>
-    <string name="store_riotx_short_description">Nopeampi ja kevyempi Matrix-asiakasohjelma</string>
     <string name="bottom_action_people_x">Yksityisviestit</string>
 
     <string name="send_file_step_idle">Odotetaan…</string>
@@ -1549,8 +1514,6 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="edited_suffix">(muokattu)</string>
 
-    <string name="riotx_no_registration_notice_colored_part">Käytä vanhaa sovellusta</string>
-
 
     <string name="no_message_edits_found">Muokkauksia ei löytynyt</string>
 
@@ -1592,9 +1555,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="create_room_directory_title">Huoneluettelo</string>
     <string name="create_room_directory_description">Julkaise tämä huone huoneluettelossa</string>
 
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Storen kuvauksessa</string>
     <string name="settings_push_rules">Viesti-ilmoitusten säännöt</string>
-    <string name="riotx_no_registration_notice">%1$s luodaksesi tilin.</string>
     <string name="disconnect">Katkaise yhteys</string>
     <string name="decline">Kieltäydy</string>
 
@@ -1664,7 +1625,6 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="a11y_hide_password">Piilota salasana</string>
     <string name="a11y_jump_to_bottom">Siirry loppuun</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s ja %3$d muuta lukivat</string>
     <string name="three_users_read">%1$s, %2$s ja %3$s lukivat</string>
     <string name="two_users_read">%1$s ja %2$s lukivat</string>
     <string name="one_user_read">%s luki</string>
@@ -1764,14 +1724,8 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="sas_error_m_unknown_method">Laitteet eivät pysty sopimaan avaimista, tiivisteestä, MAC:sta tai SAS-metodista</string>
     <string name="sas_error_m_mismatched_commitment">Tiivisteet eivät täsmänneet</string>
-    <string name="security_warning_identity_server">Vanhoissa Elementin versioissa oli tietoturvaongelma, joka saattoi antaa identiteettipalvelimelle(%1$s) pääsyn tunnukseesi. Jos luotat kohteeseen %2$s, voit jättää tämän huomiotta. Muussa tapauksessa, kirjaudu ulos ja kirjaudu uudelleen Elementiin.
-\n
-\nLue lisää:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
 
     <string name="action_change">Muuta</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">Viimeisin ominaisuuslista on aina %1$s. Jos löydät virheitä, lähetäthän virheraportin painikkeella, joka löytyy ylhäällä ja vasemmalla olevasta kotivalikosta, niin korjaamme vian niin nopeasti kuin pystymme.</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Jos löytät virheitä, lähetäthän virheraportin ylhäältä ja vasemmalta löytyvästä kotivalikosta, niin korjaamme ongelman niin nopeasti kuin vain pystymme.</string>
 
     <string name="import_e2e_keys_from_file">Tuo osapuolten välisen salauksen avaimet tiedostosta ”%1$s”.</string>
 
@@ -1786,14 +1740,6 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Rekisteröi tunniste</string>
 
-    <string name="store_riotx_full_description">Element on uusi Matrix-protokollaa (Matrix.org) käyttävä ohjelma: avointa ja hajautettua keskustelua tukeva turvallinen verkko. Element on täysin uusittu versio Riot Android -ohjelmasta, joka perustuu Matrix Android SDK:n uudelleenkirjoitukseen.
-\n
-\nHuomaa: tämä on betaversio. Element on vielä kehitystyössä, ja siinä on rajoitteita ja (toivottavasti ei kuitenkaan monta) bugeja. Kaikki palaute on tervetullutta!
-\n
-\nElement tukee: • Kirjaudu olemassaolevalle tunnukselle • Luo huoneita ja liity julkisiin huoneisiin • Hyväksy ja hylkää kutsuja • Listaa käyttäjän huoneet • Katso huoneen tietoja • Lähetä tekstiviestejä • Lähetä liitteitä • Lue ja kirjoita viestejä salatuissa huoneissa • Salaus: osapuolten välisen salauksen avaimien varmuuskopiointi, edistynyt laitteiden varmennus, avainten jakopyynnöt ja vastaus • Viesti-ilmoitukset • Vaalea, tumma ja musta teema
-\n
-\nKaikkia Elementin ominaisuuksia ei ole vielä toteutettu Element:ssä. Tärkeimmät puuttuvat (ja pian saapuvat!) ominaisuudet: • Huoneen asetukset (listaa huoneen jäsenet jne.) • Puhelut • Sovelmat • …</string>
-
     <string name="send_file_step_encrypting_thumbnail">Salataan pikkukuvaa…</string>
     <string name="send_file_step_sending_thumbnail">Lähetetään pikkukuvaa (%1$s / %2$s)</string>
     <string name="room_directory_search_hint">Nimi tai tunniste (#example:matrix.org)</string>
@@ -2066,7 +2012,6 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="verification_conclusion_not_secure">Ei turvallinen</string>
     <string name="sent_a_video">Video.</string>
     <string name="sent_an_image">Kuva.</string>
-    <string name="command_description_verify">Pyyntö annetun käyttäjä-ID:n vahvistamiseksi</string>
     <string name="verification_conclusion_compromised">Johonkin näistä on mahdollisesti murtauduttu:
 \n
 \n - Kotipalvelimesi
@@ -2216,7 +2161,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Avaimet ovat jo ajan tasalla!</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="settings_key_requests">Avainpyynnöt</string>
 
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index fe19418efb..167139cbb2 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -467,10 +467,6 @@
     <string name="login_error_user_in_use">Ce nom d’utilisateur est déjà utilisé</string>
     <string name="login_error_login_email_not_yet">Vous n’avez pas encore cliqué sur le lien dans l’e-mail</string>
 
-    <string name="e2e_need_log_in_again">Vous devez vous identifier à nouveau pour générer des clés de chiffrement de bout en bout pour cette session et envoyer la clé publique à votre serveur d’accueil.
-\nCeci ne se produira qu’une fois.
-\nVeuillez nous excuser pour ce désagrément.</string>
-
     <string name="attachment_cancel_upload">Annuler l’envoi ?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$d min %2$d s</string>
@@ -606,10 +602,6 @@ Attention : ce fichier peut être supprimé si l’application est désinstallé
     <string name="encryption_information_verify_device_warning2">Si elles ne correspondent pas, la sécurité de votre communication est peut-être compromise.</string>
     <string name="encryption_information_verify_key_match">Je confirme que les clés correspondent</string>
 
-    <string name="e2e_enabling_on_app_update">Element prend désormais en charge le chiffrement de bout en bout, mais vous devez vous reconnecter pour l’activer.
-
-Vous pouvez le faire maintenant ou plus tard à partir des paramètres de l’application.</string>
-
     <string name="unknown_devices_alert_title">Le salon contient des sessions inconnues</string>
     <string name="unknown_devices_alert_message">Ce salon contient des sessions inconnues, qui n’ont pas été vérifiées.
 \nCela signifie qu’il n’y a aucune garantie que les sessions appartiennent aux utilisateurs qu’elles prétendent.
@@ -662,8 +654,6 @@ Vous pouvez le faire maintenant ou plus tard à partir des paramètres de l’ap
     <string name="notification_sync_in_progress">Synchronisation…</string>
     <string name="notification_listening_for_events">Écoute d’évènements</string>
 
-    <string name="login_mobile_device">Portable</string>
-
     <string name="settings_notification_ringtone">Son de notification</string>
     <string name="settings_12_24_timestamps">Afficher l’horodatage au format 12 heures</string>
 
@@ -1037,7 +1027,7 @@ Voulez-vous en ajouter ?</string>
     <string name="markdown_has_been_disabled">Le Markdown a été désactivé.</string>
 
     <string name="settings_call_category">Appels</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Utiliser la sonnerie par défaut de Element pour les appels entrants</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Utiliser la sonnerie par défaut de Element pour les appels entrants</string>
     <string name="settings_call_ringtone_title">Sonnerie d’appel entrant</string>
     <string name="settings_call_ringtone_dialog_title">Sélectionner la sonnerie pour les appels :</string>
 
@@ -1045,8 +1035,6 @@ Voulez-vous en ajouter ?</string>
 
     <string name="auth_accept_policies">Veuillez lire et accepter les politiques de ce serveur d’accueil :</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d clé(s) importée(s) avec succès.</string>
-
     <string name="settings_notification_troubleshoot">Résoudre les problèmes de notification</string>
     <string name="settings_troubleshoot_diagnostic">Diagnostics de résolution de problème</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Lancer les tests</string>
@@ -1130,29 +1118,8 @@ Sur l’écran suivant on vous demandera d’autoriser Element à toujours fonct
 
     <string name="no_valid_google_play_services_apk">Aucun APK des services Google Play valide n’a été trouvé. Les notifications peuvent ne pas fonctionner correctement.</string>
 
-    <string name="store_title">Element - Communiquez, à votre façon</string>
-    <string name="store_short_description">Une application de discussion sécurisée universelle que vous contrôlez.</string>
-    <string name="store_full_description">"Une application de discussion, que vous contrôlez et entièrement flexible. Element vous laisse communiquer comme vous le souhaitez. Conçu pour [matrix], le standard pour les communications libres et décentralisées.
-
-Créez un compte matrix.org gratuit, gérez votre propre serveur sur https://modular.im ou utilisez un autre serveur Matrix.
-
-Pourquoi choisir Element ?
-
-• COMMUNICATION COMPLÈTE : Construisez des salons autours de vos équipes, de vos amis, de votre communauté comme vous le souhaitez ! Discutez, partagez des fichiers, ajoutez des widgets et passez des appels audio et vidéo gratuitement.
-
-• INTÉGRATIONS PUISSANTES : Utilisez Element avec les outils que vous connaissez déjà. Avec Element vous pouvez même discuter avec les utilisateurs et les groupes qui utilisent d’autres applications de discussion.
-
-• PRIVÉ ET SÉCURISÉ : Gardez vos conversations secrètes. Un chiffrement de bout en bout de pointe vous garanti que vos communications privées restent privées.
-
-• OUVERT, PAS FERMÉ : Open source, et construit autour de Matrix. Restez en possession de vos données en hébergeant votre propre serveur, ou choisissez celui auquel vous faites confiance.
-
-• PARTOUT OÙ VOUS ÊTES : Restez en contact où que vous soyez avec la synchronisation complète de l’historique de vos messages entre vos différents appareils et en ligne sur https://riot.im."</string>
-
     <string name="video_call_in_progress">Appel vidéo en cours…</string>
 
-    <string name="store_whats_new">"Nous sommes constamment en train de modifier et d’améliorer Element.
-Le journal des modifications peut être consulté ici : %1$s.
-Afin d’être sûr de ne rien manquer, continuez à installer les mises à jour."</string>
     <string name="title_activity_keys_backup_setup">Sauvegarde de clés</string>
     <string name="title_activity_keys_backup_restore">Utiliser la sauvegarde de clés</string>
     <string name="keys_backup_is_not_finished_please_wait">La sauvegarde des clés n’est pas terminée, veuillez patienter…</string>
@@ -1161,7 +1128,6 @@ Afin d’être sûr de ne rien manquer, continuez à installer les mises à jour
     <string name="done">Terminé</string>
 
     <string name="settings_notification_advanced">Paramètres de notification avancés</string>
-    <string name="settings_notification_advanced_summary">Régler l’importance des notifications par évènement, configurer le son, les led, les vibrations</string>
     <string name="settings_notification_by_event">Importance des notifications par évènement</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Paramètres personnalisés.</string>
@@ -1238,7 +1204,6 @@ Attention : ce fichier pourrait être supprimé si l’application est désinsta
     <string name="keys_backup_recovery_code_error_decrypt">La sauvegarde n’a pas pu être déchiffrée avec cette clé de récupération : veuillez vérifier que vous avez saisi la bonne clé de récupération.</string>
 
     <string name="keys_backup_restore_success_title">Sauvegarde restaurée %s !</string>
-    <string name="keys_backup_restore_success_description">%1$d clés de session restaurées et %2$d nouvelles clés ajoutées qui étaient inconnues à cette session</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Sauvegarde restaurée avec %d clé.</item>
         <item quantity="other">Sauvegarde restaurée avec %d clés.</item>
@@ -1510,12 +1475,6 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="keys_backup_unable_to_get_trust_info">Une erreur est survenue lors de la récupération des informations de confiance</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Une erreur est survenue lors de la récupération des données de sauvegarde de clés</string>
 
-    <string name="alpha_disclaimer_title">Bienvenue à la bêta !</string>
-    <string name="alpha_disclaimer_content_line_1">Comme Element est au début de son développement, il se peut que certaines fonctionnalités soient manquantes et que vous rencontriez quelques anomalies.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">La dernière liste de fonctionnalités est toujours dans la %1$s, et si vous rencontrez des anomalies, envoyez un rapport dans le menu en haut à gauche de l’accueil et nous les règlerons aussi vite que possible.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">description du Play Store</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Si vous rencontrez des anomalies, envoyez un rapport dans le menu en haut à gauche de l’accueil et nous les règlerons aussi vite que possible.</string>
-
     <string name="import_e2e_keys_from_file">Importer les clés de chiffrement depuis le fichier « %1$s ».</string>
 
     <string name="settings_sdk_version">Version du SDK de Matrix</string>
@@ -1553,16 +1512,6 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="settings_labs_show_hidden_events_in_timeline">Afficher les évènements cachés dans les discussions</string>
 
-    <string name="store_riotx_title">Element − Client Matrix nouvelle génération</string>
-    <string name="store_riotx_short_description">Un client pour Matrix plus rapide et plus léger utilisant les derniers frameworks Android</string>
-    <string name="store_riotx_full_description">Element est un nouveau client pour le protocole Matrix (Matrix.org) : un réseau ouvert pour des communications sécurisées et décentralisées. Element est une réécriture complète du client Android Riot, basée sur une réécriture complète du SDK Android de Matrix.
-\n
-\nMise en garde : Ceci est une version bêta. Element est actuellement en plein développement et a des limites et (peu, nous l’espérons) des anomalies. Tout commentaire est le bienvenu !
-\n
-\nElement prend en charge : • Se connecter à un compte existant • Créer de salons et rejoindre des salons publics • Accepter et refuser des invitations • Lister les salons des utilisateurs • Voir les informations des salons • Envoyer des messages texte • Envoyer des pièces jointes • Lire et écrire des messages dans les salons chiffrés • Chiffrement : sauvegarde des clés de chiffrement, vérification avancée des appareils, demande et réponse de partage de clé • Notifications • Thèmes clair, sombre et noir
-\n
-\nToutes les fonctionnalités de Element ne sont pas encore implémentées dans Element. Principales fonctionnalités manquantes (et qui arrivent bientôt !) : • Réglages des salons (lister les membres du salon etc.) • Appels • Widgets • …</string>
-
     <string name="bottom_action_people_x">Messages directs</string>
 
     <string name="send_file_step_idle">Attente…</string>
@@ -1576,9 +1525,6 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="edited_suffix">(édité)</string>
 
-    <string name="riotx_no_registration_notice">%1$s pour créer un compte.</string>
-    <string name="riotx_no_registration_notice_colored_part">Utilisez l’ancienne application</string>
-
 
     <string name="message_edits">Éditions de message</string>
     <string name="no_message_edits_found">Aucune édition trouvée</string>
@@ -1613,11 +1559,6 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="widget_integration_review_terms">Pour continuer, vous devez accepter les conditions de ce service.</string>
 
-    <string name="security_warning_identity_server">Les versions précédentes de Element avaient un problème de sécurité qui pouvait permettre à votre serveur d’identité (%1$s) d’accéder à votre compte. Si vous faites confiance à %2$s, vous pouvez ignorer cela ; sinon déconnectez-vous et reconnectez-vous.
-\n
-\nVous trouverez plus de détails ici :
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="terms_of_service">Conditions de service</string>
     <string name="review_terms">Examiner les conditions</string>
     <string name="terms_description_for_identity_server">Être découvrable par les autres</string>
@@ -1714,7 +1655,6 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="a11y_hide_password">Masquer le mot de passe</string>
     <string name="a11y_jump_to_bottom">Sauter en bas de page</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s et %3$d autres ont lu</string>
     <string name="three_users_read">%1$s, %2$s et %3$s ont lu</string>
     <string name="two_users_read">%1$s et %2$s ont lu</string>
     <string name="one_user_read">%s a lu</string>
@@ -1989,7 +1929,6 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="settings_developer_mode_fail_fast_title">Défaillance rapide</string>
     <string name="settings_developer_mode_fail_fast_summary">Element peut planter plus souvent quand une erreur inattendue survient</string>
-    <string name="command_description_verify">Demande de vérification de l’identifiant utilisateur fourni</string>
     <string name="command_description_shrug">Préfixe ¯\\_(ツ)_/¯ à un message en texte brut</string>
 
     <string name="create_room_encryption_title">Activer le chiffrement</string>
@@ -2210,7 +2149,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Les clés sont déjà à jour !</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="settings_key_requests">Demandes de clé</string>
 
@@ -2309,7 +2248,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="settings_messages_in_e2e_group_chat">Messages chiffrés dans les discussions de groupe</string>
     <string name="settings_when_rooms_are_upgraded">Quand les salons sont mis à niveau</string>
     <string name="settings_troubleshoot_title">Résolution de problèmes</string>
-    <string name="settings_notification_advanced_summary_riotx">Définir l’importance des notifications par évènement</string>
+    <string name="settings_notification_advanced_summary">Définir l’importance des notifications par évènement</string>
 
     <string name="command_description_plain">Envoie un message en texte simple, sans l’interpréter comme du Markdown</string>
 
@@ -2350,12 +2289,12 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="change_password_summary">Définir un nouveau mot de passe de compte…</string>
 
     <string name="use_other_session_content_description">Utilisez la dernière version de Element sur vos autres appareils : Element Web, Element pour Bureau, Element iOS, Element pour Android, ou un autre client Matrix qui prend en charge la signature croisée</string>
-    <string name="riot_desktop_web">Element Web
+    <string name="app_desktop_web">Element Web
 \nElement pour Bureau</string>
-    <string name="riot_ios_android">Element iOS
-\nElement pour Android</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
     <string name="or_other_mx_capabale_client">ou un autre client Matrix qui prend en charge la signature croisée</string>
-    <string name="use_latest_riot">Utilisez la dernière version de Element sur vos autres appareils :</string>
+    <string name="use_latest_app">Utilisez la dernière version de Element sur vos autres appareils :</string>
     <string name="command_description_discard_session">Force la session de groupe sortante actuelle dans un salon chiffré à être abandonnée</string>
     <string name="command_description_discard_session_not_handled">Seulement pris en charge dans les salons chiffrés</string>
     <string name="enter_secret_storage_passphrase_or_key">Utilisez votre %1$s ou votre %2$s pour continuer.</string>
diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml
index c0a85a67d1..a2200a88bf 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@@ -538,7 +538,6 @@ Pode engadir a dirección de correo na sección de configuración de perfil.</st
     <string name="login_error_unable_register">Non se puido rexistrar</string>
     <string name="login_error_unable_register_mail_ownership">Non se puido rexistrar: erro coa propiedade do correo electrónico</string>
     <string name="login_error_invalid_home_server">Introduza unha URL válida</string>
-    <string name="login_mobile_device">Móbil</string>
 
     <string name="login_error_forbidden">Usuario/contrasinal incorrecto</string>
     <string name="login_error_bad_json">JSON con defectos</string>
diff --git a/vector/src/main/res/values-hr/strings.xml b/vector/src/main/res/values-hr/strings.xml
index 955d3bc8d1..acd24b2491 100644
--- a/vector/src/main/res/values-hr/strings.xml
+++ b/vector/src/main/res/values-hr/strings.xml
@@ -269,7 +269,6 @@
     <string name="login_error_no_homeserver_found">Ovo nije ispravna adresa poslužitelja Matrixa</string>
     <string name="login_error_homeserver_not_found">Poslužitelj na ovom URL-u je nedostupan, provjerite ga</string>
     <string name="login_error_ssl_handshake">Vaš uređaj koristi zastario sigurnosni protokol TLS podložan napadima pa se nećete moći spojiti radi vlastite sigurnosti</string>
-    <string name="login_mobile_device">Mobitel</string>
 
     <string name="login_error_forbidden">Neispravno korisničko ime/lozinka</string>
     <string name="login_error_unknown_token">Navedena pristupna oznaka nije prepoznata</string>
@@ -279,10 +278,6 @@
     <string name="login_error_user_in_use">Ovo se korisničko ime već koristi</string>
     <string name="login_error_login_email_not_yet">Još uvijek niste kliknuli na poveznicu u e-pošti</string>
 
-    <string name="e2e_need_log_in_again">Morate se ponovno prijaviti kako bi se generirali ključevi za šifriranje od kraja do kraja za ovu sesiju i poslati javni ključ na Vaš poslužitelj.
-\nOvo morate napraviti samo jednom.
-\nOprostite na neugodnosti.</string>
-
     <string name="e2e_re_request_encryption_key">Ponovno zatražite ključeve za šifriranje od Vaših drugih sesija.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Zahtjev za ključ je poslan.</string>
@@ -318,7 +313,7 @@
     <string name="room_info_room_topic">Tema sobe</string>
 
     <string name="settings_call_category">Pozivi</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Koristi zadan zvuk tona Elementa za dolazne pozive</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Koristi zadan zvuk tona Elementa za dolazne pozive</string>
     <string name="settings_call_ringtone_use_default_stun">Dozvoli rezervnog poslužitelja za pozivnog pomoćnika</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Koristit će se %s kao pomoćnik u slučaju da ga Vaš poslužitelj nema (Vaša IP adresa će biti podijeljena tijekom poziva)</string>
     <string name="settings_call_ringtone_title">Zvuk tona dolaznog poziva</string>
@@ -595,7 +590,6 @@
 
 
     <string name="settings_notification_advanced">Napredne postavke obavijesti</string>
-    <string name="settings_notification_advanced_summary">Postavite važnost obavijesti po događajima, podesite zvuk, indikatorsku lampicu i vibriranje</string>
     <string name="settings_notification_by_event">Važnost obavijesti po događajima</string>
 
     <string name="settings_notification_privacy">Privatnost obavještavanja</string>
@@ -1046,9 +1040,6 @@
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Nije pronađen valjajući APK Usluga za Google Play. Moguće je da obavijesti neće ispravno raditi.</string>
 
-    <string name="store_title">Element - Komunicirajte onako kako Vama odgovara</string>
-    <string name="store_whats_new">Stalno radimo na izmjenama i poboljšanjima Element-a. Cjelovit dnevnik izmjena je moguće pronaći u %1$s. Kako biste ostali informirani o novostima, imajte omogućeno ažuriranje.</string>
-    <string name="store_short_description">Univerzalna aplikacija za sigurno ćaskanje pod Vašom kontrolom.</string>
     <string name="passphrase_create_passphrase">Napravi fraza-lozinku</string>
     <string name="passphrase_confirm_passphrase">Potvrdi fraza-lozinku</string>
     <string name="passphrase_enter_passphrase">Unesite fraza-lozinku</string>
@@ -1075,11 +1066,6 @@
     <string name="identity_server_not_defined">Ne koristite poslužitelja identiteta</string>
     <string name="identity_server_not_defined_for_password_reset">Nije podešen poslužitelj identiteta. Potreban je za poništavanje Vaše lozinke.</string>
 
-    <string name="security_warning_identity_server">Prijašnje inačice Elementa imale su sigurnosni propust koji bi Vašem poslužitelju identiteta (%1$s) omogućio pristup Vašem računu. Ako vjerujete %2$s, možete ovo zanemariti. U suprotnom se odjavite i ponovno prijavite.
-\n
-\nOvdje možete pronaći više informacija:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="error_user_already_logged_in">Čini se da se pokušavate spojiti na drugi poslužitelj. Želite li se odjaviti\?</string>
 
     <string name="edit">Uredi</string>
@@ -1127,8 +1113,6 @@
 
     <string name="create_room_title">Nova soba</string>
     <string name="create_room_action_create">IZRADI</string>
-    <string name="riotx_no_registration_notice">%1$s kako biste otvorili račun.</string>
-    <string name="riotx_no_registration_notice_colored_part">Koristite staru aplikaciju</string>
 
 
     <string name="message_edits">Uređivanja poruka</string>
@@ -1302,7 +1286,6 @@
     <string name="encryption_import_import">Uvezi</string>
     <string name="encryption_never_send_to_unverified_devices_title">Šifriraj samo ka potvrđenim sesijama</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Nikada iz ove sesije ne šalji šifrirane poruke nepotvrđenim sesijama.</string>
-    <string name="encryption_import_room_keys_success">%1$d od %2$d ključ(eva) je uspješno uvezeno.</string>
 
     <string name="encryption_information_not_verified">Nije potvrđeno</string>
     <string name="encryption_information_verified">Potvrđeno</string>
@@ -1322,10 +1305,6 @@
     <string name="encryption_information_verify_device_warning2">Ako se ne podudaraju, sigurnost Vaše komunikacije može biti narušena.</string>
     <string name="encryption_information_verify_key_match">Potvrđujem da ključevi odgovaraju</string>
 
-    <string name="e2e_enabling_on_app_update">Element podržava šifriranje s kraja na kraj, no trebat ćete se ponovno prijaviti kako biste ga omogućili.
-\n
-\nTo možete sada učiniti ili kasnije iz postavki aplikacije.</string>
-
     <string name="unknown_devices_alert_title">Soba sadrži nepoznate sesije</string>
     <string name="select_room_directory">Odaberite popis soba</string>
     <string name="directory_server_fail_to_retrieve_server">Moguće je da je poslužitelj nedostupan ili preopterećen</string>
@@ -1617,12 +1596,6 @@
 
     <string name="keys_backup_unable_to_get_keys_backup_data">Došlo je do greške pri dohvaćanju podataka iz sigurnosne kopije ključeva</string>
 
-    <string name="alpha_disclaimer_title">Dobrodošli u radnu inačicu!</string>
-    <string name="alpha_disclaimer_content_line_1">Obzirom da je Element u fazi ranog razvoja, neke značajke mogu nedostajati i moguće su greške u aplikaciji.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">Najnoviji popis značajki se uvijek nalazi na %1$s. Ako nađete greške u aplikaciji, budite ljubazni pa pošaljite izvještaj pomoću izbornika u gornje-lijevom kutu Početne stranice. Razvijatelji će ispraviti greške čim prije.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Opis za trgovinu Play</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Ako nađete greške u aplikaciji, budite ljubazni pa pošaljite izvještaj pomoću izbornika u gornje-lijevom kutu Početne stranice. Razvijatelji će ispraviti greške čim prije.</string>
-
     <string name="import_e2e_keys_from_file">Uvezi ključeve za E2E iz datoteke \"%1$s\".</string>
 
     <string name="settings_sdk_version">Inačica Matrix SDK-a</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 9c5702a38f..a2dcd0ea22 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -181,8 +181,6 @@ Az e-mail címed a beállításoknál adhatod a profilodhoz.</string>
     <string name="login_error_user_in_use">Ez a felhasználónév már foglalt</string>
     <string name="login_error_login_email_not_yet">Az e-mailban található linkre még nem kattintottak</string>
 
-    <string name="e2e_need_log_in_again">Újra be kell jelentkeznie, hogy egy új végtől végig titkosító kulcsot generáljon ehhez a munkamenethez és beküldeni a nyilvános kulcsot a Matrix szervernek. Ez egy egyszeri dolog. Elnézést a kellemetlenségért.</string>
-
     <string name="read_receipts_list">Lista azokról akik elolvasták</string>
 
     <string name="compression_options">Küldés mint</string>
@@ -594,10 +592,6 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="encryption_information_verify_device_warning2">Ha egyezik, nyomja meg a hitelesítés gombot. Ha nem, akkor valaki más elfogta ezt a munkamenetet és érdemes lenne tiltólistára tenni. A jövőben ez a hitelesítési mód kényelmesebbé lesz téve.</string>
     <string name="encryption_information_verify_key_match">Hitelesítem, hogy a kulcsok egyeznek</string>
 
-    <string name="e2e_enabling_on_app_update">Mostantól a Element támogatja a végtől végig titkosítást de előtte újra be kell jelentkezned, hogy bekapcsold.
-
-Ezt megteheted most vagy később az alkalmazás beállítások alatt.</string>
-
     <string name="unknown_devices_alert_title">Szoba ismeretlen munkameneteket tartalmaz</string>
     <string name="unknown_devices_alert_message">Ez a szoba ismeretlen munkameneteket tartalmaz.
 \nEz azt jelenti, hogy nem biztos hogy a munkamenet azé akinek mondja magát.
@@ -653,8 +647,6 @@ Ezt megteheted most vagy később az alkalmazás beállítások alatt.</string>
     <string name="dark_theme">Sötét téma</string>
     <string name="black_them">Fekete téma</string>
 
-    <string name="login_mobile_device">Mobil</string>
-
     <string name="settings_notification_ringtone">Értesítés hangja</string>
     <string name="settings_12_24_timestamps">Időbélyegek mutatása 12 órás formátumban</string>
 
@@ -1032,7 +1024,7 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="markdown_has_been_disabled">Markdown tiltva.</string>
 
     <string name="settings_call_category">Hívások</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Az alapértelmezett Element csengőhang használata bejövő hívásokhoz</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Az alapértelmezett Element csengőhang használata bejövő hívásokhoz</string>
     <string name="settings_call_ringtone_title">Bejövő hívás csengőhangja</string>
     <string name="settings_call_ringtone_dialog_title">Csengőhang kiválasztása hívásokhoz:</string>
 
@@ -1040,8 +1032,6 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
 
     <string name="auth_accept_policies">Kérlek nézd át és fogadd el a Matrix szerver felhasználói feltételeit:</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d kulcs sikeresen betöltve.</string>
-
     <string name="settings_notification_troubleshoot">Értesítéshibák felderítése</string>
     <string name="settings_troubleshoot_diagnostic">Hibakereső diagnosztika</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Tesztek futtatása</string>
@@ -1124,29 +1114,8 @@ A következő képernyőn el kell fogadnod, hogy a Element folyamatosan fusson a
 
     <string name="no_valid_google_play_services_apk">Érvényes Google Play Services APK nem található. Az értesítések megbízhatatlanul működhetnek.</string>
 
-    <string name="store_title">Element - Beszélgess, ahogy tetszik</string>
-    <string name="store_short_description">Egy biztonságos és univerzális csevegő alkalmazás az irányításod alatt.</string>
-    <string name="store_full_description">A csevegő alkalmazás ami személyre szabható és az irányításod alatt marad. Element megteremti a lehetőséget, hogy úgy beszélgess ahogy szeretnél. A [matrix] hálózathoz tervezve - ami egy nyílt és elosztott hálózat.
-\n
-\nKészíts egy ingyenes matrix.org fiókot vagy igényelj egy saját szervert a https://modular.im -től, de üzemeltethetsz is saját Matrix szervert.
-\n
-\nMiért válaszd a Element-et\?
-\n
-\n• TELJES KOMMUNIKÁCIÓ: Nyiss szobákat a csoportod, barátaid, közösséged vagy bárkiknek akiknek szeretnél! Beszélgess, ossz meg fájlokat, adj hozzá kisalkalmazásokat és indíts hang és videóhívásokat - teljesen ingyen.
-\n
-\n• ERŐS KAPCSOLATOK: Használd a Element-ot a kedvenc eszközeiddel. A Elementtal még másik rendszerekben lévő emberekkel és csoportokkal is képes lehetsz beszélgetni.
-\n
-\n• SZEMÉLYES ÉS BIZTONSÁGOS: Tartsd a beszélgetéseidet titokban. A végponttól-végpontig titkosítás biztosítja, hogy a személyes beszélgetések személyesek maradnak.
-\n
-\n• NYÍLT ÉS NEM ZÁRT: Nyílt forrású és a Matrix-hoz készült. Az adataid maradjanak a birtokodban a saját szerver üzemeltetésével vagy válassz olyan szervert amiben megbízol.
-\n
-\n• MINDENHOL AMERRE JÁRSZ: Maradj kapcsolatban a többiekkel mindenhol az eszközeid közötti teljesen szinkronizált üzenetváltásokkal. Akár a https://riot.im -en.</string>
-
     <string name="video_call_in_progress">Videóhívás folyamatban…</string>
 
-    <string name="store_whats_new">"Folyamatosan változtatjuk és javítjuk a Element-et.
-A változások teljes listája itt található: %1$s.
-Nehogy lemaradj bármiről, ezért továbbra is engedélyezd a frissítéseket."</string>
     <string name="title_activity_keys_backup_setup">Kulcsmentés</string>
     <string name="title_activity_keys_backup_restore">Kulcsmentés használata</string>
     <string name="keys_backup_is_not_finished_please_wait">A kulcsok biztonsági mentése még tart, kérlek várj…</string>
@@ -1155,7 +1124,6 @@ Nehogy lemaradj bármiről, ezért továbbra is engedélyezd a frissítéseket."
     <string name="done">Kész</string>
 
     <string name="settings_notification_advanced">Haladó Értesítés beállítások</string>
-    <string name="settings_notification_advanced_summary">Értesítés fontosságának beállítása eseménynél. Hang, led, vibráció beállítása</string>
     <string name="settings_notification_by_event">Értesítés fontosságának beállítása eseménynél</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Egyedi beállítások.</string>
@@ -1232,7 +1200,6 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törlik.</s
     <string name="keys_backup_recovery_code_error_decrypt">A mentést nem lehet visszafejteni ezzel a visszaállítási kulccsal: kérlek ellenőrizd, hogy helyes visszaállítási kulcsot adtad-e meg.</string>
 
     <string name="keys_backup_restore_success_title">Mentés visszaállítva %s!</string>
-    <string name="keys_backup_restore_success_description">Visszaállítva: %1$d kapcsolati kulcs, és %2$d kulcs, ami(k) ismeretlenek voltak a munkamenet számára, hozzáadva</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Mentés visszaállítva %d kulccsal.</item>
         <item quantity="other">Mentés visszaállítva %d kulccsal.</item>
@@ -1504,12 +1471,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="keys_backup_unable_to_get_trust_info">A megbízhatósági információ beszerzésekor hiba történt</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">A kulcs mentés adatainak beszerzésekor hiba történt</string>
 
-    <string name="alpha_disclaimer_title">Üdv a béta verzióban!</string>
-    <string name="alpha_disclaimer_content_line_1">Amíg a Element újdonsült fejlesztés, néhány funkció hiányozhat és találkozhatsz hibákkal.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">A legfrissebb funkciók listáját itt találod: %1$s, és ha hibát találsz kérlek küldj egy jelentést róla a Kezdő oldal bal felső sarkában lévő menüvel és ahogy tudjuk javítjuk.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play áruház leírás</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Ha hibát találsz kérlek küldj egy jelentést róla a Kezdő oldal bal felső sarkában lévő menüvel és ahogy tudjuk javítjuk.</string>
-
     <string name="import_e2e_keys_from_file">Végponttól végpontig titkosítás kulcsainak betöltése ebből a fájlból: \"%1$s\".</string>
 
     <string name="settings_sdk_version">Matrix SDK Verzió</string>
@@ -1547,16 +1508,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="settings_labs_show_hidden_events_in_timeline">Rejtett események megjelenítése az idővonalon</string>
 
-    <string name="store_riotx_title">Element - Matrix Kliens Új Nemzedéke</string>
-    <string name="store_riotx_short_description">A gyorsabb és kisebb Matrix kliens ami a legfrissebb Android keretrendszert használja</string>
-    <string name="store_riotx_full_description">Element a Matrix protokollhoz (Matrix.org) készült új kliens: nyílt hálózat biztonságos és decentralizált kommunikációhoz. Element a Riot Android kliens teljesen újraírt változata ami a teljesen újraírt Matrix Android SDK-ra épül.
-\n
-\nFigyelmeztetés: Ez egy béta verzió. Element aktív fejlesztés alatt áll és vannak korlátai és (reméljük nem olyan sok) hibái. Minden visszajelzést szívesen fogadunk!
-\n
-\nElement ezeket támogatja: • Bejelentkezés létező fiókba • Szoba készítés és nyilvános szobába való belépés • Meghívók fogadása és elutasítás • Felhasználók szobáinak listázása • Szoba adatainak megtekintése • Szöveges üzenet küldése • Csatolmány küldése • Titkosított szobákban üzenetek olvasása és írása • Titkosítás: Végponttól végpontig titkosító kulcsok mentése, fejlett eszköz ellenőrzés, kulcs megosztás kérése és válasz • „Push” értesítések • Világos, sötét és fekete téma
-\n
-\nNem minden Element funkció támogatott a Element-ben jelenleg. A fő hiányzó (és hamarosan elérhető!) funkciók: • Szoba beállítások (szoba tagság mutatása, stb…) • Hívások • Kisalkalmazások • …</string>
-
     <string name="bottom_action_people_x">Közvetlen beszélgetés</string>
 
     <string name="send_file_step_idle">Várakozik…</string>
@@ -1570,9 +1521,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="edited_suffix">(szerkesztve)</string>
 
-    <string name="riotx_no_registration_notice">%1$s fiók készítéshez.</string>
-    <string name="riotx_no_registration_notice_colored_part">Használd a régi alkalmazást</string>
-
 
     <string name="message_edits">Üzenet szerkesztések</string>
     <string name="no_message_edits_found">Szerkesztések nem találhatók</string>
@@ -1607,11 +1555,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="widget_integration_review_terms">A továbblépéshez el kell fogadnod a Felhasználási feltételeket.</string>
 
-    <string name="security_warning_identity_server">A Element előző verziója egy biztonsági hibát tartalmazott ami az Azonosítási Szervernek (%1$s) hozzáférést adott a fiókodhoz. Ha megbízol a %2$s szerverben, akkor ezt figyelmen kívül hagyhatod különben jelentkezz ki és újra vissza.
-\n
-\nTovábbi információ itt:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="terms_of_service">Felhasználási feltételek</string>
     <string name="review_terms">Feltételek átnézése</string>
     <string name="terms_description_for_identity_server">Mások által is megtalálható legyél</string>
@@ -1708,7 +1651,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="a11y_hide_password">Jelszó elrejtése</string>
     <string name="a11y_jump_to_bottom">Végére ugrás</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s és %3$d olvasták</string>
     <string name="three_users_read">%1$s, %2$s és %3$s olvasták</string>
     <string name="two_users_read">%1$s és %2$s olvasták</string>
     <string name="one_user_read">%s olvasta</string>
@@ -1924,7 +1866,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \nKérlek kattints a benne lévő linkre a fiók készítés folytatásához.</string>
     <string name="login_validation_code_is_not_correct">A beírt kód helytelen. Kérlek ellenőrizd.</string>
     <string name="login_error_outdated_homeserver_title">Elavult matrix szerver</string>
-    <string name="login_error_outdated_homeserver_content">Ez a matrix szerver túl elavult a csatlakozáshoz. Kérd meg a matrix szerver adminisztrátorát a frissítésre.</string>
+    <string name="login_error_outdated_homeserver_content">Ez a Matrix szerver túl régi verziójú, így nem lehet csatlakozni hozzá. Kérd meg a Matrix szerver adminisztrátorát, hogy frissítse.</string>
 
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Túl sok kérés lett elküldve. %1$d másodperc múlva újrapróbálhatod…</item>
@@ -1984,7 +1926,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="settings_developer_mode_fail_fast_title">Összeomlás-hamar</string>
     <string name="settings_developer_mode_fail_fast_summary">Element a nem várt hibák esetén többször fog összeomlani</string>
-    <string name="command_description_verify">Az adott felhasználói azonosító ellenőrzésének kérése</string>
     <string name="command_description_shrug">Hozzáteszi a sima szöveges üzenethez ezt: ¯\\_(ツ)_/¯</string>
 
     <string name="create_room_encryption_title">Titkosítás engedélyezése</string>
@@ -2045,9 +1986,9 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \n
 \nA legnagyobb biztonság érdekében ezt tedd meg személyesen.</string>
     <string name="room_profile_not_encrypted_subtitle">Az üzenetek a szobában nincsenek végponttól végpontig titkosítva.</string>
-    <string name="room_profile_encrypted_subtitle">A szobában az üzenetek végponttól végpontig titkosítva vannak.
-\n
-\nAz üzeneteidet lakattal vannak biztosítva és csak neked és a címzetteknek van meg a kulcs hozzá.</string>
+    <string name="room_profile_encrypted_subtitle">A szobában az üzenetek végponttól végpontig titkosítva vannak. 
+\n 
+\nAz üzeneteidet zárolással vannak biztosítva és csak neked és a címzetteknek van meg a kulcs hozzá.</string>
     <string name="room_profile_section_security">Biztonság</string>
     <string name="room_profile_section_security_learn_more">Tudj meg többet</string>
     <string name="room_profile_section_more">További</string>
@@ -2205,7 +2146,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="keys_backup_restore_success_title_already_up_to_date">A kulcsok már frissek!</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="settings_key_requests">Kulcs kérések</string>
 
@@ -2304,7 +2245,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="settings_messages_in_e2e_group_chat">Titkosított üzenetek a csoportos beszélgetésekben</string>
     <string name="settings_when_rooms_are_upgraded">Ha a szobák fejlesztésre kerülnek</string>
     <string name="settings_troubleshoot_title">Hibakeresés</string>
-    <string name="settings_notification_advanced_summary_riotx">Értesítés fontosságának beállítása eseménynél</string>
+    <string name="settings_notification_advanced_summary">Értesítés fontosságának beállítása eseménynél</string>
 
     <string name="command_description_plain">Az üzenet elküldése sima szövegként anélkül, hogy „markdown” formázás lenne</string>
 
@@ -2344,12 +2285,12 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="error_adding_media_file_to_gallery">A média fájlt nem sikerült hozzáadni a Galériához</string>
     <string name="change_password_summary">Új fiók jelszó beállítása…</string>
 
-    <string name="riot_desktop_web">Element Web
+    <string name="app_desktop_web">Element Web
 \nElement Desktop</string>
-    <string name="riot_ios_android">Element iOS
-\nElement X for Android</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
     <string name="or_other_mx_capabale_client">vagy másik eszközök közötti hitelesítésre alkalmas Matrix kliensre</string>
-    <string name="use_latest_riot">A Element legújabb kliensét használd a többi eszközödön:</string>
+    <string name="use_latest_app">A Element legújabb kliensét használd a többi eszközödön:</string>
     <string name="command_description_discard_session">A jelenlegi csoport munkamenet törlését kikényszeríti a titkosított szobában</string>
     <string name="command_description_discard_session_not_handled">Csak a titkosított szobákban támogatott</string>
     <string name="enter_secret_storage_passphrase_or_key">Használd ezt: %1$s vagy ezt: %2$s a továbblépéshez.</string>
@@ -2436,4 +2377,41 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="identity_server_set_default_submit">%1$s használata</string>
     <string name="identity_server_set_alternative_notice">Vagy beírhatsz más azonosítási szerver URL-t</string>
     <string name="identity_server_set_alternative_notice_no_default">Add meg az azonosítási szerver URL-jét</string>
+    <string name="pause_video">Szünet</string>
+    <string name="action_copy">Másol</string>
+    <string name="dialog_title_success">Siker</string>
+
+    <string name="bottom_action_notification">Értesítések</string>
+    <string name="call_select_sound_device">Hangeszköz kiválasztása</string>
+    <string name="sound_device_phone">Telefon</string>
+    <string name="sound_device_speaker">Hangszóró</string>
+    <string name="sound_device_headset">Headset</string>
+    <string name="sound_device_wireless_headset">Vezeték nélküli headset</string>
+    <string name="call_switch_camera">Kamera váltás</string>
+    <string name="call_camera_front">Első</string>
+    <string name="call_camera_back">Hátsó</string>
+    <string name="call_format_turn_hd_off">HD kikapcsolása</string>
+    <string name="call_format_turn_hd_on">HD bekapcsolása</string>
+
+    <string name="login_error_ssl_other">SSL hiba.</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Hívás indítása előtt kérjen megerősítést</string>
+    <string name="active_call_with_duration">Aktív hívás (%s)</string>
+    <string name="return_to_call">Visszatérés a híváshoz</string>
+
+    <string name="room_participants_action_ignore_title">Felhasználó figyelmen kívül hagyása</string>
+    <string name="room_participants_kick_title">Felhasználó kirúgása</string>
+    <string name="room_participants_kick_reason">Kirúgás oka</string>
+    <string name="room_participants_ban_title">Felhasználó kitiltása a szobából</string>
+    <string name="room_participants_ban_reason">Kitiltás oka</string>
+    <string name="room_participants_unban_title">Felhasználó visszaengedése</string>
+    <string name="settings_secure_backup_section_title">Biztonsági mentés</string>
+    <string name="settings_secure_backup_manage">Kezelés</string>
+    <string name="settings_secure_backup_setup">Biztonsági mentés beállítása</string>
+    <string name="settings_secure_backup_reset">Biztonsági mentés alaphelyzetbe állítása</string>
+    <string name="settings_secure_backup_enter_to_setup">Beállítás ezen az eszközön</string>
+    <string name="settings_secure_backup_section_info">A titkosítási kulcsokat feltölti a szerverre, így megelőzi a titkosított üzenetekhez való hozzáférés elvesztését.</string>
+    <string name="reset_secure_backup_title">Új Biztonsági Kulcs generálása, vagy a jelenlegi mentésedhez új Biztonsági Jelmondat megadása.</string>
+    <string name="reset_secure_backup_warning">A jelenlegi Kulcsod vagy Jelmondatod ki lesz cserélve erre.</string>
+
+    <string name="disabled_integration_dialog_title">Az integrációk ki vannak kapcsolva</string>
 </resources>
diff --git a/vector/src/main/res/values-id/strings.xml b/vector/src/main/res/values-id/strings.xml
index d27d24ee9c..a8fe21f19e 100644
--- a/vector/src/main/res/values-id/strings.xml
+++ b/vector/src/main/res/values-id/strings.xml
@@ -224,10 +224,6 @@ Anda telah dikeluarkan dari semua perangkat dan tidak lagi menerima pemberitahua
     <string name="login_error_limit_exceeded">Pengajuan yang dikirimkan terlalu banyak</string>
     <string name="login_error_login_email_not_yet">Tautan email masih belum diklik</string>
 
-    <string name="e2e_need_log_in_again">Anda perlu masuk kembali untuk menghasilkan kunci enkripsi ujung-ke-ujung untuk perangkat ini dan menyerahkan kunci umum ke server awal Anda.
-Proses ini hanya dilakukan sekali saja.
-Mohon maaf untuk ketidaknyamannya.</string>
-
     <string name="read_receipts_list">Baca Daftar Penerimaan</string>
 
     <string name="compression_options">"Kirim sebagai "</string>
@@ -315,8 +311,6 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="go_on_with">lanjutkan dengan…</string>
     <string name="error_no_external_application_found">Maaf, tidak ada aplikasi eksternal yang mendukung apa yang ingin dilakukan.</string>
 
-    <string name="login_mobile_device">Perangkat Genggam</string>
-
     <string name="e2e_re_request_encryption_key"><u>Meminta ulang kunci enkripsi</u> dari perangkat Anda yang lain.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Permintaan kunci terkirim.</string>
@@ -715,9 +709,6 @@ Pembacaan pesan di Matrix serupa dengan email. Dengan kami melupakan pesan-pesan
     <string name="encryption_information_verify_device_warning2">Apabila cocok, tekan tombol verifikasi berikut.
 Apabila tidak, seseorang sedang menyadap perangkat ini dan mungkin perlu diblokir.
 Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
-    <string name="e2e_enabling_on_app_update">Element sekarang mendukung enkripsi ujung-ke-ujung tapi Anda perlu masuk kembali untuk mengaktifkannya.
-
-Ini bisa Anda lakukan sekarang atau nani dari pengaturan aplikasi.</string>
 
     <string name="unknown_devices_alert_message">Ruang ini terisi oleh perangkat tak dikenal yang belum diverifikasi.
 Ini berarti tidak ada jaminan pengguna perangkat tersebut sesuai dengan klaim mereka.
@@ -955,7 +946,7 @@ Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</strin
     <string name="auth_accept_policies">Mohon telaah dan terima kebijakan homeserver ini:</string>
 
     <string name="settings_call_category">Panggilan</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Gunakan nada dering semula Element untuk panggilan masuk</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Gunakan nada dering semula Element untuk panggilan masuk</string>
     <string name="settings_call_ringtone_title">Nada dering panggilan masuk</string>
     <string name="settings_call_ringtone_dialog_title">Pilih nada dering untuk panggilan:</string>
 
@@ -1053,7 +1044,6 @@ Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik
 
     <string name="action_sign_out_confirmation_simple">Anda yakin ingin mencopot akun\?</string>
     <string name="settings_notification_advanced">Pengaturan Pemberitahuan Lanjutan</string>
-    <string name="settings_notification_advanced_summary">Setel urgensi pemberitahuan lewat kejadian, Kelola suara, LED, getaran</string>
     <string name="settings_notification_by_event">Urgensi pemberitahuan lewat kejadian</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Pengaturan Sesukanya.</string>
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index d27d24ee9c..a8fe21f19e 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -224,10 +224,6 @@ Anda telah dikeluarkan dari semua perangkat dan tidak lagi menerima pemberitahua
     <string name="login_error_limit_exceeded">Pengajuan yang dikirimkan terlalu banyak</string>
     <string name="login_error_login_email_not_yet">Tautan email masih belum diklik</string>
 
-    <string name="e2e_need_log_in_again">Anda perlu masuk kembali untuk menghasilkan kunci enkripsi ujung-ke-ujung untuk perangkat ini dan menyerahkan kunci umum ke server awal Anda.
-Proses ini hanya dilakukan sekali saja.
-Mohon maaf untuk ketidaknyamannya.</string>
-
     <string name="read_receipts_list">Baca Daftar Penerimaan</string>
 
     <string name="compression_options">"Kirim sebagai "</string>
@@ -315,8 +311,6 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="go_on_with">lanjutkan dengan…</string>
     <string name="error_no_external_application_found">Maaf, tidak ada aplikasi eksternal yang mendukung apa yang ingin dilakukan.</string>
 
-    <string name="login_mobile_device">Perangkat Genggam</string>
-
     <string name="e2e_re_request_encryption_key"><u>Meminta ulang kunci enkripsi</u> dari perangkat Anda yang lain.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Permintaan kunci terkirim.</string>
@@ -715,9 +709,6 @@ Pembacaan pesan di Matrix serupa dengan email. Dengan kami melupakan pesan-pesan
     <string name="encryption_information_verify_device_warning2">Apabila cocok, tekan tombol verifikasi berikut.
 Apabila tidak, seseorang sedang menyadap perangkat ini dan mungkin perlu diblokir.
 Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
-    <string name="e2e_enabling_on_app_update">Element sekarang mendukung enkripsi ujung-ke-ujung tapi Anda perlu masuk kembali untuk mengaktifkannya.
-
-Ini bisa Anda lakukan sekarang atau nani dari pengaturan aplikasi.</string>
 
     <string name="unknown_devices_alert_message">Ruang ini terisi oleh perangkat tak dikenal yang belum diverifikasi.
 Ini berarti tidak ada jaminan pengguna perangkat tersebut sesuai dengan klaim mereka.
@@ -955,7 +946,7 @@ Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</strin
     <string name="auth_accept_policies">Mohon telaah dan terima kebijakan homeserver ini:</string>
 
     <string name="settings_call_category">Panggilan</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Gunakan nada dering semula Element untuk panggilan masuk</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Gunakan nada dering semula Element untuk panggilan masuk</string>
     <string name="settings_call_ringtone_title">Nada dering panggilan masuk</string>
     <string name="settings_call_ringtone_dialog_title">Pilih nada dering untuk panggilan:</string>
 
@@ -1053,7 +1044,6 @@ Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik
 
     <string name="action_sign_out_confirmation_simple">Anda yakin ingin mencopot akun\?</string>
     <string name="settings_notification_advanced">Pengaturan Pemberitahuan Lanjutan</string>
-    <string name="settings_notification_advanced_summary">Setel urgensi pemberitahuan lewat kejadian, Kelola suara, LED, getaran</string>
     <string name="settings_notification_by_event">Urgensi pemberitahuan lewat kejadian</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Pengaturan Sesukanya.</string>
diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index 5150d02c2c..202f2f399e 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -131,7 +131,6 @@
     <string name="auth_password_dont_match">Lykilorðin stemma ekki</string>
     <string name="auth_forgot_password">Gleymt lykilorð?</string>
     <string name="auth_username_in_use">Notandanafn er í notkun</string>
-    <string name="login_mobile_device">Farsími</string>
 
     <string name="login_error_bad_json">Gallað JSON</string>
     <plurals name="membership_changes">
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index eeffdee768..bade2d66b7 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -26,7 +26,7 @@
     <string name="share">Condividi</string>
     <string name="later">Ultimi</string>
     <string name="forward">Inoltra</string>
-    <string name="permalink">Permalink</string>
+    <string name="permalink">Collegamento permanente</string>
     <string name="view_source">Vedi il codice sorgente</string>
     <string name="view_decrypted_source">Vedi il codice sorgente decifrato</string>
     <string name="delete">Elimina</string>
@@ -169,7 +169,7 @@
     <string name="auth_recaptcha_message">Questo Home Server vorrebbe assicurarsi che tu non sia un robot</string>
     <string name="auth_username_in_use">Nome utente già in uso</string>
     <string name="auth_home_server">Home Server:</string>
-    <string name="auth_identity_server">Identity Server:</string>
+    <string name="auth_identity_server">Server identità:</string>
     <string name="auth_reset_password_next_step_button">Ho verificato il mio indirizzo email</string>
     <string name="auth_reset_password_message">Per reimpostare la password, inserisci l\'indirizzo email associato al tuo account:</string>
     <string name="auth_reset_password_missing_email">Va inserito l\'indirizzo email associato al tuo account.</string>
@@ -198,9 +198,6 @@
     <string name="login_error_login_email_not_yet">Il link nella mail non è ancora stato cliccato</string>
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">È necessario eseguire nuovamente l\'accesso per generare le chiavi crittografiche per questa sessione ed inviare la chiave pubblica all\'homeserver 
-\nQuesto inconveniente non capiterà più. 
-\nScusa per il disguido.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Elenco ricevute lette</string>
@@ -500,7 +497,7 @@
 
     <string name="settings_logged_in">Autenticato come</string>
     <string name="settings_home_server">Home Server</string>
-    <string name="settings_identity_server">Identity Server</string>
+    <string name="settings_identity_server">Server identità</string>
 
     <string name="settings_user_interface">Interfaccia utente</string>
     <string name="settings_interface_language">Lingua</string>
@@ -672,10 +669,6 @@
     <string name="encryption_information_verify_device_warning2">Se non corrispondono, la sicurezza delle tue comunicazioni potrebbe essere compromessa.</string>
     <string name="encryption_information_verify_key_match">Ho verificato che le chiavi corrispondono</string>
 
-    <string name="e2e_enabling_on_app_update">Element supporta ora la crittografia da-utente-a-utente, ma per abilitarla devi riconnetterti.
-\n
-\nPuoi farlo ora, o più tardi, dalle impostazioni dell\'applicazione.</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">La stanza contiene sessioni sconosciute</string>
     <string name="unknown_devices_alert_message">Questa stanza contiene sessioni sconosciute che non sono state verificate. 
@@ -735,8 +728,6 @@
     <string name="notification_listening_for_events">Rilevazione eventi</string>
     <string name="title_activity_bug_report">Segnalazione errore</string>
 
-    <string name="login_mobile_device">Smartphone</string>
-
     <string name="call">Chiama</string>
     <string name="encrypted_message">Messaggio criptato</string>
 
@@ -773,7 +764,7 @@
         <item quantity="one">1 utente</item>
         <item quantity="other">%d utenti</item>
     </plurals>
-    <string name="room_participants_ban_prompt_msg">Sei sicuro di voler bannare questo utente\?</string>
+    <string name="room_participants_ban_prompt_msg">Bandire l\'utente lo espellerà dalla stanza e gli impedirà di rientrare.</string>
 
     <plurals name="room_new_messages_notification">
         <item quantity="one">1 nuovo messaggio</item>
@@ -1088,7 +1079,7 @@
     <string name="markdown_has_been_disabled">Markdown è stato disabilitato.</string>
 
     <string name="settings_call_category">Chiamate</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Usa la suoneria predefinita di Element per le chiamate in arrivo</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Usa la suoneria predefinita di Element per le chiamate in arrivo</string>
     <string name="settings_call_ringtone_title">Suoneria delle chiamate in arrivo</string>
     <string name="settings_call_ringtone_dialog_title">Scegli la suoneria per le chiamate:</string>
 
@@ -1096,8 +1087,6 @@
 
     <string name="auth_accept_policies">Per favore, leggi e accetta i termini di servizio di questo Home Server:</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d chiav(i) importate con successo.</string>
-
     <string name="settings_notification_troubleshoot">Diagnostica delle notifiche</string>
     <string name="settings_troubleshoot_diagnostic">Diagnosi</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Esegui i test</string>
@@ -1180,27 +1169,8 @@
 
     <string name="no_valid_google_play_services_apk">Non è stato trovato nessun APK Google Play Services valido. Le notifiche non funzioneranno correttamente.</string>
 
-    <string name="store_title">Element - Comunica, a modo tuo</string>
-    <string name="store_short_description">Una App per chat universali, sicure ed interamente sotto il tuo controllo.</string>
-    <string name="store_full_description">Una App per chat flessibile e interamente sotto il tuo controllo. Element ti permette di comunicare a modo tuo. Creata per [matrix] - lo standard per le comunicazioni aperte, decentralizzate.
-\n 
-\nPuoi aprire un account matrix.org gratuito, creare il tuo server su https://modular.im o usare un altro server Matrix. 
-\n 
-\nPerché scegliere Element\?
-\n 
-\n• COMUNICAZIONE COMPLETA: crea stanze per discussione pubbliche o private per i tuoi team, i tuoi amici, la tua comunità - come preferisci! Chatta, condividi file, aggiungi widget e fai chiamate video o audio - tutto gratuito. 
-\n 
-\n• GRANDI INTEGRAZIONI: collega Element alle piattaforme che conosci ed ami. Con Element puoi addirittura chattare con utenti e gruppi che usano altre App di chat.
-\n 
-\n• PRIVATO E SICURO: tieni segrete le tue conversazioni. Una crittografia end-to-end allo stato dell\'arte assicura che le comunicazioni private restino sempre tali. 
-\n 
-\n• OPEN, NON CHIUSO: open source e costruito su Matrix. Riprendi il possesso dei tuoi dati creando il tuo server Matrix personale, o scegliendone uno di cui ti fidi. 
-\n 
-\n• OVUNQUE TU SIA: stai sul pezzo ovunque tu sia grazie la cronologia dei messaggi sempre sincronizzata tra i tuoi dispositivi ed online su https://riot.im.</string>
-
     <string name="video_call_in_progress">Chiamata video in corso…</string>
 
-    <string name="store_whats_new">Element continua a crescere e migliorare. Il registro completo delle modifiche si può trovare qui: %1$s. Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi.</string>
     <string name="title_activity_keys_backup_setup">Backup delle chiavi</string>
     <string name="title_activity_keys_backup_restore">Usa il Backup delle chiavi</string>
     <string name="keys_backup_is_not_finished_please_wait">Il Backup delle chiavi non è concluso, attendere prego…</string>
@@ -1227,7 +1197,6 @@
     <string name="auth_login_sso">Accedi con single sign-on</string>
     <string name="login_error_unknown_host">Questo URL è irraggiungibile. Per favore controllalo</string>
     <string name="login_error_ssl_handshake">"Il tuo dispositivo usa  un protocollo di sicurezza TLS obsoleto e vulnerabile agli attacchi. Per la tua sicurezza, ti viene impedito di connetterti"</string>
-    <string name="settings_notification_advanced_summary">Imposta i livelli di importanza delle notifiche in base al tipo. Configura i suoni, i led, e la vibrazione</string>
     <string name="settings_notification_by_event">Importanza delle notifiche in base al tipo</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Impostazioni personalizzate.</string>
@@ -1336,7 +1305,6 @@
     <string name="keys_backup_recovery_code_error_decrypt">Impossibile decifrare il backup con questo codice di recupero: verifica di avere inserito il codice di recupero corretto.</string>
 
     <string name="keys_backup_restore_success_title">Backup ripristinato %s !</string>
-    <string name="keys_backup_restore_success_description">Ripristinate %1$d chiavi di sessione e aggiunte %2$d nuove chiavi finora sconosciute a questa sessione</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Ripristinato un Backup con %d chiave.</item>
         <item quantity="other">Ripristinato un Backup con %d chiavi.</item>
@@ -1554,12 +1522,6 @@
     <string name="keys_backup_unable_to_get_trust_info">Si è verificato un errore nell\'ottenere informazioni sulla fiducia</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Si è verificato un errore nell\'ottenere i dati dal Backup delle chiavi</string>
 
-    <string name="alpha_disclaimer_title">Benvenuti nella beta!</string>
-    <string name="alpha_disclaimer_content_line_1">Mentre Element si trova nella fase iniziale dello sviluppo, potrebbero mancare alcune funzioni e potrebbero verificarsi errori.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">L\'elenco di funzioni più recenti è sempre nel %1$s, se trovi errori ti preghiamo segnalarli nel menu in alto a sinistra della Pagina Iniziale e noi li correggeremo appena possibile.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Descrizione nel Play Store</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Se trovi errori ti preghiamo segnalarli nel menu in alto a sinistra della Pagina Iniziale e noi li correggeremo appena possibile.</string>
-
     <string name="import_e2e_keys_from_file">Importa le chiavi di crittografia dal file \"%1$s\".</string>
 
     <string name="settings_sdk_version">Versione SDK Matrix</string>
@@ -1597,16 +1559,6 @@
 
     <string name="settings_labs_show_hidden_events_in_timeline">Mostra gli eventi nascosti nella Timeline</string>
 
-    <string name="store_riotx_title">Element - Client Matrix di nuova generazione</string>
-    <string name="store_riotx_short_description">Un client per Matrix più veloce e leggero che utilizza gli ultimi framework di Android</string>
-    <string name="store_riotx_full_description">Element è un nuovo client per il protocollo Matrix (Matrix.org): una rete aperta per comunicazioni sicure e decentralizzate. Element è stato completamente riscritto rispetto a Riot Android, ed è a sua volta basato su un SDK Android di Matrix totalmente riscritto.
-\n 
-\nDisclaimer: questa è una versione beta. Element è attualmente in uno sviluppo attivo e contiene ancora alcune limitazioni ed errori (speriamo non troppi). I suggerimenti sono ben accetti!
-\n 
-\nElement supporta: • Accesso ad account esistente • Crea stanze ed entra in stanze pubbliche • Accetta e rifiuta inviti • Elenca stanze utenti • Vedi dettagli stanza • Invia messaggi di testo • Invia allegati • Leggi e scrivi messaggi in stanze cifrate • Crypto: backup chiavi E2E, verifica avanzata dispositivi, richiesta e risposta condivisione chiavi • Notifiche push • Tema chiaro, scuro e nero
-\n 
-\nNon tutte le funzioni di Element sono già implementate in Element. Principali funzioni mancanti (prossimamente!): • Impostazioni stanza (elenca membri stanza, ecc.) • Chiamate • Widget • …</string>
-
     <string name="room_list_catchup_empty_title">Non hai nulla di nuovo da vedere!</string>
     <string name="bottom_action_people_x">Messaggi diretti</string>
 
@@ -1621,9 +1573,6 @@
 
     <string name="edited_suffix">(modificato)</string>
 
-    <string name="riotx_no_registration_notice">%1$s per creare un account.</string>
-    <string name="riotx_no_registration_notice_colored_part">Usa la vecchia app</string>
-
 
     <string name="message_edits">Modifiche messaggio</string>
     <string name="no_message_edits_found">Nessuna modifica trovata</string>
@@ -1640,7 +1589,7 @@
 
     <string name="link_copied_to_clipboard">Collegamento copiato negli appunti</string>
 
-    <string name="settings_integration_manager">Integration Manager</string>
+    <string name="settings_integration_manager">Gestore dell\'integrazione</string>
 
     <string name="integration_manager_not_configured">Non è stato configurato nessun Integration Manager.</string>
     <string name="add_by_matrix_id">Aggiungi per ID utente</string>
@@ -1658,11 +1607,6 @@
 
     <string name="widget_integration_review_terms">Per continuare devi accettare i termini di servizio.</string>
 
-    <string name="security_warning_identity_server">Alcune precedenti versioni di Element contenevano un errore di sicurezza che permetteva al tuo Identity Server (%1$s) di accedere al tuo account. Se ti fidi di %2$s, puoi ignorare questo avviso; altrimenti disconnettiti e riaccedi di nuovo.
-\n 
-\nLeggi maggiori dettagli qui: 
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="terms_of_service">Termini di servizio</string>
     <string name="review_terms">Leggi i termini di servizio</string>
     <string name="terms_description_for_identity_server">Fatti trovare dagli altri utenti</string>
@@ -1759,7 +1703,6 @@
     <string name="a11y_hide_password">Nascondi password</string>
     <string name="a11y_jump_to_bottom">Salta in fondo</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s ed altri %3$d hanno letto</string>
     <string name="three_users_read">%1$s, %2$s e %3$s hanno letto</string>
     <string name="two_users_read">%1$s e %2$s hanno letto</string>
     <string name="one_user_read">%s ha letto</string>
@@ -1776,7 +1719,7 @@
     <string name="attachment_type_camera">Fotocamera</string>
     <string name="attachment_type_audio">Audio</string>
     <string name="attachment_type_gallery">Galleria</string>
-    <string name="attachment_type_sticker">Sticker</string>
+    <string name="attachment_type_sticker">Adesivo</string>
     <string name="error_handling_incoming_share">Errore nella gestione dei dati condivisi</string>
 
     <string name="report_content_spam">È spam</string>
@@ -1864,7 +1807,7 @@
     <string name="room_join_rules_invite">%1$s ha reso la stanza solo ad invito.</string>
     <string name="timeline_unread_messages">Messaggi non letti</string>
 
-    <string name="login_splash_title">Libera le tue comunicazioni</string>
+    <string name="login_splash_title">È la tua conversazione. Tienitela.</string>
     <string name="login_splash_text1">Chatta con persone direttamente o in gruppi</string>
     <string name="login_splash_text2">Tieni private le conversazioni con la cifratura</string>
     <string name="login_splash_text3">Estendi e personalizza la tua esperienza</string>
@@ -2034,7 +1977,6 @@
 
     <string name="settings_developer_mode_fail_fast_title">Crash facile</string>
     <string name="settings_developer_mode_fail_fast_summary">Element potrebbe crashare più spesso quando si verifica un errore imprevisto</string>
-    <string name="command_description_verify">Richiedi di verificare l\'ID utente in questione</string>
     <string name="command_description_shrug">Antepone ¯\\_(ツ)_/¯ ad un messaggio testuale</string>
 
     <string name="create_room_encryption_title">Attiva la cifratura</string>
@@ -2255,7 +2197,7 @@
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Le chiavi sono già aggiornate!</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="settings_key_requests">Richieste di chiavi</string>
 
@@ -2354,7 +2296,7 @@
     <string name="settings_messages_in_e2e_group_chat">Messaggi cifrati in chat di gruppo</string>
     <string name="settings_when_rooms_are_upgraded">Quando le stanze vengono aggiornate</string>
     <string name="settings_troubleshoot_title">Risoluzione problemi</string>
-    <string name="settings_notification_advanced_summary_riotx">Imposta l\'importanza della notifica per evento</string>
+    <string name="settings_notification_advanced_summary">Imposta l\'importanza della notifica per evento</string>
 
     <string name="command_description_plain">Invia un messaggio come testo semplice, senza interpretarlo come markdown</string>
 
@@ -2395,12 +2337,12 @@
     <string name="change_password_summary">Imposta una nuova password dell\'account…</string>
 
     <string name="use_other_session_content_description">Usa l\'ultima versione di Element sui tuoi altri dispositivi, Element Web, Element Desktop, Element iOS, Element per Android o un altro client Matrix che supporti la firma incrociata</string>
-    <string name="riot_desktop_web">Element Web
+    <string name="app_desktop_web">Element Web
 \nElement Desktop</string>
-    <string name="riot_ios_android">Element iOS
-\nElement per Android</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
     <string name="or_other_mx_capabale_client">o un altro client Matrix che supporti la firma incrociata</string>
-    <string name="use_latest_riot">Usa l\'ultimo Element sui tuoi altri dispositivi:</string>
+    <string name="use_latest_app">Usa l\'ultimo Element sui tuoi altri dispositivi:</string>
     <string name="command_description_discard_session">Forza l\'attuale sessione di gruppo in uscita in una stanza cifrata ad essere scartata</string>
     <string name="command_description_discard_session_not_handled">Supportato solo nelle stanze cifrate</string>
     <string name="enter_secret_storage_passphrase_or_key">Usa la tua %1$s o la %2$s per continuare.</string>
@@ -2459,7 +2401,7 @@
     <string name="login_connect_using_matrix_id_notice">In alternativa, se hai già un account e conosci il tuo identificativo e password di Matrix, puoi usare questo metodo:</string>
     <string name="login_connect_using_matrix_id_submit">Accedi con il mio identificativo di Matrix</string>
     <string name="login_signin_matrix_id_title">Accedi</string>
-    <string name="login_signin_matrix_id_notice">Inserisci il tuo identificativo e la password</string>
+    <string name="login_signin_matrix_id_notice">Se configuri un account in un homeserver, usa il tuo ID Matrix (es. @utente:dominio.com) e la password qua sotto.</string>
     <string name="login_signin_matrix_id_hint">Identificativo utente</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Non è un identificativo valido. Formato previsto: \'@utente:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">Impossibile trovare un homeserver valido. Controlla il tuo identificativo</string>
@@ -2486,4 +2428,196 @@
     <string name="identity_server_set_alternative_notice_no_default">Inserisci l\'URL di un server di identità</string>
     <string name="identity_server_set_alternative_submit">Invia</string>
 
+    <string name="play_video">Riproduci</string>
+    <string name="pause_video">Pausa</string>
+    <string name="dismiss">Annulla</string>
+
+
+    <string name="action_copy">Copia</string>
+    <string name="dialog_title_success">Completato</string>
+
+    <string name="bottom_action_notification">Notifiche</string>
+    <string name="call_failed_no_connection">Telefonata di Element fallita</string>
+    <string name="call_failed_no_connection_description">Connessione in tempo reale fallita.
+\nChiedi all\'amministratore del tuo homeserver di configurare un server TURN per fare funzionare le chiamate.</string>
+
+    <string name="call_select_sound_device">Seleziona dispositivo audio</string>
+    <string name="sound_device_phone">Telefono</string>
+    <string name="sound_device_speaker">Altoparlante</string>
+    <string name="sound_device_headset">Cuffie</string>
+    <string name="sound_device_wireless_headset">Cuffie senza fili</string>
+    <string name="call_switch_camera">Cambia fotocamera</string>
+    <string name="call_camera_front">Frontale</string>
+    <string name="call_camera_back">Posteriore</string>
+    <string name="call_format_turn_hd_off">Disattiva l\'HD</string>
+    <string name="call_format_turn_hd_on">Attiva l\'HD</string>
+
+    <string name="login_error_ssl_peer_unverified">Errore SSL: l\'identità del peer non è stata verificata.</string>
+    <string name="login_error_ssl_other">Errore SSL.</string>
+    <string name="active_call_with_duration">Telefonata attiva (%s)</string>
+    <string name="return_to_call">Torna alla telefonata</string>
+
+    <string name="room_participants_action_cancel_invite">Annulla invito</string>
+    <string name="room_participants_power_level_demote_warning_title">Vuoi declassarti\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Non potrai annullare questa modifica dato che ti stai declassando, se sei l\'ultimo utente privilegiato nella stanza sarà impossibile ottenere di nuovo i privilegi.</string>
+    <string name="room_participants_power_level_demote">Declassa</string>
+
+
+    <string name="room_participants_action_ignore_title">Ignora utente</string>
+    <string name="room_participants_action_ignore_prompt_msg">Ignorando questo utente verranno rimossi i suoi messaggi dalle stanze che condividete.
+\n
+\nPuoi annullare questa azione in qualsiasi momento nelle impostazioni generali.</string>
+    <string name="room_participants_action_unignore_title">Non ignorare più</string>
+    <string name="room_participants_action_unignore_prompt_msg">Se non ignori più l\'utente vedrai di nuovo tutti i suoi messaggi.</string>
+    <string name="room_participants_action_cancel_invite_title">Annulla invito</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Sei sicuro di voler annullare l\'invito per questo utente\?</string>
+    <string name="room_participants_kick_title">Butta fuori l\'utente</string>
+    <string name="room_participants_kick_reason">Motivo</string>
+    <string name="room_participants_kick_prompt_msg">buttando fuori l\'utente verrà rimosso da questa stanza.
+\n
+\nPer evitare che possa rientrare, dovresti invece bandirlo.</string>
+    <string name="room_participants_ban_title">Bandisci l\'utente</string>
+    <string name="room_participants_ban_reason">Motivo del ban</string>
+    <string name="room_participants_unban_title">Togli il ban dell\'utente</string>
+    <string name="room_participants_unban_prompt_msg">Togliere il ban dell\'utente gli permetterà di rientrare nella stanza.</string>
+
+    <string name="settings_secure_backup_section_title">Backup Sicuro</string>
+    <string name="settings_secure_backup_manage">Gestisci</string>
+    <string name="settings_secure_backup_setup">Imposta il Backup Sicuro</string>
+    <string name="settings_secure_backup_reset">Reimposta il Backup Sicuro</string>
+    <string name="settings_secure_backup_enter_to_setup">Configura in questo dispositivo</string>
+    <string name="settings_secure_backup_section_info">Proteggiti contro la perdita dell\'accesso ai messaggi e dati cifrati facendo un backup delle chiavi crittografiche sul tuo server.</string>
+    <string name="reset_secure_backup_title">Genera una nuova chiave di sicurezza o imposta una nuova frase di sicurezza per il backup esistente.</string>
+    <string name="reset_secure_backup_warning">Ciò sostituirà la tua attuale chiave o frase.</string>
+
+    <string name="disabled_integration_dialog_title">Le integrazioni sono disattivate</string>
+    <string name="disabled_integration_dialog_content">Attiva \'Permetti integrazioni\' nelle impostazioni per continuare.</string>
+
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d utente bandito</item>
+        <item quantity="other">%d utenti banditi</item>
+    </plurals>
+
+    <string name="encryption_exported_successfully">Chiavi esportate correttamente</string>
+
+    <string name="active_widget_view_action">VEDI</string>
+    <string name="active_widgets_title">Widget attivi</string>
+
+
+    <string name="recovery_key_export_saved">La chiave di recupero è stata salvata.</string>
+
+    <string name="secure_backup_banner_setup_line1">Backup Sicuro</string>
+    <string name="secure_backup_banner_setup_line2">Proteggiti dalla perdita dei messaggi e dati crittografati</string>
+
+    <string name="secure_backup_setup">Imposta il Backup Sicuro</string>
+
+    <string name="labs_merge_e2e_in_timeline">Decifrazione del messaggio nella timeline fallita</string>
+    <string name="labs_show_unread_notifications_as_tab">Aggiungi una scheda dedicata per le notifiche non lette nella schermata principale.</string>
+
+    <string name="room_list_quick_actions_favorite_add">Aggiungi ai preferiti</string>
+    <string name="room_list_quick_actions_favorite_remove">Rimuovi dai preferiti</string>
+    <string name="notice_member_no_changes_by_you">Non hai fatto modifiche</string>
+    <string name="room_join_rules_public_by_you">Hai reso pubblica la stanza a chiunque conosca il link.</string>
+    <string name="room_join_rules_invite_by_you">Hai reso la stanza solo su invito.</string>
+    <string name="login_server_url_form_common_notice">Inserisci l\'indirizzo del server che vuoi usare</string>
+
+    <string name="login_signin_matrix_id_password_notice">Se non sai la tua password, torna indietro per reimpostarla.</string>
+    <string name="send_a_sticker">Adesivo</string>
+
+    <string name="room_profile_section_admin">Azioni amministratore</string>
+    <string name="room_member_power_level_default_in">Predefinito in %1$s</string>
+    <string name="settings_hs_admin_e2e_disabled">L\'amministratore del server ha disattivato la crittografia end-to-end in modo predefinito nelle stanze private e nei messaggi diretti.</string>
+    <string name="bootstrap_info_text_2">Inserisci una frase di sicurezza che conosci solo tu, usata per proteggere i segreti nel tuo server.</string>
+
+    <string name="bootstrap_cancel_text">Se annulli ora, potresti perdere i messaggi e dati cifrati se perdi l\'accesso ai tuoi login.
+\n
+\nPuoi anche configurare il backup sicuro e gestire le tue chiavi nelle impostazioni.</string>
+
+    <string name="room_created_summary_item_by_you">Hai creato e configurato la stanza.</string>
+
+    <string name="auth_invalid_login_deactivated_account">Questo account è stato disattivato.</string>
+
+    <string name="setup_cross_signing">Attiva la firma incrociata</string>
+    <string name="error_saving_media_file">Impossibile salvare il file multimediale</string>
+    <string name="power_level_edit_title">Imposta ruolo</string>
+    <string name="power_level_title">Ruolo</string>
+    <string name="a11y_open_chat">Apri chat</string>
+    <string name="a11y_mute_microphone">Spegni il microfono</string>
+    <string name="a11y_unmute_microphone">Accendi il microfono</string>
+    <string name="a11y_stop_camera">Ferma la fotocamera</string>
+    <string name="a11y_start_camera">Avvia la fotocamera</string>
+
+    <string name="settings_setup_secure_backup">Imposta il Backup Sicuro</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">Backup sicuro</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Proteggiti contro la perdita dell\'accesso ai messaggi e dati cifrati facendo un backup delle chiavi crittografiche sul tuo server.</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Configura</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Usa una chiave di sicurezza</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Genera una chiave di sicurezza da conservare in qualche posto sicuro, come un gestore di password o una cassaforte.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Usa una frase di sicurezza</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Inserisci una frase segreta che conosci solo tu e genera una chiave per backup.</string>
+
+    <string name="bottom_sheet_save_your_recovery_key_title">Salva la chiave di sicurezza</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Conserva la chiave di sicurezza in qualche posto sicuro, come un gestore di password o una cassaforte.</string>
+
+    <string name="set_a_security_phrase_title">Imposta una frase di sicurezza</string>
+    <string name="set_a_security_phrase_notice">Inserisci una frase di sicurezza che conosci solo tu, usata per proteggere i segreti nel tuo server.</string>
+    <string name="set_a_security_phrase_hint">Frase di sicurezza</string>
+    <string name="set_a_security_phrase_again_notice">Inserisci la frase di sicurezza di nuovo per confermarla.</string>
+
+    <string name="save_your_security_key_title">Salva la chiave di sicurezza</string>
+    <string name="save_your_security_key_notice">Conserva la chiave di sicurezza in qualche posto sicuro, come un gestore di password o una cassaforte.</string>
+
+    <string name="room_settings_name_hint">Nome stanza</string>
+    <string name="room_settings_topic_hint">Argomento</string>
+    <string name="room_settings_save_success">Hai cambiato le impostazioni della stanza correttamente</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">Non puoi accedere a questo messaggio</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">In attesa del messaggio, potrebbe volerci un po\'</string>
+    <string name="crypto_utd">Impossibile decifrare</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">A causa della crittografia end-to-end, devi aspettare che arrivi un messaggio di qualcuno poiché non ti sono state inviate correttamente le chiavi di crittografia.</string>
+    <string name="crypto_error_withheld_blacklisted">Non puoi accedere a questo messaggio perché sei stato bloccato dal mittente</string>
+    <string name="crypto_error_withheld_unverified">Non puoi accedere a questo messaggio perché la tua sessione non è fidata dal mittente</string>
+    <string name="crypto_error_withheld_generic">Non puoi accedere a questo messaggio perché il mittente non ha inviato le chiavi di proposito</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">In attesa della cronologia di crittografia</string>
+
+    <string name="element_disclaimer_title">Riot ora si chiama Element!</string>
+    <string name="element_disclaimer_content">Siamo entusiasti di annunciare che abbiamo cambiato nome! La tua app è aggiornata e hai fatto l\'accesso al tuo account.</string>
+    <string name="element_disclaimer_negative_button">CAPITO</string>
+    <string name="element_disclaimer_positive_button">MAGGIORI INFO</string>
+
+    <string name="element_login_splash_brand">element</string>
+
+
+    <string name="save_recovery_key_chooser_hint">Salva chiave di ripristino in</string>
+
+    <string name="add_from_phone_book">Aggiungi dalla mia rubrica</string>
+    <string name="empty_phone_book">La tua rubrica è vuota</string>
+    <string name="phone_book_title">Rubrica</string>
+    <string name="search_in_my_contacts">Cerca nei miei contatti</string>
+    <string name="loading_contact_book">Rilevazione dei tuoi contatti…</string>
+    <string name="empty_contact_book">Il tuo elenco di contatti è vuoto</string>
+    <string name="contacts_book_title">Elenco contatti</string>
+
+    <string name="three_pid_revoke_invite_dialog_title">Revoca invito</string>
+    <string name="three_pid_revoke_invite_dialog_content">Revocare l\'invito a %1$s\?</string>
+
+    <string name="member_banned_by">Bandito da %1$s</string>
+    <string name="failed_to_unban">Rimozione ban fallita</string>
+
+    <string name="alert_push_are_disabled_title">Le notifiche push sono disattivate</string>
+    <string name="alert_push_are_disabled_description">Verifica le tue impostazioni per attivare le notifiche push</string>
+    <string name="create_pin_title">Scegli un PIN di sicurezza</string>
+    <string name="create_pin_confirm_title">Conferma PIN</string>
+    <string name="create_pin_confirm_failure">Validazione PIN fallita, inseriscine uno nuovo.</string>
+    <string name="auth_pin_title">Inserisci il tuo PIN</string>
+    <string name="auth_pin_forgot">PIN dimenticato\?</string>
+    <string name="auth_pin_reset_title">Reimposta PIN</string>
+    <string name="auth_pin_new_pin_action">Nuovo PIN</string>
+    <string name="auth_pin_reset_content">Per reimpostare il PIN, dovrai riaccedere e crearne uno nuovo.</string>
+    <string name="settings_security_pin_code_title">Attiva PIN</string>
+    <string name="settings_security_pin_code_summary">Se vuoi reimpostare il PIN, tocca \"PIN dimenticato\" per disconnetterti e reimpostarlo.</string>
+    <string name="auth_pin_confirm_to_disable_title">Conferma il PIN per disattivarlo</string>
+    <string name="settings_call_show_confirmation_dialog_title">Impedisci chiamate accidentali</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Chiedi conferma prima di iniziare una chiamata</string>
 </resources>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 9de542a9a6..b48b4f401c 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -384,9 +384,6 @@
     <string name="login_error_login_email_not_yet">まだクリックされていないeメールのリンク</string>
 
     <string name="compression_options">以下の容量で画像を送信</string>
-    <string name="e2e_need_log_in_again">この端末のエンドツーエンド暗号鍵を生成し、接続先サーバに公開鍵を送信するには、再度ログインする必要があります。
-一度回線を切断します。
-ご不便おかけしてすみません。</string>
 
     <string name="room_info_room_topic">部屋の説明</string>
 
@@ -499,7 +496,6 @@
     <string name="hs_url">接続先サーバ URL</string>
     <string name="identity_url">認証サーバ URL</string>
     <string name="auth_login">ログイン</string>
-    <string name="login_mobile_device">携帯端末</string>
 
     <string name="room_add_matrix_apps">Matrixアプリを追加</string>
     <string name="widget_integration_positive_power_level">権限の数値は正の整数で入力してください。</string>
@@ -510,9 +506,9 @@
     <string name="permissions_rationale_msg_storage">Elementは添付ファイルを送信および保存するために写真とビデオライブラリにアクセスするための許可が必要です。
 
 あなたの携帯端末からファイルを送信できるようにするには、次のポップアップでアクセスを許可してください。</string>
-    <string name="permissions_rationale_msg_camera_explanation">
-
-通話をするには、次のポップアップでアクセスできるように設定してください。</string>
+    <string name="permissions_rationale_msg_camera_explanation">"
+\n
+\n通話をするには、次のポップアップでアクセスできるように設定してください。"</string>
     <string name="permissions_rationale_msg_record_audio">Elementアプリは、音声通話を実行するためにマイクへアクセスするための許可が必要です。</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
@@ -554,9 +550,6 @@ Elementアプリがあなたの電話帳へアクセスすることを許可し
 不明なデバイス:</string>
 
     <string name="unknown_devices_alert_title">部屋に不明なデバイスが含まれています</string>
-    <string name="e2e_enabling_on_app_update">Elementはエンドツーエンドの暗号化をサポートするようになりましたが、有効にするには再度ログインする必要があります。
-
-アプリケーションの設定から今すぐまたは後で行うことができます。</string>
 
     <string name="encryption_information_verify_key_match">キーが一致していることを確認</string>
 
@@ -909,7 +902,7 @@ Elementアプリがあなたの電話帳へアクセスすることを許可し
     <string name="command_description_deop_user">指定したIDのユーザの管理者権限を取り消す</string>
     <string name="command_description_invite_user">指定したユーザを現在の部屋に招待</string>
     <string name="command_description_join_room">指定したエイリアスの部屋に参加</string>
-    <string name="command_description_part_room">部屋を去る</string>
+    <string name="command_description_part_room">部屋を退室</string>
     <string name="command_description_topic">部屋のテーマを設定</string>
     <string name="command_description_kick_user">指定したIDのユーザとの接続を切断</string>
     <string name="command_description_nick">表示するニックネームを変更</string>
@@ -991,7 +984,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="auth_accept_policies">このホームサーバーの方針を閲覧し承認してください:</string>
 
     <string name="settings_call_category">通話設定画面</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">着信にElementの既定の着信音を使う</string>
+    <string name="settings_call_ringtone_use_app_ringtone">着信にElementの既定の着信音を使う</string>
     <string name="settings_call_ringtone_title">着信音</string>
     <string name="settings_call_ringtone_dialog_title">着信音を選んでください:</string>
 
@@ -1069,4 +1062,171 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="settings_troubleshoot_test_bing_settings_title">カスタム設定</string>
     <string name="settings_troubleshoot_test_service_boot_title">起動時の実行</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">バックグラウンド制限の確認</string>
+    <string name="stay">とどまる</string>
+    <string name="edit">編集</string>
+    <string name="reply">返信</string>
+
+    <string name="event_redacted">削除済みのメッセージ</string>
+    <string name="settings_show_redacted">削除済みのメッセージを表示</string>
+    <string name="settings_show_redacted_summary">削除されたメッセージの代わりに削除されたという通知を表示します。</string>
+    <string name="event_redacted_by_user_reason">ユーザーによって削除されたイベント</string>
+    <string name="create_new_room">新しい部屋を作成</string>
+    <string name="action_change">変更</string>
+    <string name="change_room_directory_network">ネットワークを変更</string>
+    <string name="group_all_communities">全てのコミュニティ</string>
+
+    <string name="fab_menu_create_room">部屋</string>
+    <string name="fab_menu_create_chat">対話</string>
+
+    <string name="create_room_title">新しい部屋</string>
+    <string name="create_room_action_create">作成</string>
+    <string name="create_room_name_hint">部屋名</string>
+    <string name="create_room_public_title">公開する</string>
+    <string name="create_room_public_description">部屋が公開され、誰でもこの部屋に参加できるようになります</string>
+    <string name="create_room_directory_title">部屋一覧</string>
+    <string name="create_room_directory_description">部屋一覧にこの部屋が公開されます</string>
+
+    <string name="settings_general_title">一般</string>
+    <string name="settings_security_and_privacy">セキュリティとプライバシー</string>
+    <string name="preference_root_help_about">ヘルプと概要</string>
+
+
+    <string name="bottom_action_people_x">対話</string>
+
+    <string name="edited_suffix">(編集済み)</string>
+
+    <string name="room_filtering_filter_hint">会話を検索…</string>
+    <string name="add_by_matrix_id">Matrix ID から追加</string>
+    <string name="direct_room_filter_hint">ユーザー名または ID で検索…</string>
+
+    <string name="room_list_quick_actions_notifications_all_noisy">全てのメッセージ (大音量)</string>
+    <string name="room_list_quick_actions_notifications_all">全てのメッセージ</string>
+    <string name="room_list_quick_actions_notifications_mentions">メンションのみ</string>
+    <string name="room_list_quick_actions_notifications_mute">ミュート</string>
+    <string name="room_list_quick_actions_settings">設定</string>
+    <string name="room_list_quick_actions_favorite_add">お気に入りに追加</string>
+    <string name="room_list_quick_actions_favorite_remove">お気に入りから削除</string>
+    <string name="room_list_quick_actions_leave">部屋から退出</string>
+    <string name="help_long_click_on_room_for_more_options">長押しすると、追加のオプションが表示されます</string>
+
+
+    <string name="settings_developer_mode">開発者モード</string>
+    <string name="settings">設定</string>
+    <string name="devices_current_device">現在のセッション</string>
+    <string name="devices_other_devices">その他のセッション</string>
+
+    <string name="create_room_encryption_title">暗号化を有効にする</string>
+    <string name="create_room_encryption_description">暗号化設定は有効化後変更できません。</string>
+
+    <string name="room_profile_section_security">セキュリティ</string>
+    <string name="room_profile_section_security_learn_more">詳細</string>
+    <string name="room_profile_section_more">その他の設定</string>
+    <string name="room_profile_section_admin">管理者としての操作</string>
+    <string name="room_profile_section_more_settings">部屋の設定</string>
+    <string name="room_profile_section_more_notifications">通知</string>
+    <plurals name="room_profile_section_more_member_list">
+        <item quantity="other">%1$d 人の参加者</item>
+    </plurals>
+    <string name="room_profile_section_more_uploads">アップロード</string>
+    <string name="room_profile_section_more_leave">部屋を退室</string>
+    <string name="room_profile_leaving_room">部屋から退室中…</string>
+
+    <string name="room_member_power_level_admins">管理者</string>
+    <string name="room_member_power_level_moderators">モデレーター</string>
+    <string name="room_member_power_level_custom">カスタム</string>
+    <string name="room_member_power_level_invites">招待者</string>
+    <string name="room_member_power_level_users">ユーザー</string>
+
+    <string name="room_member_power_level_admin_in">%1$s の管理者</string>
+    <string name="room_member_power_level_moderator_in">%1$s のモデレーター</string>
+    <string name="room_member_power_level_default_in">%1$s のデフォルトユーザー</string>
+    <string name="room_member_power_level_custom_in">%2$s のカスタム (%1$d)</string>
+
+    <string name="settings_category_timeline">タイムライン</string>
+
+    <string name="room_settings_enable_encryption">エンドツーエンド暗号化を有効にする</string>
+    <string name="room_settings_enable_encryption_dialog_submit">暗号化を有効にする</string>
+
+    <string name="encryption_information_cross_signing_state">クロス署名</string>
+    <string name="encryption_information_dg_xsigning_complete">クロス署名は有効です
+\n秘密鍵は端末内です</string>
+    <string name="encryption_information_dg_xsigning_trusted">クロス署名は有効です
+\n鍵は信頼されています
+\n秘密鍵は不明です</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">クロス署名は有効です
+\n鍵は信頼されていません</string>
+    <string name="encryption_information_dg_xsigning_disabled">クロス署名は無効です</string>
+
+    <string name="settings_active_sessions_list">有効なセッション</string>
+    <string name="settings_active_sessions_show_all">全てのセッションを表示</string>
+    <string name="settings_active_sessions_manage">セッションの管理</string>
+    <string name="settings_active_sessions_signout_device">このセッションからログアウト</string>
+
+    <plurals name="settings_active_sessions_count">
+        <item quantity="other">%d 件の有効なセッション</item>
+    </plurals>
+
+    <string name="crosssigning_verify_this_session">このログインを検証</string>
+    <string name="a11y_qr_code_for_verification">QR コード</string>
+
+    <string name="qr_code_scanned_by_other_yes">はい</string>
+    <string name="qr_code_scanned_by_other_no">いいえ</string>
+
+    <string name="no_connectivity_to_the_server_indicator_airplane">機内モードが有効です</string>
+
+    <string name="settings_dev_tools">開発者ツール</string>
+    <string name="settings_account_data">アカウントデータ</string>
+    <string name="message_action_item_redact">削除…</string>
+    <string name="delete_event_dialog_title">削除の確認</string>
+    <string name="delete_event_dialog_content">このイベントを削除してよろしいですか？部屋名やトピックの変更を削除すると、変更が元に戻る点にご注意ください。</string>
+    <string name="encryption_enabled">暗号化は有効です</string>
+    <string name="encryption_enabled_tile_description">この部屋内でのメッセージはエンドツーエンド暗号化されます。詳細の確認や検証はユーザーのプロフィールをご確認ください。</string>
+    <string name="encryption_not_enabled">暗号化が有効化されていません</string>
+    <string name="settings_notification_configuration">通知設定</string>
+    <string name="disconnect">切断</string>
+    <string name="action_sign_out_confirmation_simple">ログアウトしますか？</string>
+    <string name="action_mark_room_read">既読にする</string>
+    <string name="action_copy">コピー</string>
+    <string name="dialog_title_success">成功</string>
+
+    <string name="bottom_action_notification">通知</string>
+    <string name="call_failed_no_ice_title">サーバーの設定ミスにより通話に失敗しました</string>
+    <string name="revoke">破棄</string>
+    <string name="play_video">再生</string>
+    <string name="pause_video">一時停止</string>
+    <string name="dismiss">消去</string>
+
+
+    <string name="skip">スキップ</string>
+    <string name="done">完了</string>
+    <string name="ignore">無視</string>
+    <string name="review">レビュー</string>
+    <string name="send_file_step_idle">待機中…</string>
+    <string name="send_file_step_encrypting_thumbnail">サムネイル暗号化中…</string>
+    <string name="send_file_step_sending_thumbnail">サムネイル送信中 (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">ファイル暗号化中…</string>
+    <string name="send_file_step_sending_file">ファイル送信中 (%1$s / %2$s)</string>
+
+    <string name="downloading_file">ファイルをダウンロード中 %1$s…</string>
+    <string name="attachment_type_file">ファイル</string>
+    <string name="attachment_type_contact">連絡先</string>
+    <string name="attachment_type_camera">カメラ</string>
+    <string name="attachment_type_audio">音声</string>
+    <string name="attachment_type_gallery">ギャラリー</string>
+    <string name="attachment_type_sticker">ステッカー</string>
+    <string name="report_content_spam">スパムメッセージです</string>
+    <string name="report_content_inappropriate">不適切なメッセージです</string>
+    <string name="report_content_custom">その他の報告…</string>
+    <string name="report_content_custom_title">コンテンツの報告</string>
+    <string name="report_content_custom_hint">このコンテンツを報告する理由</string>
+    <string name="report_content_custom_submit">報告する</string>
+    <string name="block_user">ユーザーをブロック</string>
+
+    <string name="message_ignore_user">ユーザーをブロック</string>
+
+    <string name="enter_secret_storage_passphrase_warning">警告:</string>
+    <plurals name="send_images_with_original_size">
+        <item quantity="other">元の大きさのまま画像を送信する</item>
+    </plurals>
+
 </resources>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 33e179149d..aec1a93bb5 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -174,7 +174,6 @@
     <string name="auth_reset_password_success_message">비밀번호가 초기화되었습니다.
 \n
 \n모든 기기에서 로그아웃되고 알림도 가지 않을 거에요. 다시 알림을 받으려면, 각 기기에 다시 로그인하세요.</string>
-    <string name="login_mobile_device">모바일</string>
 
     <string name="notification_listening_for_events">이벤트 청취하기</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">키 백업이 진행 중입니다. 지금 로그아웃하면 암호화된 메시지에 접근할 수 없습니다.</string>
@@ -265,10 +264,6 @@
     <string name="login_error_user_in_use">이 사용자 이름은 이미 사용 중입니다</string>
     <string name="login_error_login_email_not_yet">이메일 링크를 아직 클릭하지 않았습니다</string>
 
-    <string name="e2e_need_log_in_again">이 기기를 위한 종단간 암호화 키를 생성하고 공개 키를 홈서버에 제출하려면 다시 로그인해야 합니다.
-\n한 번이면 됩니다.
-\n불편을 드려 죄송합니다.</string>
-
     <string name="e2e_re_request_encryption_key">다른 기기에서 온 <u>다시 요청된 암호 키</u>.</string>
 
     <string name="e2e_re_request_encryption_key_sent">키 요청을 보냈습니다.</string>
@@ -302,7 +297,7 @@
     <string name="room_info_room_topic">방 주제</string>
 
     <string name="settings_call_category">전화</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">수신 전화에 Element 기본 벨소리를 사용합니다</string>
+    <string name="settings_call_ringtone_use_app_ringtone">수신 전화에 Element 기본 벨소리를 사용합니다</string>
     <string name="settings_call_ringtone_title">수신 전화 벨소리</string>
     <string name="settings_call_ringtone_dialog_title">전화에 사용할 벨소리를 선택하세요:</string>
 
@@ -554,7 +549,6 @@
 
 
     <string name="settings_notification_advanced">고급 알림 설정</string>
-    <string name="settings_notification_advanced_summary">이벤트 별로 알림 중요도를 설정하고, 소리, LED, 진동을 설정하세요</string>
     <string name="settings_notification_by_event">이벤트 별 알림 중요도</string>
 
     <string name="settings_notification_privacy">알림 개인 정보</string>
@@ -926,7 +920,6 @@
     <string name="encryption_import_import">가져오기</string>
     <string name="encryption_never_send_to_unverified_devices_title">확인된 기기로만 암호화</string>
     <string name="encryption_never_send_to_unverified_devices_summary">이 기기에서 확인되지 않은 기기로 절대 암호화된 메시지를 보내지 않습니다.</string>
-    <string name="encryption_import_room_keys_success">%1$d/%2$d 키를 성공적으로 가져왔습니다.</string>
 
     <string name="encryption_information_not_verified">확인되지 않음</string>
     <string name="encryption_information_verified">확인됨</string>
@@ -946,10 +939,6 @@
     <string name="encryption_information_verify_device_warning2">그것이 맞다면, 아래의 확인 버튼을 누르세요. 맞지 않다면, 다른 사람이 이 기기를 가로채고 있는 것이고 블랙리스트에 올려야 합니다. 앞으로 이 확인 절차는 더 정교해질 것입니다.</string>
     <string name="encryption_information_verify_key_match">키가 맞다는 것은 확인합니다</string>
 
-    <string name="e2e_enabling_on_app_update">Element은 이제 종단간 암호화를 지원하지만 활성화하려면 다시 로그인해야 합니다.
-\n
-\n지금 바로 하거나 나중에 애플리케이션 설정에서 할 수 있습니다.</string>
-
     <string name="unknown_devices_alert_title">알 수 없는 기기가 있는 방</string>
     <string name="unknown_devices_alert_message">이 방에는 확인되지 않은 알 수 없는 기기가 있습니다. 
 \n즉, 사용자에 속해 있다고 주장하는 기기라는 보장이 없습니다. 
@@ -1169,25 +1158,6 @@
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">올바른 Google Play 서비스 APK를 찾을 수 없습니다. 알림이 제대로 작동하지 않을 수 있습니다.</string>
 
-    <string name="store_title">Element - 대화하세요, 나만의 방식</string>
-    <string name="store_whats_new">우리는 항상 Element을 변경하고 개선하고 있습니다. 전체 변경 내역은 여기서 찾을 수 있습니다: %1$s. 놓치지 않도록 업데이트를 켜 놓아주세요.</string>
-    <string name="store_short_description">전적으로 여러분의 통제 하에 있는 범용 보안 대화 앱.</string>
-    <string name="store_full_description">여러분의 통제 하에 완전히 유연한 대화 앱. Element은 여러분이 원하는 방식으로 대화할 수 있도록 합니다. 개방형 분산 커뮤니티의 표준 - [matrix]를 위해 제작됨.
-\n 
-\n무료 matrix.org 계정을 만들고, https://modular.im 에서 자신만의 서버, 혹은 다른 Matrix 서버를 얻으세요. 
-\n 
-\n왜 Element을 선택해야 하나요\?
-\n 
-\n• 완전한 대화: 원하는 대로 팀이나 친구, 커뮤니티를 중심으로 방을 만드세요! 대화, 파일 공유, 위젯 추가와 음성 및 영상 통화 - 모두 무료입니다. 
-\n 
-\n• 강력한 통합: 여러분이 알고 사랑하는 도구와 함께 Element을 사용하세요. Element이라면 다른 대화 앱의 사용자와 그룹까지도 대화할 수 있습니다.
-\n 
-\n• 개인 및 보안: 대화를 비밀로 유지하세요. 최첨단 종단간 암호화로 비밀 대화를 은밀하게 유지해줍니다. 
-\n 
-\n• 오픈 소스: Matrix로 만들어진 오픈 소스입니다. 자신의 데이터를 자신의 서버에 소유하거나, 신뢰하는 서버에 맡기세요. 
-\n 
-\n• 어디에 있든: 모든 기기나 https://riot.im 에서 완전히 동기화된 메시지 기록으로 연락을 유지합니다.</string>
-
     <string name="passphrase_create_passphrase">암호 만들기</string>
     <string name="passphrase_confirm_passphrase">암호 확인</string>
     <string name="passphrase_enter_passphrase">암호 입력</string>
@@ -1268,7 +1238,6 @@
     <string name="keys_backup_recovery_code_error_decrypt">이 복구 키로 백업을 복호화할 수 없습니다: 올바른 복구 키를 입력해서 확인해주세요.</string>
 
     <string name="keys_backup_restore_success_title">백업이 복구되었습니다 %s !</string>
-    <string name="keys_backup_restore_success_description">%1$d개의 세션 키를 복구했고, 이 기기에서 알려지지 않은 %2$d개의 새 키를 추가함</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="other">%d개의 키와 함께 백업을 복구했습니다.</item>
     </plurals>
@@ -1436,12 +1405,6 @@
     <string name="keys_backup_unable_to_get_trust_info">신뢰 정보를 얻는 과정에서 오류가 발생했습니다</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">키 백업 데이터를 얻는 과정에서 오류가 발생했습니다</string>
 
-    <string name="alpha_disclaimer_title">베타 버전에 온 것을 환영합니다!</string>
-    <string name="alpha_disclaimer_content_line_1">ElementX가 개발 중에 있기에, 일부 기능이 부족하고 버그가 나올 수 있습니다.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">최신 기능 목록은 항상 %1$s에 있고, 버그를 발견했다면 홈의 왼쪽 위 메뉴에서 신고해주세요, 그러면 가능한 한 빨리 고치겠습니다.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play 스토어 설명</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">버그를 발견했다면 홈의 왼쪽 위 메뉴에서 신고해주세요, 그러면 가능한 한 빨리 고치겠습니다.</string>
-
     <string name="import_e2e_keys_from_file">파일 \"%1$s\"에서 종단간 암호화 키 가져옴.</string>
 
     <string name="settings_sdk_version">Matrix SDK 버전</string>
@@ -1479,16 +1442,6 @@
 
     <string name="settings_labs_show_hidden_events_in_timeline">타임라인에서 숨겨진 이벤트 보이기</string>
 
-    <string name="store_riotx_title">Element - 차세대 Matrix 클라이언트</string>
-    <string name="store_riotx_short_description">최신 안드로이드 프레임워크를 사용해 더 빠르고 가벼운 Matrix를 위한 클라이언트</string>
-    <string name="store_riotx_full_description">Element는 Matrix 프로토콜 (Matrix.org)을 위한 새 클라이언트입니다: 안전한 분산 통신을 위한 개방형 네트워크. Element는 Matrix 안드로이드 SDK의 Element 안드로이드 클라이언트 전체 개정판을 기반으로 한 Riot 안드로이드 클라이언트의 전체 개정판입니다.
-\n 
-\n면책 조항: 이것은 베타 버전입니다. Element는 현재 개발 중이고 한계가 있으며 (많지 않으면 좋겠지만) 버그가 있습니다. 모든 피드백은 환영합니다!
-\n 
-\nElement 지원: • 존재하는 계정으로 로그인 • 방을 만들고 공공 방에 참가 • 초대를 수락하거나 거절 • 사용자 방 목록 • 방 세부 정보 보기 • 문자 메시지 보내기 • 첨부 파일 보내기 • 암호화된 방에서 메시지 읽고 쓰기 • 암호화: 종단간 암호화 키 백업, 고급 기기 확인, 키 공유 요청과 답장 • 푸시 알림 • 밝은 테마, 어두운 테마 그리고 검정 테마
-\n 
-\n아직 Element의 모든 기능이 Element에 구현되지 않았습니다. 주요 없는 (그리고 곧 나올!) 기능: • 방 설정 (방 구성원 목록 등) • 전화 • 위젯 • …</string>
-
     <string name="bottom_action_people_x">다이렉트 메시지</string>
 
     <string name="send_file_step_idle">기다리세요…</string>
@@ -1502,9 +1455,6 @@
 
     <string name="edited_suffix">(편집됨)</string>
 
-    <string name="riotx_no_registration_notice">계정을 만들려면 %1$s하세요.</string>
-    <string name="riotx_no_registration_notice_colored_part">예전 앱을 사용</string>
-
 
     <string name="message_edits">메시지 편집</string>
     <string name="no_message_edits_found">수정 사항이 없음</string>
@@ -1536,11 +1486,6 @@
 
     <string name="widget_integration_review_terms">계속 하려면 이 서비스 약관에 동의해야 합니다.</string>
 
-    <string name="security_warning_identity_server">Element의 이전 버전은 보안 버그로 ID 서버 (%1$s)가 계정으로 접근할 수 있었습니다. %2$s을(를) 신뢰하면 이것을 무시하고, 그렇지 않다면 로그아웃한 후 다시 로그인하세요.
-\n
-\n자세한 설명은 여기서 읽으세요:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="terms_of_service">서비스 약관</string>
     <string name="review_terms">조건 검토</string>
     <string name="terms_description_for_identity_server">다른 사람이 검색할 수 있음</string>
@@ -1637,7 +1582,6 @@
     <string name="a11y_hide_password">비밀번호 감추기</string>
     <string name="a11y_jump_to_bottom">맨 아래로 건너뛰기</string>
 
-    <string name="two_and_some_others_read">%1$s님, %2$s님 외 %3$d명이 읽음</string>
     <string name="three_users_read">%1$s님, %2$s님 그리고 %3$s님이 읽음</string>
     <string name="two_users_read">%1$s님 그리고 %2$s님이 읽음</string>
     <string name="one_user_read">%s님이 읽음</string>
diff --git a/vector/src/main/res/values-v21/styles_login.xml b/vector/src/main/res/values-ku/strings.xml
similarity index 60%
rename from vector/src/main/res/values-v21/styles_login.xml
rename to vector/src/main/res/values-ku/strings.xml
index 78554f9ebb..a6b3daec93 100644
--- a/vector/src/main/res/values-v21/styles_login.xml
+++ b/vector/src/main/res/values-ku/strings.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 6c80e1ba97..d057245a53 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -209,7 +209,6 @@ Tu esi izrakstīts no visām ierīcēm un vairāk nesaņemsi \"push\" paziņojum
     <string name="login_error_unable_register">Reģistrācija neizdevās</string>
     <string name="login_error_unable_register_mail_ownership">Registrācija neizdevās: epasta verifikācijas kļūda</string>
     <string name="login_error_invalid_home_server">Ievadi korektu URL adresi</string>
-    <string name="login_mobile_device">Mobilais</string>
 
     <string name="login_error_forbidden">Nepareizs lietotājvārds / parole</string>
     <string name="login_error_unknown_token">Attiecīgais pieejas tokens netika atpazīts</string>
@@ -219,9 +218,6 @@ Tu esi izrakstīts no visām ierīcēm un vairāk nesaņemsi \"push\" paziņojum
     <string name="login_error_user_in_use">Šis lietotājvārds ir aizņemts</string>
     <string name="login_error_login_email_not_yet">Nav noklikšķināts uz tīmekļa saites saņemtajā epastā</string>
 
-    <string name="e2e_need_log_in_again">Tev jāieiet sistēmā, lai šai ierīcei ģenerētu \"end-to-end\" šifrēšanas atslēgas un nosūtītu publisko atslēgu bāzes serverim.
-Šī darbība jāveic tikai vienu reizi. Atvainojamies par neērtībām.</string>
-
     <string name="read_receipts_list">Lasīt jaunbiedru sarakstu</string>
 
     <string name="groups_list">Grupu saraksts</string>
@@ -715,10 +711,6 @@ Lai turpinātu, ievadi savu paroli.</string>
 Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="encryption_information_verify_key_match">Apstiprinu, ka atslēgas sakrīt</string>
 
-    <string name="e2e_enabling_on_app_update">Element tagad nodrošina end-to-end šifrēšanu, bet Tev ir jāizrakstās un jāierakstās par jaunu, lai to iespējotu.
-
-Tu to vari izdarīt tūlīt vai vēlāk - lietotnes Iestatījumos.</string>
-
     <string name="unknown_devices_alert_title">Istabā atrodas nepazīstamas ierīces</string>
     <string name="unknown_devices_alert_message">Šajā istabā atrodas nepazīstamas ierīces, kuras nav verificētas.
 Tas nozīmē, ka nav garantijas, ka ierīces pieder tiem lietotājiem kuri par tādiem uzdodas.
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index ace1f04563..ab5b4e5c28 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -107,7 +107,6 @@
     <string name="auth_forgot_password">Glemt passord\?</string>
     <string name="auth_reset_password_next_step_button">Jeg har verifisert E-postadressen min</string>
     <string name="login_error_invalid_home_server">Vennligst skriv inn en gyldig URL</string>
-    <string name="login_mobile_device">Mobil</string>
 
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Store</string>
@@ -231,7 +230,7 @@
     <string name="settings_phone_number_country_label">Land</string>
     <string name="settings_phone_number_label">Telefonnummer</string>
     <string name="settings_phone_number_code">Kode</string>
-    <string name="settings_media">Media</string>
+    <string name="settings_media">Medier</string>
     <string name="compression_opt_list_choose">Velg</string>
     <string name="media_source_choose">Velg</string>
     <string name="settings_flair">Merkeskilt</string>
@@ -582,7 +581,6 @@
     <string name="fab_menu_create_chat">Direktemeldinger</string>
 
     <string name="create_room_name_hint">Rommets navn</string>
-    <string name="alpha_disclaimer_title">Velkommen til betaen!</string>
     <string name="push_gateway_item_url">URL:</string>
     <string name="bottom_action_people_x">Direktemeldinger</string>
 
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 871b4cd7d7..3c0624cdf4 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -196,9 +196,6 @@
     <string name="login_error_login_email_not_yet">Er is nog niet op de koppeling in de e-mail geklikt</string>
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">U moet zich opnieuw aanmelden om de sleutels voor eind-tot-eind-versleuteling voor deze sessie te genereren, en om de publieke sleutel naar uw thuisserver te sturen. 
-\nDit is eenmalig. 
-\nExcuses voor het ongemak.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Leesbevestigingslijst</string>
@@ -659,10 +656,6 @@
     <string name="encryption_information_verify_device_warning2">Als het overeenkomt, drukt u op de knop ‘Verifiëren’ hieronder. Als het niet overeenkomt, dan onderschept iemand anders deze sessie en zou u het beter blokkeren. In de toekomst zal dit verificatieproces verbeterd worden.</string>
     <string name="encryption_information_verify_key_match">Ik verifieer dat de sleutels overeenkomen</string>
 
-    <string name="e2e_enabling_on_app_update">Element ondersteunt nu eind-tot-eind-versleuteling, maar u moet zich opnieuw aanmelden om het in te schakelen.
-\n
-\nU kunt dit nu of later doen vanuit de app-instellingen.</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Dit gesprek bevat onbekende sessies</string>
     <string name="unknown_devices_alert_message">Dit gesprek bevat onbekende sessies die niet geverifieerd zijn. 
@@ -718,8 +711,6 @@
     <string name="notification_sync_in_progress">Bezig met synchroniseren…</string>
     <string name="notification_listening_for_events">Luisteren voor evenementen</string>
 
-    <string name="login_mobile_device">Mobiel</string>
-
     <string name="settings_notification_ringtone">Meldingsgeluid</string>
     <string name="settings_12_24_timestamps">Tijdsaanduidingen in 12-uursformaat weergeven</string>
 
@@ -1055,7 +1046,7 @@
     <string name="auth_accept_policies">Gelieve het beleid van deze thuisserver te lezen en aanvaarden:</string>
 
     <string name="settings_call_category">Oproepen</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Gebruik de standaardbeltoon van Element voor inkomende oproepen</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Gebruik de standaardbeltoon van Element voor inkomende oproepen</string>
     <string name="settings_call_ringtone_title">Beltoon voor inkomende oproepen</string>
     <string name="settings_call_ringtone_dialog_title">Selecteer beltoon voor oproepen:</string>
 
@@ -1103,7 +1094,6 @@
     <string name="video_call_in_progress">Video-oproep gaande…</string>
 
     <string name="settings_notification_advanced">Geavanceerde meldingsinstellingen</string>
-    <string name="settings_notification_advanced_summary">Stel het belang van meldingen in op gebeurtenis, en configureer geluiden, LED’s en vibratie</string>
     <string name="settings_notification_by_event">Meldingsbelang op gebeurtenis</string>
 
     <string name="settings_notification_troubleshoot">Problemen met meldingen oplossen</string>
@@ -1229,8 +1219,6 @@
     <string name="encryption_message_recovery">Herstel van versleutelde berichten</string>
     <string name="encryption_settings_manage_message_recovery_summary">Sleutelback-up beheren</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d sleutel(s) geïmporteerd.</string>
-
     <plurals name="notification_compat_summary_line_for_room">
         <item quantity="one">%1$s: 1 bericht</item>
         <item quantity="other">%1$s: %2$d berichten</item>
@@ -1276,25 +1264,6 @@
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Er is geen geldige APK van Google Play Services gevonden. Meldingen zullen mogelijk niet correct functioneren.</string>
 
-    <string name="store_title">Element - Communiceer op uw manier</string>
-    <string name="store_whats_new">We blijven Element voortdurend aanpassen en verbeteren. Het volledige wijzigingslogboek vindt u hier: %1$s. Om niets te missen, houdt u best uw updates ingeschakeld.</string>
-    <string name="store_short_description">Een universele en veilige chat-app, volledig onder uw controle.</string>
-    <string name="store_full_description">Een chat-app, onder uw controle en heel flexibel. Element laat u communiceren zoals u dat wilt. Gemaakt voor [matrix] - de standaard voor open, gedecentraliseerde communicatie.
-\n 
-\nMaak een gratis account aan op matrix.org, verkrijg uw eigen server op https://modular.im, of gebruik een andere Matrix-server. 
-\n 
-\nWaarom zou ik voor Element kiezen\?
-\n 
-\n• VOLLEDIGE COMMUNICATIE: maak gesprekken aan rond uw teams, uw vrienden, uw gemeenschap - hoe u maar wilt! Chat, deel bestanden, voeg widgets toe en maak stem- en video-oproepen - allemaal volledig gratis. 
-\n 
-\n• KRACHTIGE INTEGRATIE: gebruik Element met de hulpmiddelen waarmee u vertrouwd bent. Met Element kunt u zelfs chatten met gebruikers en groepen op andere chat-apps.
-\n 
-\n• PRIVÉ EN VEILIG: houd uw gesprekken geheim. Eind-tot-eind-versleuteling van de bovenste plank zorgt ervoor dat uw privécommunicatie ook privé blijft. 
-\n 
-\n• OPEN, NIET GESLOTEN: vrije software, gebouwd op Matrix. Wees baas over uw eigen gegevens door uw eigen server te gebruiken, of te kiezen voor een andere server die u vertrouwt. 
-\n 
-\n• WAAR U OOK BENT: houd contact waar u ook bent met volledig gesynchroniseerde berichtgeschiedenis op al uw apparaten, en online op https://riot.im.</string>
-
     <string name="passphrase_create_passphrase">Wachtwoord aanmaken</string>
     <string name="passphrase_passphrase_does_not_match">Wachtwoorden komen niet overeen</string>
     <string name="passphrase_empty_error_message">Voer een wachtwoord in</string>
@@ -1368,7 +1337,6 @@
     <string name="keys_backup_recovery_code_error_decrypt">De back-up kan met deze herstelsleutel niet ontsleuteld worden: controleer of u de juiste herstelsleutel heeft ingevoerd.</string>
 
     <string name="keys_backup_restore_success_title">Back-up hersteld %s!</string>
-    <string name="keys_backup_restore_success_description">%1$d sessiesleutels hersteld, en %2$d nieuwe sleutel(s) die deze sessie nog niet kende toegevoegd</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Back-up met %d sleutel hersteld.</item>
         <item quantity="other">Back-up met %d sleutels hersteld.</item>
@@ -1596,11 +1564,6 @@
     <string name="identity_server_not_defined">U gebruikt geen identiteitsserver</string>
     <string name="identity_server_not_defined_for_password_reset">Er is geen identiteitsserver geconfigureerd. Dit is vereist om uw wachtwoord opnieuw in te stellen.</string>
 
-    <string name="security_warning_identity_server">Vorige versies van Element hadden een veiligheidsfout die er voor kon zorgen dat je Identiteits Server (%1$s) toegang tot je account had. Indien je %2$s vertrouwt, dan kun je dit negeren; anders log je uit en weer in.
-\n
-\nLees meer details hier:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="error_user_already_logged_in">Het lijkt er op dat je probeert verbinding te maken met een andere thuisserver. Wil je uitloggen\?</string>
 
     <string name="edit">Bewerken</string>
diff --git a/vector/src/main/res/values-nn/strings.xml b/vector/src/main/res/values-nn/strings.xml
index d0ce86f127..a5d25f6505 100644
--- a/vector/src/main/res/values-nn/strings.xml
+++ b/vector/src/main/res/values-nn/strings.xml
@@ -217,7 +217,6 @@
     <string name="login_error_unable_register">Fekk ikkje til å registrere</string>
     <string name="login_error_unable_register_mail_ownership">Fekk ikkje til å registrere: feil med e-posteigarskap</string>
     <string name="login_error_invalid_home_server">Skriv inn ein gyldig URL</string>
-    <string name="login_mobile_device">Mobil</string>
 
     <string name="login_error_forbidden">Brukarnamnet/passordet er ikkje gyldig</string>
     <string name="login_error_unknown_token">Den oppgjevne tilgangsnøkkelen vart ikkje kjent att</string>
@@ -745,8 +744,6 @@ For å gå fram, ver venleg og skriv passordet ditt inn.</string>
     <string name="encryption_information_verify_device_warning2">Viss det samsvarer, klikk Verifiser-knappen under. Viss det ikkje gjer det, avlyttar nokon andre denne sesjonen og du bør sannsynlegvis svarteliste den. I framtida vil denne verifikasjonsprosessen bli meir forbetra.</string>
     <string name="encryption_information_verify_key_match">Eg stadfestar at nøkklane er like</string>
 
-    <string name="e2e_enabling_on_app_update">Element støttar no ende-til-ende-kryptering men du må logga inn att for å skru det på. Du kan gjera det no eller seinare i App-innstillingane.</string>
-
     <string name="unknown_devices_alert_title">Rommet inneheld ukjende sesjonar</string>
     <string name="unknown_devices_alert_message">Rommet inneheld ukjende sesjonar som ikkje har blitt verifiserte. Det er med andre ord ingen garanti for at sesjonane høyrer til brukarane dei hevdar. Vi tilråder deg å gå gjennom verifikasjonsprosessen for kvar eining før du går vidare, men du kan sende meldingen på nytt utan å godkjenne viss du vil. 
 \n
@@ -863,10 +860,6 @@ For å gå fram, ver venleg og skriv passordet ditt inn.</string>
     <string name="rejoin">Vert med att</string>
     <string name="forget_room">Gløym rommet</string>
 
-    <string name="e2e_need_log_in_again">Du må logga på att for å laga ende-til-ende-krypteringsnnøkklar til denne sesjonen og senda den offentlege nøkkelen (public key) til heimetenaren. 
-\nDette trengst berre éin gong. 
-\nBeklagar ulempa.</string>
-
     <string name="directory_server_native_rooms">Alle %s-rom på Matrix</string>
 
     <string name="settings_labs_native_camera">Bruk det innebygde kameraet</string>
@@ -962,7 +955,7 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
 
     <string name="login_error_unknown_host">Det gjeng ikkje å nå URL-en, gjer vel og sjå til honom</string>
     <string name="settings_call_category">Oppringingar</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Bruk standard Element-ringetone for innkommande samtalar</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Bruk standard Element-ringetone for innkommande samtalar</string>
     <string name="settings_call_ringtone_title">Ringetone for innkommande samtalar</string>
     <string name="settings_call_ringtone_dialog_title">Vel ringetone for samtalar:</string>
 
@@ -972,7 +965,6 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="reason_hint">Grunn</string>
 
     <string name="settings_notification_advanced">Avanserte varslingsinnstillingar</string>
-    <string name="settings_notification_advanced_summary">Sett prioritet for varslingar etter hending, still inn lyd, LED, vibrasjon</string>
     <string name="settings_notification_by_event">Prioritet på varsel ut ifrå hendingar</string>
 
     <string name="settings_notification_troubleshoot">Løys problem med varslingar</string>
@@ -1070,21 +1062,6 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="settings_show_join_leave_messages">Vis bli-med/forlat hendelsar</string>
     <string name="settings_show_join_leave_messages_summary">Invitasjonar, utkastingar og utestengingar gjeld ikkje dette.</string>
     <string name="room_widget_open_in_browser">Opna i nettlesar</string>
-    <string name="store_full_description">Program for nettprat, under din kontroll og med full fleksibilitet. Element let deg kommunisera på den måten du vil. Implementert for [matrix] - protokollen for open, desentralisert kommunikasjon.
-\n 
-\nOpprett ein gratis matrix.org-konto, sett opp eigen tenar på https://modular.im, eller ta i bruk ein annan Matrix-tenar. 
-\n 
-\nKvifor velje Element\?
-\n 
-\n• KOMPLETT KOMMUNIKASJON: Bygg rom rund teamet, venner, fellesskapet - du bestemmer! Send direktemeldingar, del filer, legg til tillegg, start talesamtalar og videokonferansar! Alt saman er tilgjengeleg utan kostnad.
-\n 
-\n• KRAFTIGE INTEGRASJONAR: Bruk Element saman med verktøya du nyttar frå før. Med Element kan du kommunisera med brukarar på andre plattformar.
-\n 
-\n• PRIVAT OG SIKKER: Hald dine samtalar hemmelege. Industristandard ende-til-ende-kryptering sørgjer for at private samtalar forblir private. 
-\n 
-\n• OPEN, IKKJE LUKKA: Open kjeldekode, på toppen av Matrix-protokollen. Eig dine eigne data ved å drifta eigen tenar eller hjå nokon du stolar på. 
-\n 
-\n• OVERALT DER DU ER: Hald kontakten uansett kvar du er; fullstendig synkronisert meldingshistorikk på alle klientar, samt i nettlesar på https://riot.im.</string>
 
     <string name="keys_backup_restore_is_getting_backup_version">Hentar sikkerheitskopiversjon…</string>
     <string name="keys_backup_info_title_version">Versjon</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index a77fda2994..79764d864e 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -576,11 +576,8 @@ Możesz dodać adres e-mail do swojego profilu w ustawieniach.</string>
     <string name="auth_identity_server">Serwer Tożsamości:</string>
     <string name="auth_reset_password_success_message">Twoje hasło zostało zresetowane. Zostałeś wylogowany ze wszystkich sesji i nie będziesz więcej otrzymywać powiadomień push. Aby ponownie włączyć powiadomienia, zaloguj się ponownie na każdym urządzeniu.</string>
 
-    <string name="login_mobile_device">Numer telefonu</string>
-
     <string name="login_error_unknown_token">Wprowadzony token dostępu nie został rozpoznany</string>
     <string name="login_error_bad_json">Uszkodzony JSON</string>
-    <string name="e2e_need_log_in_again">Należy się ponownie zalogować w celu wygenerowania kluczy szyfrowania end-to-end dla tej sesji i wysłania klucza publicznego do Twojego serwera domowego. Jest to jednorazowe działanie. Przepraszamy za trudności.</string>
 
     <string name="groups_list">Lista grup</string>
 
@@ -788,9 +785,6 @@ Uwaga: ten plik może zostać usunięty, jeśli aplikacja zostanie odinstalowana
     <string name="encryption_information_unverify">Usuń weryfikację</string>
     <string name="encryption_information_verify_device_warning">Aby sprawdzić czy ta sesja jest zaufana, skontaktuj się z jej właścicielem używając innych form (np. osobiście lub telefonicznie) i zapytaj czy klucz, który widzą w ustawieniach użytkownika dla tego urządzenia pasuje do klucza poniżej:</string>
     <string name="encryption_information_verify_device_warning2">Jeśli klucz pasuje, potwierdź to przyciskiem poniżej. Jeśli nie, to ktoś inny najprawdopodobniej przejmuje lub podszywa się pod tą sesję i powinieneś dodać tę sesję do czarnej listy. W przyszłości proces weryfikacji będzie bardziej skomplikowany.</string>
-    <string name="e2e_enabling_on_app_update">Element obsługuje już szyfrowanie end-to-end (E2E), ale musisz zalogować się ponownie, aby je włączyć.
-
-Możesz to zrobić teraz lub później z poziomu ustawień aplikacji.</string>
 
     <string name="unknown_devices_alert_message">Ten pokój zawiera nieznane sesje, które nie zostały zweryfikowane. Oznacza to brak gwarancji, że sesje należą do użytkowników do których twierdzą, że należą. Przed kontynuowaniem, zalecamy wykonanie procesu weryfikacji każdego urządzenia, ale możesz ponownie wysłać wiadomość bez weryfikacji, jeśli wolisz. Nieznane sesje:</string>
 
@@ -1029,7 +1023,7 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
 
-    <string name="settings_call_ringtone_use_riot_ringtone">Użyj domyślnego dzwonka Element dla przychodzących połączeń</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Użyj domyślnego dzwonka Element dla przychodzących połączeń</string>
     <string name="call_anyway">Zadzwoń mimo to</string>
     <string name="settings_call_category">Połączenia</string>
     <string name="room_participants_action_kick">Wyrzuć</string>
@@ -1049,8 +1043,6 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
 
     <string name="auth_accept_policies">Przeczytaj i zaakceptuj zasady tego serwera domowego:</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d klucz(y) zaimportowano z sukcesem.</string>
-
     <string name="settings_labs_enable_send_voice_summary">Ta opcja wymaga aplikacji osoby trzeciej do nagrywania wiadomości.</string>
 
     <string name="settings_troubleshoot_diagnostic_run_button_title">Uruchom Testy</string>
@@ -1077,9 +1069,6 @@ Sprawdź ustawienia systemowe.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Powiadomienia są wyłączone dla twojego konta.
 Sprawdź ustawienia konta.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Powiadomienia nie są włączone dla tej sesji. Proszę sprawdź ustawienia Element.</string>
-    <string name="store_whats_new">"Zawsze wprowadzamy zmiany i ulepszenia do Element.
-Pełną listę zmian można znaleźć tutaj: %1$s.
-Aby upewnić się, że niczego nie przegapisz, po prostu miej włączone aktualizacje."</string>
     <string name="account_additional_info">Dodatkowe informacje: %s</string>
 
     <string name="account_phone_number_error">Wystąpił błąd podczas weryfikowania numeru telefonu.</string>
@@ -1201,7 +1190,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="keys_backup_settings_status_ok">Kopia zapasowa klucza została prawidłowo skonfigurowana dla tej sesji.</string>
     <string name="notification_sync_init">Inicjalizacja usługi</string>
     <string name="auth_login_sso">Zaloguj się za pomocą logowania jednorazowego</string>
-    <string name="settings_notification_advanced_summary">Ustaw ważność powiadomienia za pomocą wydarzeń, skonfiguruj dźwięk, diodę LED, wibracje</string>
     <string name="settings_notification_by_event">Ważność powiadomień ze względu na wydarzenie</string>
 
     <string name="settings_notification_troubleshoot">Diagnostyka powiadomień</string>
@@ -1297,7 +1285,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="error_no_network">Brak sieci. Sprawdź swoje połączenie z Internetem.</string>
     <string name="please_wait">Proszę czekać…</string>
     <string name="room_preview_no_preview">Tego pokoju nie można podejrzeć</string>
-    <string name="alpha_disclaimer_title">Witaj w programie beta!</string>
     <string name="settings_security_and_privacy">Bezpieczeństwo i Prywatność</string>
     <string name="settings_expert">Ekspert</string>
     <string name="settings_push_rules_no_rules">Brak reguł push</string>
@@ -1516,24 +1503,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="no_valid_google_play_services_apk">Nie znaleziono prawidłowej aplikacji Usługi Google Play. Powiadomienia mogą nie działać prawidłowo.</string>
 
-    <string name="store_title">Element - Rozmawiaj, we własny sposób</string>
-    <string name="store_short_description">Bezpieczna aplikacja czatu całkowicie pod Twoją kontrolą.</string>
-    <string name="store_full_description">Aplikacja czatu, całkowicie pod twoją kontrolą i całkowicie dopasowująca się. Element pozwala na komunikowanie się w jakikolwiek sposób chcesz. Stworzony dla [Matrix] - standardu otwartej, zdecentralizowanej komunikacji.
-\n
-\nStwórz darmowe konto matrix.org, zdobądź swój własny serwer na https://modular.im, lub użyj innego serwera Matrix.
-\n
-\nDlaczego warto wybrać Element\?
-\n
-\n• KOMPLETNA KOMUNIKACJA: Stwórz pokoje dla twojego zespołu, przyjaciół, społeczności - tak, jak lubisz! Czatuj, udostępniaj pliki, dodawaj widżety i wykonuj połączenia głosowe lub wideo - wszystko za darmo.
-\n
-\n• SILNA INTEGRACJA: Używaj Element z narzędziami które znasz i kochasz. Z Element możesz pisać z użytkownikami i grupami na innych aplikacjach do czatu.
-\n
-\n• PRYWATNE I BEZPIECZNE: Utrzymuj twoje konwersacje w sekrecie. Nowoczesne szyfrowanie typu \"end-to-end\" zapewnia, że to co jest prywatne, pozostaje prywatne
-\n
-\n• OTWARTE, NIE ZAMKNIĘTE: Otwartoźródłowe i oparte o Matrix. Bądź w posiadaniu swoich danych posiadając swój własny serwer, lub wybierając taki, któremu ufasz.
-\n
-\n•GDZIEKOLWIEK JESTEŚ: Bądź w kontakcie gdziekolwiek jesteś wraz z w pełni synchronizowaną historią wiadomości na wszystkich twoich urządzeniach lub na https://riot.im.</string>
-
     <string name="passphrase_passphrase_too_weak">Hasło jest zbyt słabe</string>
 
     <string name="keys_backup_passphrase_not_empty_error_message">Proszę usunąć hasło, jeżeli chcesz aby Element wygenerował klucz odzyskiwania.</string>
@@ -1579,7 +1548,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="keys_backup_restoring_waiting_message">Przywracanie kopii zapasowej:</string>
     <string name="keys_backup_recovery_code_error_decrypt">Kopia zapasowa nie może zostać zdeszyfrowana za pomocą tego klucza odzyskiwania: proszę upewnij się, czy wprowadzony klucz odzyskiwania jest poprawny.</string>
 
-    <string name="keys_backup_restore_success_description">Przywrócono %1$d kluczy sesji, i dodano %2$d nowych kluczy które nie były znane tej sesji</string>
     <string name="keys_backup_no_keysbackup_sdk_error">Szyfrowanie sesji nie jest aktywowane</string>
 
 
@@ -1655,10 +1623,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="sas_error_m_mismatched_sas">SAS nie zgadza się</string>
     <string name="sas_error_m_unexpected_message">Sesja otrzymała niespodziewaną wiadomość</string>
     <string name="sas_error_m_invalid_message">Otrzymano nieprawidłową wiadomość</string>
-    <string name="security_warning_identity_server">Poprzednie wersje Element posiadały błąd bezpieczeństwa, który umożliwiał Twojemu serwerowi tożsamości (%1$s) dostęp do Twojego konta. Jeżeli ufasz %2$s, możesz to zignorować; w przeciwnym wypadku wyloguj się i zaloguj ponownie.
-\n
-\nInformacje o szczegółach tutaj:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
 
     <string name="room_list_empty">Dołącz do pokoju, aby rozpocząć korzystanie z aplikacji.</string>
     <string name="room_list_catchup_welcome_body">Zapoznaj się z nieprzeczytanymi wiadomościami tutaj</string>
@@ -1671,11 +1635,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="keys_backup_unable_to_get_trust_info">Wystąpił błąd podczas otrzymywania zaufanych informacji</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Wystąpił błąd podczas uzyskiwania danych kluczy kopii zapasowej</string>
 
-    <string name="alpha_disclaimer_content_line_1">Jako że Element jest we wczesnej fazie rozwoju, niektóre funkcje mogą być niedostępne i możesz doświadczyć błędów.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">Najnowsza lista funkcji jest zawsze na %1$s, i jeżeli znajdziesz błąd, proszę wyślij raport w lewym górnym menu poprzez \"Ekran domowy\", postaramy załatać się go tak szybko, jak tylko się da.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Opis w Sklepie Play</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Jeżeli znajdziesz błędy, proszę wyślij raport za pomocą menu w lewym górnym rogu \"Ekranu domowego\", postaramy się je naprawić tak szybko, jak tylko się da.</string>
-
     <string name="import_e2e_keys_from_file">Importowanie kluczy E2E z pliku \"%1$s\".</string>
 
     <string name="settings_other_third_party_notices">Informacje o stronach trzecich</string>
@@ -1695,21 +1654,8 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Wyświetl ukryte wydarzenia na linii czasowej</string>
 
-    <string name="store_riotx_title">Element - Klient Matrix następnej generacji</string>
-    <string name="store_riotx_short_description">Szybszy i lżejszy klient Matrix używający najnowszych frameworków Androida</string>
-    <string name="store_riotx_full_description">Element jest nowym klientem dla protokołu Matrix (Matrix.org): otwarta sieć dla bezpiecznej, zdecentralizowej komunikacji. Element jest całkowicie przepisanym klientem Riot, opartym na nowym SDK Matrix dla systemu Android.
-\n
-\nUwaga: Jest to wersja beta. Element jest obecnie w fazie aktywnego rozwoju i posiada ograniczenia oraz (mamy nadzieje że niewiele) błędy. Wszystkie opinie są mile widziane!
-\n
-\nElement wspiera: • Logowanie do istniejącego konta • Tworzenie pokoi oraz dołączanie do pokoi publicznych • Akceptowanie i odrzucanie zaproszeń • Wyświetlanie listy pokoi użytkowników • Wyświetlanie informacji o pokoju • Wysyłanie wiadomości tekstowych • Wysyłanie załączników • Odczytywanie i pisanie wiadomości w zaszyfrowanych pokojach • Kryptografia: Kopię zapasową kluczy E2E, zaawansowaną weryfikację urządzeń, żądanie udostępniania kluczy i odpowiedzi na nie • Powiadomienia push • Jasne, Ciemne oraz Czarne motywy
-\n
-\nNie wszystkie funkcje Element są wdrożone w Element. Główne niedostępne (pojawią się już wkrótce!) funkcje: • Ustawienia pokoi (wyświetl listę członków pokoi) • Rozmowy • Widżety • …</string>
-
     <string name="edited_suffix">(edytowano)</string>
 
-    <string name="riotx_no_registration_notice">%1$s aby utworzyć konto.</string>
-    <string name="riotx_no_registration_notice_colored_part">Użyj starszej aplikacji</string>
-
 
     <string name="message_edits">Edycje wiadomości</string>
     <string name="no_message_edits_found">Nie znaleziono edycji</string>
@@ -1763,7 +1709,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="a11y_create_menu_open">Otwórz menu tworzenia pokoju</string>
     <string name="a11y_create_menu_close">Zamknij menu tworzenia pokoju…</string>
     <string name="a11y_close_keys_backup_banner">Zamknij baner kopii zapasowej kluczy</string>
-    <string name="two_and_some_others_read">odczytano przez %1$s, %2$s oraz %3$d</string>
     <string name="three_users_read">odczytano przez %1$s, %2$s oraz %3$s</string>
     <string name="two_users_read">odczytano przez %1$s oraz %2$s</string>
     <string name="one_user_read">%s odczytał</string>
@@ -1966,7 +1911,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_developer_mode_fail_fast_title">Bezproblemowy</string>
     <string name="settings_developer_mode_fail_fast_summary">Element może zawieszać się częściej gdy napotka na niespodziewany błąd</string>
 
-    <string name="command_description_verify">Żądanie weryfikujące podany userID</string>
     <string name="command_description_shrug">Preparuje ¯\\_(ツ)_/¯ dla zwykłej wiadomości tekstowej</string>
 
     <string name="create_room_encryption_title">Aktywuj szyfrowanie</string>
@@ -2234,7 +2178,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="e2e_use_keybackup">Odblokuj historię zaszyfrowanych wiadomości</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="refresh">Odśwież</string>
 
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 8063d79633..493f1f43fa 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -9,8 +9,8 @@
     <string name="title_activity_home">Mensagens</string>
     <string name="title_activity_room">Sala</string>
     <string name="title_activity_settings">Configurações</string>
-    <string name="title_activity_member_details">Detalhes dos integrantes</string>
-    <string name="title_activity_historical">Historical</string>
+    <string name="title_activity_member_details">Detalhes dos membros</string>
+    <string name="title_activity_historical">Histórico</string>
 
     <!-- button names -->
     <string name="ok">OK</string>
@@ -20,48 +20,48 @@
     <string name="send">Enviar</string>
     <string name="copy">Copiar</string>
     <string name="resend">Reenviar</string>
-    <string name="redact">Remover</string>
+    <string name="redact">Apagar</string>
     <string name="quote">Citar</string>
     <string name="share">Compartilhar</string>
     <string name="later">Depois</string>
     <string name="forward">Encaminhar</string>
-    <string name="permalink">Link permanente</string>
-    <string name="view_source">Ver fonte</string>
-    <string name="view_decrypted_source">View Decrypted Source</string>
-    <string name="delete">Remover</string>
+    <string name="permalink">Link</string>
+    <string name="view_source">Ver código-fonte</string>
+    <string name="view_decrypted_source">Ver código-fonte descriptografado</string>
+    <string name="delete">Excluir</string>
     <string name="rename">Renomear</string>
     <string name="report_content">Denunciar conteúdo</string>
-    <string name="active_call">Chamada ativa</string>
-    <string name="ongoing_conference_call">Chamada de voz em andamento.
-\nParticipar como %1$s ou %2$s</string>
+    <string name="active_call">Chamada em andamento</string>
+    <string name="ongoing_conference_call">Chamada em grupo em andamento.↵
+\nEntre como %1$s ou %2$s</string>
     <string name="ongoing_conference_call_voice">Voz</string>
     <string name="ongoing_conference_call_video">Vídeo</string>
-    <string name="cannot_start_call">Não consigo iniciar a chamada, favor tentar mais tarde</string>
-    <string name="missing_permissions_warning">Por falta de permissões, algumas funcionalidades podem estar faltando…</string>
-    <string name="missing_permissions_to_start_conf_call">Você necessita permissão para convidar para poder iniciar uma conferência nesta sala</string>
-    <string name="missing_permissions_title_to_start_conf_call">Não consigo iniciar a chamada</string>
-    <string name="device_information">Informações do dispositivo</string>
-    <string name="room_no_conference_call_in_encrypted_rooms">Chamadas de conferência não são permitidas em salas encriptografadas</string>
+    <string name="cannot_start_call">Não foi possível iniciar a chamada, tente mais tarde</string>
+    <string name="missing_permissions_warning">Devido à falta de permissões, alguns recursos podem estar faltando…</string>
+    <string name="missing_permissions_to_start_conf_call">Você precisa de permissão para convidar, para iniciar uma chamada em grupo nesta sala</string>
+    <string name="missing_permissions_title_to_start_conf_call">Não foi possível iniciar a chamada</string>
+    <string name="device_information">Informações da sessão</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">Não há suporte para chamadas em grupo em salas criptografadas</string>
     <string name="send_anyway">Enviar mesmo assim</string>
     <string name="or">ou</string>
     <string name="invite">Convidar</string>
 
     <!-- actions -->
-    <string name="action_sign_out">Sair da Conta</string>
+    <string name="action_sign_out">Sair</string>
     <string name="action_voice_call">Chamada de voz</string>
     <string name="action_video_call">Chamada de vídeo</string>
     <string name="action_global_search">Busca global</string>
-    <string name="action_mark_all_as_read">Marcar como lido</string>
+    <string name="action_mark_all_as_read">Marcar tudo como lido</string>
     <string name="action_historical">Histórico</string>
-    <string name="action_quick_reply">Resposta rápida</string>
+    <string name="action_quick_reply">Responder</string>
     <string name="action_open">Abrir</string>
     <string name="action_close">Fechar</string>
-    <string name="copied_to_clipboard">Copiado à área de transferência</string>
-    <string name="disable">Desabilitar</string>
+    <string name="copied_to_clipboard">Copiado para a área de transferência</string>
+    <string name="disable">Desativar</string>
 
     <!-- dialog titles -->
     <string name="dialog_title_confirmation">Confirmação</string>
-    <string name="dialog_title_warning">Alerta</string>
+    <string name="dialog_title_warning">Atenção</string>
 
     <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Início</string>
@@ -82,120 +82,123 @@
     <!-- People fragment -->
     <string name="direct_chats_header">Conversas</string>
     <string name="local_address_book_header">Agenda de endereços local</string>
-    <string name="matrix_only_filter">Apenas contatos Matrix</string>
-    <string name="no_conversation_placeholder">Não há conversas</string>
-    <string name="no_contact_access_placeholder">Você não autorizou o Element a acessar seus contatos locais</string>
+    <string name="matrix_only_filter">Apenas contatos na Matrix</string>
+    <string name="no_conversation_placeholder">Nenhuma conversa</string>
+    <string name="no_contact_access_placeholder">Você não permitiu que o Element acesse seus contatos locais</string>
     <string name="no_result_placeholder">Nenhum resultado</string>
 
     <!-- Rooms fragment -->
     <string name="rooms_header">Salas</string>
     <string name="rooms_directory_header">Lista de salas</string>
-    <string name="no_room_placeholder">Não há salas</string>
-    <string name="no_public_room_placeholder">Não há nenhuma sala pública disponível</string>
+    <string name="no_room_placeholder">Nenhuma sala</string>
+    <string name="no_public_room_placeholder">Nenhuma sala pública disponível</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">%d usuária/o</item>
-        <item quantity="other">%d usuárias/os</item>
+        <item quantity="one">%d usuário</item>
+        <item quantity="other">%d usuários</item>
     </plurals>
 
-    <string name="send_bug_report_include_logs">Enviar logs</string>
-    <string name="send_bug_report_include_crash_logs">Enviar logs da falha</string>
-    <string name="send_bug_report_include_screenshot">Enviar print de tela</string>
-    <string name="send_bug_report">Relatar erro</string>
-    <string name="send_bug_report_description">Por favor, descreva o erro (bug). O que você fez? O que você esperava ocorrer? O que aconteceu?</string>
+    <string name="send_bug_report_include_logs">Enviar registros</string>
+    <string name="send_bug_report_include_crash_logs">Enviar registros da falha</string>
+    <string name="send_bug_report_include_screenshot">Enviar recorte de tela</string>
+    <string name="send_bug_report">Relatar um erro</string>
+    <string name="send_bug_report_description">Por favor, descreva o erro. O que você fez\? O que você esperava ocorrer\? O que aconteceu\?</string>
     <string name="send_bug_report_placeholder">Descreva o seu problema aqui</string>
-    <string name="send_bug_report_logs_description">Para diagnosticar problemas, logs deste cliente serão enviados junto a este relatório de erros (bugs). Este relatório de erros, incluindo os logs e prints da tela, não serão visíveis publicamente. Se você prefere enviar apenas o texto acima, por favor desmarque:</string>
-    <string name="send_bug_report_alert_message">Você parece estar frustrado balançando o telefone. Você gostaria de abrir a tela de relato de erro?</string>
-    <string name="send_bug_report_sent">O relatório de erro (bug) foi enviado com sucesso</string>
-    <string name="send_bug_report_failed">O envio do relatório de erro (bug) falhou (%s)</string>
+    <string name="send_bug_report_logs_description">Para diagnosticar problemas, os registros deste cliente serão enviados juntos deste relatório de erros. Este relatório de erros, incluindo os registros e recortes de tela, não serão visíveis publicamente. Se você prefere enviar apenas o texto acima, por favor, desmarque:</string>
+    <string name="send_bug_report_alert_message">Você parece estar agitando o celular rapidamente. Gostaria de enviar um relatório de erro\?</string>
+    <string name="send_bug_report_sent">O relatório de erro foi enviado com êxito</string>
+    <string name="send_bug_report_failed">Falha ao enviar o relatório de erro (%s)</string>
     <string name="send_bug_report_progress">Andamento (%s%%)</string>
-    <string name="send_bug_report_app_crashed">O aplicativo encerrou inesperadamente na última vez. Gostaria de abrir a tela de relatos de falhas?</string>
+    <string name="send_bug_report_app_crashed">O aplicativo encerrou inesperadamente da última vez. Gostaria de abrir a tela de relatórios de erros\?</string>
 
     <string name="send_files_in">Enviar para</string>
-    <string name="read_receipt">Ler</string>
+    <string name="read_receipt">Leitura:</string>
 
     <string name="join_room">Entrar na sala</string>
     <string name="username">Nome de usuário</string>
     <string name="create_account">Criar conta</string>
     <string name="login">Entrar</string>
-    <string name="logout">Sair da Conta</string>
-    <string name="hs_url">URL do "Home Server"</string>
-    <string name="identity_url">URL do "Identity Server"</string>
+    <string name="logout">Sair</string>
+    <string name="hs_url">Endereço do servidor principal</string>
+    <string name="identity_url">Endereço do servidor de identidade</string>
     <string name="search">Pesquisar</string>
 
     <string name="start_new_chat">Iniciar nova conversa</string>
-    <string name="start_voice_call">Iniciar nova chamada de voz</string>
-    <string name="start_video_call">Iniciar nova chamada de vídeo</string>
+    <string name="start_voice_call">Iniciar chamada de voz</string>
+    <string name="start_video_call">Iniciar chamada de vídeo</string>
 
     <string name="option_send_files">Enviar arquivos</string>
-    <string name="option_take_photo_video">Tirar foto ou fazer vídeo</string>
+    <string name="option_take_photo_video">Tirar uma foto ou gravar vídeo</string>
 
     <!-- Authentication -->
     <string name="auth_login">Entrar</string>
     <string name="auth_register">Criar conta</string>
     <string name="auth_submit">Enviar</string>
     <string name="auth_skip">Pular</string>
-    <string name="auth_send_reset_email">Enviar email para redefinir senha</string>
+    <string name="auth_send_reset_email">Enviar e-mail para redefinir senha</string>
     <string name="auth_return_to_login">Voltar à tela de login</string>
-    <string name="auth_user_id_placeholder">Email ou nome de usuário</string>
+    <string name="auth_user_id_placeholder">E-mail ou nome de usuário</string>
     <string name="auth_password_placeholder">Senha</string>
     <string name="auth_new_password_placeholder">Nova senha</string>
     <string name="auth_user_name_placeholder">Nome de usuário</string>
-    <string name="auth_email_placeholder">Endereço de email</string>
-    <string name="auth_opt_email_placeholder">Endereço de email (opcional)</string>
+    <string name="auth_email_placeholder">Endereço de e-mail</string>
+    <string name="auth_opt_email_placeholder">Endereço de e-mail (opcional)</string>
     <string name="auth_phone_number_placeholder">Número de telefone</string>
     <string name="auth_opt_phone_number_placeholder">Número de telefone (opcional)</string>
     <string name="auth_repeat_password_placeholder">Repita a senha</string>
     <string name="auth_repeat_new_password_placeholder">Confirme sua nova senha</string>
-    <string name="auth_invalid_login_param">Usuário ou senha incorreta</string>
-    <string name="auth_invalid_user_name">Nomes de usuário só podem conter letras, números, pontos, hífens e underscores</string>
-    <string name="auth_invalid_password">Senha muita curta (mín 6)</string>
+    <string name="auth_invalid_login_param">Nome de usuário e/ou senha incorretos</string>
+    <string name="auth_invalid_user_name">Nomes de usuário só podem conter letras, números, pontos, hifens e sublinhados</string>
+    <string name="auth_invalid_password">Senha muita curta (mínimo de 6 caracteres)</string>
     <string name="auth_missing_password">Falta a senha</string>
-    <string name="auth_invalid_email">Isto não parece um endereço de e-mail válido</string>
-    <string name="auth_invalid_phone">Isso não parece um número de telefone válido</string>
+    <string name="auth_invalid_email">Este não parece ser um endereço de e-mail válido</string>
+    <string name="auth_invalid_phone">Este não parece ser um número de telefone válido</string>
     <string name="auth_email_already_defined">Este e-mail já está cadastrado.</string>
-    <string name="auth_missing_email">Falta endereço de email</string>
-    <string name="auth_missing_phone">Falta número de telefone</string>
-    <string name="auth_missing_email_or_phone">Falta endereço de email ou número de telefone</string>
+    <string name="auth_missing_email">Falta o endereço de e-mail</string>
+    <string name="auth_missing_phone">Falta o número de telefone</string>
+    <string name="auth_missing_email_or_phone">Falta o endereço de e-mail ou o número de telefone</string>
     <string name="auth_invalid_token">Token inválido</string>
-    <string name="auth_password_dont_match">As senhas não conferem</string>
+    <string name="auth_password_dont_match">As senhas não correspondem</string>
     <string name="auth_forgot_password">Esqueceu sua senha?</string>
-    <string name="auth_use_server_options">Use opções customizadas de servidor (avançado)</string>
-    <string name="auth_email_validation_message">Por favor, verifique o seu e-mail para continuar o cadastro</string>
-    <string name="auth_threepid_warning_message">O registro de nova conta com email e número de telefone não é permitido enquanto o API não é desenvolvido. Apenas o número de telefone será levado em consideração.\n\nVocê poderá depois adicionar um email para o seu perfil nas configurações.</string>
-    <string name="auth_recaptcha_message">Este servidor de base quer ter certeza que você não é um robô</string>
-    <string name="auth_username_in_use">Nome de usuário já existe</string>
-    <string name="auth_home_server">Servidor Principal (Home Server):</string>
-    <string name="auth_identity_server">Servidor de Identidade (Identity Server):</string>
-    <string name="auth_reset_password_next_step_button">Eu verifiquei meu endereço de e-mail</string>
-    <string name="auth_reset_password_message">Para redefinir sua senha, coloque o email ligado à sua conta:</string>
-    <string name="auth_reset_password_missing_email">O email ligado à sua conta tem que ser inserido.</string>
-    <string name="auth_reset_password_missing_password">Uma nova senha tem que ser inserida.</string>
-    <string name="auth_reset_password_email_validation_message">Um e-mail foi enviado para %s. Quando você tiver clicado no link desta mensagem, clique abaixo.</string>
-    <string name="auth_reset_password_error_unauthorized">Falha ao verificar o email: verifique se você clicou no link no email</string>
-    <string name="auth_reset_password_success_message">Sua senha foi resetada.\n\nVocê foi desconectado de todos os aparelhos e não receberá mais notificações. Para reativar as notificações, entre novamente em cada um dos aparelhos.</string>
+    <string name="auth_use_server_options">Use opções para servidor personalizado (avançado)</string>
+    <string name="auth_email_validation_message">Por favor, verifique o seu e-mail para continuar a inscrição</string>
+    <string name="auth_threepid_warning_message">Atualmente, registrar-se com e-mail e número de telefone ao mesmo tempo não é possível. Apenas o número de telefone será levado em consideração.↵
+\n↵
+\nNo entanto, você pode adicionar o endereço de e-mail ao seu perfil nas configurações.</string>
+    <string name="auth_recaptcha_message">Este servidor local quer se certificar de que você não é um robô</string>
+    <string name="auth_username_in_use">Nome de usuário indisponível</string>
+    <string name="auth_home_server">Servidor principal:</string>
+    <string name="auth_identity_server">Servidor de identidade:</string>
+    <string name="auth_reset_password_next_step_button">Eu verifiquei o meu endereço de e-mail</string>
+    <string name="auth_reset_password_message">Para redefinir sua senha, digite o endereço de e-mail vinculado à sua conta:</string>
+    <string name="auth_reset_password_missing_email">O e-mail vinculado à sua conta precisa ser informado.</string>
+    <string name="auth_reset_password_missing_password">Uma nova senha precisa ser inserida.</string>
+    <string name="auth_reset_password_email_validation_message">Um e-mail foi enviado para %s. Após clicar no link contido no e-mail, clique abaixo.</string>
+    <string name="auth_reset_password_error_unauthorized">Falha ao confirmar o endereço de e-mail: certifique-se de clicar no link do e-mail</string>
+    <string name="auth_reset_password_success_message">Sua senha foi alterada.↵
+\n↵
+\nVocê foi desconectado de todas as sessões e não receberá mais notificações. Para reativar as notificações, faça login novamente em cada aparelho.</string>
 
     <!-- Login Screen -->
-    <string name="login_error_must_start_http">URL tem que começar com http[s]://</string>
-    <string name="login_error_network_error">Não foi possível fazer login: Erro de rede</string>
+    <string name="login_error_must_start_http">O endereço precisa começar com http[s]://</string>
+    <string name="login_error_network_error">Não foi possível fazer login: erro de rede</string>
     <string name="login_error_unable_login">Não foi possível fazer login</string>
-    <string name="login_error_registration_network_error">Não foi possível criar conta: Erro de rede</string>
+    <string name="login_error_registration_network_error">Não foi possível criar conta: erro de rede</string>
     <string name="login_error_unable_register">Não foi possível criar conta</string>
-    <string name="login_error_unable_register_mail_ownership">Não foi possível criar conta: falha na verificação de posse do email</string>
-    <string name="login_error_invalid_home_server">Por favor, digite uma URL válida</string>
+    <string name="login_error_unable_register_mail_ownership">Não foi possível criar conta: falha na verificação de posse do e-mail</string>
+    <string name="login_error_invalid_home_server">Por favor, digite um endereço válido</string>
 
     <string name="login_error_forbidden">Nome de usuário ou senha inválido</string>
     <string name="login_error_unknown_token">O token de acesso especificado não foi reconhecido</string>
     <string name="login_error_bad_json">JSON mal formatado</string>
-    <string name="login_error_not_json">Não continha JSON válido</string>
-    <string name="login_error_limit_exceeded">Foram enviadas solicitações demais</string>
-    <string name="login_error_user_in_use">Este nome de usuário já está sendo usado</string>
-    <string name="login_error_login_email_not_yet">O link no email ainda não foi clicado</string>
+    <string name="login_error_not_json">Não contem um JSON válido</string>
+    <string name="login_error_limit_exceeded">Muitas solicitações foram enviadas</string>
+    <string name="login_error_user_in_use">Este nome de usuário já está em uso</string>
+    <string name="login_error_login_email_not_yet">O link no e-mail ainda não foi clicado</string>
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">Você precisa fazer login novamente para gerar as chaves de criptografia ponta-a-ponta para este dispositivo e submeter a chave pública para o seu servidor de base ("Home Server").\nVocê só terá que fazer isso uma única vez.\nPedimos desculpas pela inconveniência.</string>
 
     <!-- read receipts list Screen -->
-    <string name="read_receipts_list">Ler lista de recipientes</string>
+    <string name="read_receipts_list">Lista de confirmações de leitura</string>
 
     <!-- accounts list Screen -->
 
@@ -203,12 +206,12 @@
     <string name="compression_options">Enviar como </string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Grande</string>
-    <string name="compression_opt_list_medium">Média</string>
-    <string name="compression_opt_list_small">Pequena</string>
+    <string name="compression_opt_list_medium">Médio</string>
+    <string name="compression_opt_list_small">Pequeno</string>
 
     <!-- media upload / download messages -->
     <string name="attachment_cancel_download">Cancelar o download?</string>
-    <string name="attachment_cancel_upload">Cancelar o upload?</string>
+    <string name="attachment_cancel_upload">Cancelar o envio\?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
 
@@ -218,49 +221,49 @@
 
     <!-- room info dialog Screen -->
     <string name="room_info_room_name">Nome da sala</string>
-    <string name="room_info_room_topic">Tópico da sala</string>
+    <string name="room_info_room_topic">Descrição da sala</string>
 
     <!-- call string -->
-    <string name="call_connected">Chamada conectada</string>
-    <string name="call_connecting">Conectando chamada…</string>
-    <string name="call_ended">Chamada terminada</string>
+    <string name="call_connected">Chamada aceita</string>
+    <string name="call_connecting">Chamando…</string>
+    <string name="call_ended">Chamada encerrada</string>
     <string name="call_ring">Chamando…</string>
     <string name="incoming_call">Recebendo chamada</string>
     <string name="incoming_video_call">Recebendo chamada de vídeo</string>
     <string name="incoming_voice_call">Recebendo chamada de voz</string>
     <string name="call_in_progress">Chamada em andamento…</string>
 
-    <string name="call_error_user_not_responding">A outra parte não conseguiu atender.</string>
+    <string name="call_error_user_not_responding">A pessoa não atendeu a chamada.</string>
     <string name="call_error_ice_failed">A conexão à mídia falhou</string>
-    <string name="call_error_camera_init_failed">Não consigo inicializar a câmera</string>
-    <string name="call_error_answered_elsewhere">chamada respondida em outro lugar</string>
+    <string name="call_error_camera_init_failed">Não foi possível iniciar a câmera</string>
+    <string name="call_error_answered_elsewhere">chamada atendida em outro lugar</string>
 
     <!-- medias picker string -->
-    <string name="media_picker_both_capture_title">Tomar uma foto ou um vídeo"</string>
-    <string name="media_picker_cannot_record_video">Não consigo gravar vídeo"</string>
+    <string name="media_picker_both_capture_title">Tirar uma foto ou gravar vídeo</string>
+    <string name="media_picker_cannot_record_video">Não é possível gravar vídeo</string>
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informação</string>
-    <string name="permissions_rationale_msg_storage">Element necessita permissão para acessar sua galeria de fotos e vídeos para poder enviar e salvar anexos.
-
-Por favor, permita acesso na próxima tela para poder enviar arquivos do seu celular.</string>
+    <string name="permissions_rationale_msg_storage">Element precisa de permissão para acessar sua galeria de fotos e vídeos para enviar e salvar anexos.↵
+\n↵
+\nPor favor, permita o acesso na próxima tela para poder enviar arquivos do seu celular.</string>
     <string name="permissions_rationale_msg_camera">Element necessita permissão para acessar sua câmera para poder tirar fotos e fazer chamadas de vídeo.</string>
-    <string name="permissions_rationale_msg_camera_explanation">
-
-Por favor, autorize o acesso na próxima tela para poder fazer a chamada.</string>
+    <string name="permissions_rationale_msg_camera_explanation">"
+\n
+\nPor favor, permita o acesso na próxima tela para fazer a chamada."</string>
     <string name="permissions_rationale_msg_record_audio">Element necessita permissão para acessar seu microfone para realizar chamadas de áudio.</string>
-    <string name="permissions_rationale_msg_record_audio_explanation">
-
-Por favor, autorize acesso na próxima tela para poder fazer a chamada.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element necessita permissão para acessar sua câmera e seu microfone para realizar chamadas de vídeo.
-
-Por favor, autorize acesso na próxima tela para poder fazer a chamada.</string>
-    <string name="permissions_rationale_msg_contacts">Element necessita permissão para acessar os seus contatos para poder encontrar outros usuários a partir de seus emails e números de telefone.
-
-Por favor, autorize o acesso na próxima tela para poder encontrar usuários na sua agenda que podem ser contactados pelo Element.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element necessita sua permissão para acessar os seus contatos para poder encontrar usuários na sua agenda a partir de seus emails e números de telefone.
-
-Você autoriza o Element a acessar seus contatos?</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">"
+\n
+\n↵
+\n↵
+\nPor favor, permita o acesso na próxima tela para fazer a chamada."</string>
+    <string name="permissions_rationale_msg_camera_and_audio">Element necessita permissão para acessar sua câmera e seu microfone para fazer chamadas de vídeo.↵ 
+\n↵ 
+\nPor favor, permita o acesso na próxima tela para fazer a chamada.</string>
+    <string name="permissions_rationale_msg_contacts">Element precisa de permissão para acessar os seus contatos para poder encontrar outros usuários a partir de seus e-mails e números de telefone. Se você concordar em usar a sua lista de contatos para esse propósito, permita o acesso na próxima janela pop-up.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element precisa de permissão para acessar os seus contatos para poder encontrar outros usuários a partir de seus e-mails e números de telefone.↵
+\n↵
+\nVocê concorda em usar a sua lista de contatos para esse propósito\?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Desculpe. A ação não foi realizada, por falta de permissão</string>
 
@@ -275,18 +278,18 @@ Você autoriza o Element a acessar seus contatos?</string>
     <string name="remove">Remover</string>
     <string name="join">Entrar</string>
     <string name="preview">Visualizar</string>
-    <string name="reject">Rejeitar</string>
+    <string name="reject">Recusar</string>
 
     <!-- Room -->
     <string name="room_jump_to_first_unread">Ir para a primeira mensagem não lida.</string>
 
     <!-- Room Preview -->
     <string name="room_preview_invitation_format">Você foi convidada(o) a entrar nesta sala por %s</string>
-    <string name="room_preview_unlinked_email_warning">Este convite foi enviado a %s, que não está associada(o) com esta conta.
+    <string name="room_preview_unlinked_email_warning">Este convite foi enviado a %s, que não está associado com esta conta.↵
 \nVocê pode querer fazer login com uma conta diferente, ou adicionar este e-mail à sua conta.</string>
     <string name="room_preview_try_join_an_unknown_room">Você está tentando acessar %s. Quer entrar na sala para poder participar da conversa?</string>
     <string name="room_preview_try_join_an_unknown_room_default">uma sala</string>
-    <string name="room_preview_room_interactions_disabled">Esta é uma pré-visualização desta sala. Interações cmo esta sala estão desabilitadas.</string>
+    <string name="room_preview_room_interactions_disabled">Esta é uma pré-visualização desta sala. Interações com esta sala estão desativadas.</string>
 
     <!-- Chat creation -->
     <string name="room_creation_title">Nova conversa</string>
@@ -295,7 +298,7 @@ Você autoriza o Element a acessar seus contatos?</string>
 
     <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Deixar a sala</string>
-    <string name="room_participants_leave_prompt_msg">Você tem certeza que deseja se retirar da sala?</string>
+    <string name="room_participants_leave_prompt_msg">Tem certeza de que deseja sair da sala\?</string>
     <string name="room_participants_remove_prompt_msg">Você tem certeza que quer remover %s desta conversa?</string>
     <string name="room_participants_create">Criar</string>
 
@@ -305,23 +308,24 @@ Você autoriza o Element a acessar seus contatos?</string>
 
     <string name="room_participants_header_admin_tools">FERRAMENTAS DE ADMINISTRAÇÃO</string>
     <string name="room_participants_header_call">CHAMADA</string>
-    <string name="room_participants_header_direct_chats">CONVERSAS DIRETAS</string>
-    <string name="room_participants_header_devices">DISPOSITIVOS</string>
+    <string name="room_participants_header_direct_chats">Conversas</string>
+    <string name="room_participants_header_devices">SESSÕES</string>
 
     <string name="room_participants_action_invite">Convidar</string>
     <string name="room_participants_action_leave">Deixar esta sala</string>
     <string name="room_participants_action_remove">Remover desta sala</string>
-    <string name="room_participants_action_ban">Banir</string>
-    <string name="room_participants_action_unban">Revogar banimento</string>
+    <string name="room_participants_action_ban">Banir da sala</string>
+    <string name="room_participants_action_unban">Remover banimento</string>
     <string name="room_participants_action_set_default_power_level">Redefinir como usuário normal</string>
     <string name="room_participants_action_set_moderator">Tornar moderador</string>
     <string name="room_participants_action_set_admin">Tornar admin</string>
-    <string name="room_participants_action_ignore">Esconder todas as mensagens deste usuário</string>
-    <string name="room_participants_action_unignore">Mostrar todas as mensagens deste usuário</string>
-    <string name="room_participants_invite_search_another_user">ID, Nome ou email</string>
-    <string name="room_participants_action_mention">Menção</string>
-    <string name="room_participants_action_devices_list">Mostrar lista de dispositivos</string>
-    <string name="room_participants_power_level_prompt">Você não poderá desfazer esta mudança, já que você está promovendo este usuário para ter o mesmo nível de permissões que você.\nTem certeza?</string>
+    <string name="room_participants_action_ignore">Bloquear</string>
+    <string name="room_participants_action_unignore">Desbloquear</string>
+    <string name="room_participants_invite_search_another_user">ID de usuário, nome e sobrenome ou e-mail</string>
+    <string name="room_participants_action_mention">Mencionar</string>
+    <string name="room_participants_action_devices_list">Mostrar lista de sessões</string>
+    <string name="room_participants_power_level_prompt">Você não poderá desfazer esta alteração, já que você está promovendo este usuário para ter o mesmo nível de permissões que você.
+\nTem certeza\?</string>
 
     <string name="room_participants_invite_prompt_msg">"Você tem certeza que quer convidar %s para esta conversa?"</string>
 
@@ -330,38 +334,38 @@ Você autoriza o Element a acessar seus contatos?</string>
     <string name="people_search_local_contacts">CONTATOS LOCAIS (%d)</string>
     <string name="people_search_filter_text">Apenas usuários Matrix</string>
 
-    <string name="people_search_invite_by_id_dialog_title">Convidar pessoa pelo seu ID</string>
-    <string name="people_search_invite_by_id_dialog_description">Por favor, entre com um ou mais endereços de e-mail ou ID Matrix</string>
-    <string name="people_search_invite_by_id_dialog_hint">Email ou ID Matrix</string>
+    <string name="people_search_invite_by_id_dialog_title">Convidar pessoa por sua ID</string>
+    <string name="people_search_invite_by_id_dialog_description">Por favor, digite um ou mais endereços de e-mail ou ID Matrix</string>
+    <string name="people_search_invite_by_id_dialog_hint">E-mail ou ID Matrix</string>
 
     <!--  Chat -->
     <string name="room_menu_search">Pesquisar</string>
     <string name="room_one_user_is_typing">%s está digitando…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s estão digitando…</string>
     <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; outros estão digitando…</string>
-    <string name="room_message_placeholder_encrypted">Enviar mensagem criptografada…</string>
-    <string name="room_message_placeholder_not_encrypted">Enviar uma mensagem (não criptografada)…</string>
+    <string name="room_message_placeholder_encrypted">Digite uma mensagem criptografada…</string>
+    <string name="room_message_placeholder_not_encrypted">Digite uma mensagem (não criptografada)…</string>
     <string name="room_offline_notification">A conexão com o servidor se perdeu.</string>
     <string name="room_unsent_messages_notification">Mensagens não enviadas. %1$s ou %2$s agora?</string>
-    <string name="room_unknown_devices_messages_notification">Mensagens não enviadas por causa da presença de dispositivos desconhecidos presentes. %1$s or %2$s agora?</string>
+    <string name="room_unknown_devices_messages_notification">Mensagens não enviadas por causa da presença de sessões desconhecidas. %1$s ou %2$s agora\?</string>
     <string name="room_prompt_resend">Reenviar todas</string>
     <string name="room_prompt_cancel">Cancelar todas</string>
     <string name="room_resend_unsent_messages">Reenviar mensagens não enviadas</string>
     <string name="room_delete_unsent_messages">Apagar mensagens não enviadas</string>
     <string name="room_message_file_not_found">Arquivo não encontrado</string>
-    <string name="room_do_not_have_permission_to_post">Você não tem permissão para enviar mensagens nesta sala</string>
+    <string name="room_do_not_have_permission_to_post">Você não tem permissão para digitar nesta sala</string>
 
     <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Confiar</string>
     <string name="ssl_do_not_trust">Não confiar</string>
     <string name="ssl_logout_account">Sair da Conta</string>
-    <string name="ssl_remain_offline">Ignorar</string>
+    <string name="ssl_remain_offline">Bloquear</string>
     <string name="ssl_fingerprint_hash">Impressão digital (%s):</string>
-    <string name="ssl_could_not_verify">Não consegui verificar a identidade do servidor remoto.</string>
-    <string name="ssl_cert_not_trust">Isso pode significar que alguém está interceptando suas mensagens de forma maliciosa, ou então o seu telefone não confia no certificado fornecido pelo servidor remoto.</string>
+    <string name="ssl_could_not_verify">Não foi possível confirmar a identidade do servidor remoto.</string>
+    <string name="ssl_cert_not_trust">Isso pode significar que alguém está interceptando suas mensagens de forma maliciosa, ou então o seu celular não confia no certificado fornecido pelo servidor remoto.</string>
     <string name="ssl_cert_new_account_expl">Se o administrador do servidor disse que isso era esperado, verifique se a impressão digital abaixo é a mesma que a impressão digital que ele forneceu a você.</string>
-    <string name="ssl_unexpected_existing_expl">O certificado mudou de um que era confiável no seu telefone. Isso é ALTAMENTE ESTRANHO. Recomendamos que você NÃO ACEITE este novo certificado.</string>
-    <string name="ssl_expected_existing_expl">O certificado mudou de um que era confiável no seu telefone para um que não é considerado confiável pelo seu aparelho. Pode ser que o servidor renovou seu certificado. Entre em contato com o administrador do servidor e peça a impressão digital esperada.</string>
+    <string name="ssl_unexpected_existing_expl">Você tinha um certificado confiável para o seu telefone, mas ele mudou. Isso é ALTAMENTE INCOMUM. É recomendável que você NÃO ACEITE este novo certificado.</string>
+    <string name="ssl_expected_existing_expl">O certificado foi alterado de um anteriormente confiável para um que não é confiável. O servidor pode ter renovado seu certificado. Entre em contato com o administrador do servidor para obter a impressão digital esperada.</string>
     <string name="ssl_only_accept">Apenas aceite o certificado se o administrador do servidor publicou uma impressão digital que é idêntica a que está acima.</string>
 
     <!-- Room Details -->
@@ -369,15 +373,15 @@ Você autoriza o Element a acessar seus contatos?</string>
     <string name="room_details_people">Pessoas</string>
     <string name="room_details_files">Arquivos</string>
     <string name="room_details_settings">Configurações</string>
-    <string name="malformed_id">ID mal formatado. Tem que ser um endereço de e-mail ou um ID Matrix como por exemplo \'@localpart:domain\'</string>
+    <string name="malformed_id">ID mal formatado. Precisa ser um endereço de e-mail ou um ID Matrix, como \'@membrolocal:dominio\'</string>
     <string name="room_details_people_invited_group_name">CONVIDADOS</string>
     <string name="room_details_people_present_group_name">ENTRARAM</string>
 
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Motivo de denunciar este conteúdo</string>
-    <string name="room_event_action_report_prompt_ignore_user">Você deseja ocultar todas as mensagens deste usuário?
-
-Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.</string>
+    <string name="room_event_action_report_prompt_ignore_user">Você deseja ocultar todas as mensagens deste usuário\?↵
+\n↵
+\nNote que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.</string>
     <string name="room_event_action_cancel_upload">Cancelar envio</string>
     <string name="room_event_action_cancel_download">Cancelar download</string>
 
@@ -419,33 +423,33 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
     <string name="room_sliding_menu_settings">Configurações</string>
     <string name="room_sliding_menu_version">Versão</string>
     <string name="room_sliding_menu_term_and_conditions">Termos e condições</string>
-    <string name="room_sliding_menu_third_party_notices">Notas de terceira parte</string>
+    <string name="room_sliding_menu_third_party_notices">Avisos de terceiros</string>
     <string name="room_sliding_menu_copyright">Direito autoral</string>
     <string name="room_sliding_menu_privacy_policy">Política de privacidade</string>
 
     <!-- Vector Settings -->
 
     <string name="settings_profile_picture">Imagem do perfil</string>
-    <string name="settings_display_name">Nome público</string>
-    <string name="settings_email_address">Email</string>
-    <string name="settings_add_email_address">Adicionar endereço de email</string>
+    <string name="settings_display_name">Nome e sobrenome</string>
+    <string name="settings_email_address">E-mail</string>
+    <string name="settings_add_email_address">Adicionar endereço de e-mail</string>
     <string name="settings_phone_number">Telefone</string>
     <string name="settings_add_phone_number">Adicionar número de telefone</string>
-    <string name="settings_app_info_link_summary">Tela de informações sobre o sistema do aplicativo.</string>
+    <string name="settings_app_info_link_summary">Mostrar informações do aplicativo nas configurações do sistema.</string>
     <string name="settings_app_info_link_title">Informações sobre o aplicativo</string>
 
-    <string name="settings_enable_all_notif">Habilitar notificações para esta conta</string>
-    <string name="settings_enable_this_device">Habilitar notificações para este dispositivo</string>
+    <string name="settings_enable_all_notif">Receba notificações de novas mensagens</string>
+    <string name="settings_enable_this_device">Ativar notificações nesta sessão</string>
     <string name="settings_turn_screen_on">Acender a tela por 3 segundos</string>
 
     <string name="settings_messages_in_one_to_one">Msgs em conversas diretas</string>
-    <string name="settings_messages_in_group_chat">Msgs em salas</string>
+    <string name="settings_messages_in_group_chat">Mensagens em salas</string>
     <string name="settings_invited_to_room">Quando eu sou convidado a uma sala</string>
     <string name="settings_call_invitations">Convites para chamadas</string>
     <string name="settings_messages_sent_by_bot">Mensagens enviadas por "bot"</string>
 
     <string name="settings_background_sync">Sincronização em segundo plano</string>
-    <string name="settings_enable_background_sync">Habilitar sincronização em segundo plano</string>
+    <string name="settings_enable_background_sync">Ativar a sincronização em segundo plano</string>
     <string name="settings_set_sync_timeout">Tempo expirado na solicitação de sincronização</string>
     <string name="settings_set_sync_delay">Demora entre cada solicitação</string>
     <string name="settings_second">segundo</string>
@@ -454,7 +458,7 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
     <string name="settings_version">Versão</string>
     <string name="settings_olm_version">versão olm</string>
     <string name="settings_app_term_conditions">Termos e condições</string>
-    <string name="settings_third_party_notices">Notas de terceira parte</string>
+    <string name="settings_third_party_notices">Avisos de terceiros</string>
     <string name="settings_copyright">Direitos autorais</string>
     <string name="settings_privacy_policy">Política de privacidade</string>
     <string name="settings_clear_cache">Limpar cache</string>
@@ -463,7 +467,7 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
 
     <string name="settings_user_settings">Configurações de usuário</string>
     <string name="settings_notifications">Notificações</string>
-    <string name="settings_ignored_users">Usuárias/os ignorados</string>
+    <string name="settings_ignored_users">Usuários bloqueados</string>
     <string name="settings_other">Outros</string>
     <string name="settings_advanced">Avançado</string>
     <string name="settings_cryptography">Criptografia</string>
@@ -474,12 +478,12 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
     <string name="settings_home_display">Página inicial</string>
     <string name="settings_pin_missed_notifications">Fixar salas com notificações perdidas</string>
     <string name="settings_pin_unread_messages">Fixar salas com mensagens não lidas</string>
-    <string name="settings_devices_list">Dispositivos</string>
-    <string name="devices_details_dialog_title">Detalhes de dispositivos</string>
+    <string name="settings_devices_list">Sessões</string>
+    <string name="devices_details_dialog_title">Detalhes da sessão</string>
     <string name="devices_details_id_title">ID</string>
     <string name="devices_details_name_title">Nome</string>
-    <string name="devices_details_device_name">Nome do dispositivo</string>
-    <string name="devices_details_last_seen_title">Último acesso</string>
+    <string name="devices_details_device_name">Nome público do aparelho</string>
+    <string name="devices_details_last_seen_title">Visto por último às</string>
     <string name="devices_details_last_seen_format">%1$s em %2$s</string>
     <string name="devices_delete_dialog_text">Esta operação exige autenticação adicional.\nPara continuar, digite sua senha.</string>
     <string name="devices_delete_dialog_title">Autenticação</string>
@@ -490,23 +494,23 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
     <string name="settings_home_server">Servidor Principal (Home Server)</string>
     <string name="settings_identity_server">Servidor de Identidade (Identity Server)</string>
 
-    <string name="account_email_validation_title">Verificação pendente</string>
-    <string name="account_email_validation_message">Por favor verifique o seu email e clique no link que está lá. Feito isso, clique em continuar.</string>
-    <string name="account_email_validation_error">Não consegui averiguar o seu endereço de e-mail. Favor verificar seu e-mail e clicar no link que ele contém. Quando tiver feito isso, clique em continuar.</string>
+    <string name="account_email_validation_title">Confirmação pendente</string>
+    <string name="account_email_validation_message">Por favor, verifique o seu e-mail e clique no link que está lá. Feito isso, clique em continuar.</string>
+    <string name="account_email_validation_error">Não não foi possível confirmar o seu endereço de e-mail. Por favor, verifique o seu e-mail e clique no link que ele contém. Feito isso, clique em continuar.</string>
 
     <string name="account_email_already_used_error">Este endereço de e-mail já está em uso.</string>
     <string name="account_email_not_found_error">Este endereço de e-mail não foi encontrado.</string>
     <string name="account_phone_number_already_used_error">Este número de telefone já está em uso.</string>
 
-    <string name="settings_change_password">Mudar a senha</string>
+    <string name="settings_change_password">Alterar a senha</string>
     <string name="settings_old_password">Senha atual</string>
     <string name="settings_new_password">Senha nova</string>
     <string name="settings_confirm_password">Confirme a nova senha</string>
     <string name="settings_fail_to_update_password">Não consegui atualizar a senha</string>
     <string name="settings_password_updated">Sua senha foi atualizada</string>
-    <string name="settings_unignore_user">Mostrar todas as mensagens de %s?
-
-Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.</string>
+    <string name="settings_unignore_user">Mostrar todas as mensagens de %s\?↵
+\n↵
+\nNote que esta ação irá reiniciar o aplicativo e pode levar algum tempo.</string>
 
     <string name="settings_delete_notification_targets_confirmation">Você tem certeza que quer remover este destino de notificação?</string>
 
@@ -518,7 +522,7 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
     <string name="settings_phone_number_country_error">Por favor, escolha um país</string>
     <string name="settings_phone_number_label">Número de telefone</string>
     <string name="settings_phone_number_error">Número de telefone inválido para o país selecionado</string>
-    <string name="settings_phone_number_verification">Verificação do telefone</string>
+    <string name="settings_phone_number_verification">Confirmação do telefone</string>
     <string name="settings_phone_number_verification_instruction">"Nós enviamos um SMS com um código de ativação. Por favor, digite este código abaixo."</string>
     <string name="settings_phone_number_verification_error_empty_code">Digite o código de ativação</string>
     <string name="settings_phone_number_verification_error">Erro ao validar o seu número de telefone</string>
@@ -529,20 +533,20 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
     <!-- room global settings-->
     <string name="room_settings_room_photo">Foto da sala</string>
     <string name="room_settings_room_name">Nome da sala</string>
-    <string name="room_settings_topic">Tópico</string>
+    <string name="room_settings_topic">Descrição</string>
     <string name="room_settings_room_tag">Etiqueta da sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetada como:</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Favoritar</string>
     <string name="room_settings_tag_pref_entry_low_priority">Baixa prioridade</string>
-    <string name="room_settings_tag_pref_entry_none">Nenhum</string>
+    <string name="room_settings_tag_pref_entry_none">Nenhuma</string>
 
     <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Acesso e visibilidade</string>
     <string name="room_settings_directory_visibility">Exibir esta sala no diretório público de salas</string>
     <string name="room_settings_room_access_rules_pref_title">Acesso à sala</string>
-    <string name="room_settings_room_read_history_rules_pref_title">Grau de acesso à história da sala</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Legibilidade do histórico da sala</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Quem pode ler o histórico de mensagens?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Quem pode acessar esta sala?</string>
 
@@ -565,13 +569,13 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
     <string name="room_settings_category_advanced_title">Avançado</string>
     <string name="room_settings_room_internal_id">ID interno desta sala</string>
     <string name="room_settings_addresses_pref_title">Endereços</string>
-    <string name="room_settings_labs_pref_title">Labs</string>
-    <string name="room_settings_labs_warning_message">Estas são funcionalidades experimentais que podem quebrar de forma inesperada. Use com cautela.</string>
-    <string name="room_settings_labs_end_to_end">Criptografia ponta-a-ponta</string>
-    <string name="room_settings_labs_end_to_end_is_active">Criptografia ponta-a-ponta está ativa</string>
-    <string name="room_settings_labs_end_to_end_warnings">Você precisa desconectar para poder habilitar a criptografia.</string>
-    <string name="room_settings_never_send_to_unverified_devices_title">Criptografar apenas para dispositivos verificados</string>
-    <string name="room_settings_never_send_to_unverified_devices_summary">Nunca enviar mensagens criptografadas para dispositivos não verificados nesta sala a partir deste dispositivo.</string>
+    <string name="room_settings_labs_pref_title">Laboratórios</string>
+    <string name="room_settings_labs_warning_message">Estes são recursos experimentais que podem quebrar de forma inesperada. Use com cautela.</string>
+    <string name="room_settings_labs_end_to_end">Criptografia de ponta a ponta</string>
+    <string name="room_settings_labs_end_to_end_is_active">A criptografia de ponta a ponta está ativada</string>
+    <string name="room_settings_labs_end_to_end_warnings">Você precisa desconectar para poder ativar a criptografia.</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">Criptografar apenas para sessões confirmadas</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">Nunca enviar mensagens criptografadas para sessões não confirmadas nesta sala, a partir desta sessão.</string>
 
     <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Esta sala não tem endereços locais</string>
@@ -587,9 +591,10 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
     <string name="room_settings_copy_room_id">Copiar o ID desta sala</string>
     <string name="room_settings_copy_room_address">Copiar o endereço desta sala</string>
 
-    <string name="room_settings_addresses_e2e_enabled">Criptografia está habilitada nesta sala.</string>
-    <string name="room_settings_addresses_e2e_disabled">Criptografia está desabilitada nesta sala.</string>
-    <string name="room_settings_addresses_e2e_encryption_warning">Ativar criptografia \n(atenção: não é possível desabilitar depois!)</string>
+    <string name="room_settings_addresses_e2e_enabled">A criptografia está ativada nesta sala.</string>
+    <string name="room_settings_addresses_e2e_disabled">A criptografia está desativada nesta sala.</string>
+    <string name="room_settings_addresses_e2e_encryption_warning">Ativar criptografia·↵
+\n(atenção: não é possível desativar depois!)</string>
 
     <!-- Directory -->
     <string name="directory_title">Diretório</string>
@@ -599,7 +604,7 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
 
 
     <!-- encryption dialog -->
-    <string name="encryption_information_title">Informação sobre criptografia ponta-a-ponta</string>
+    <string name="encryption_information_title">Informação sobre a criptografia de ponta a ponta</string>
 
     <string name="encryption_information_device_info">Informação do evento</string>
     <string name="encryption_information_user_id">ID de usuária/o</string>
@@ -609,20 +614,20 @@ Note que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.
     <string name="encryption_information_session_id">ID de Sessão</string>
     <string name="encryption_information_decryption_error">Erro de descriptografia</string>
 
-    <string name="encryption_information_sender_device_information">Informação sobre o dispositivo do remetente</string>
-    <string name="encryption_information_device_name">Nome do dispositivo</string>
+    <string name="encryption_information_sender_device_information">Informação sobre a sessão do remetente</string>
+    <string name="encryption_information_device_name">Nome público do aparelho</string>
     <string name="encryption_information_name">Nome</string>
-    <string name="encryption_information_device_id">ID do dispositivo</string>
-    <string name="encryption_information_device_key">Chave do dispositivo</string>
-    <string name="encryption_information_verification">Verificação</string>
+    <string name="encryption_information_device_id">ID do aparelho</string>
+    <string name="encryption_information_device_key">Chave da sessão</string>
+    <string name="encryption_information_verification">Confirmação</string>
     <string name="encryption_information_ed25519_fingerprint">Impressão digital ed25519</string>
 
     <string name="encryption_export_e2e_room_keys">Exportar chaves de sala E2E</string>
     <string name="encryption_export_room_keys">Exportar chaves de sala</string>
     <string name="encryption_export_room_keys_summary">Exportar as chaves para um arquivo local</string>
     <string name="encryption_export_export">Exportar</string>
-    <string name="passphrase_enter_passphrase">Entre com a \'passphrase\'</string>
-    <string name="passphrase_confirm_passphrase">Confirme a \'passphrase\'</string>
+    <string name="passphrase_enter_passphrase">Digite a frase secreta</string>
+    <string name="passphrase_confirm_passphrase">Confirme a frase secreta</string>
     <string name="encryption_export_saved_as">As chaves de sala E2E foram salvas em \'%s\'
 
 Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</string>
@@ -631,47 +636,49 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="encryption_import_room_keys">Importar chaves de sala</string>
     <string name="encryption_import_room_keys_summary">Importar as chaves de um arquivo local</string>
     <string name="encryption_import_import">Importar</string>
-    <string name="encryption_never_send_to_unverified_devices_title">Criptografar apenas para dispositivos verificados</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Nunca enviar mensagens criptografadas para dispositivos não verificados a partir deste dispositivo.</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Criptografar apenas para sessões confirmadas</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Nunca enviar mensagens criptografadas para sessões não confirmadas, a partir desta sessão.</string>
 
-    <string name="encryption_information_not_verified">NÃO verificado</string>
-    <string name="encryption_information_verified">Verificado</string>
+    <string name="encryption_information_not_verified">Não confirmado</string>
+    <string name="encryption_information_verified">Confirmado</string>
     <string name="encryption_information_blocked">Na lista negra</string>
 
-    <string name="encryption_information_unknown_device">dispositivo desconhecido</string>
-    <string name="encryption_information_none">nenhum</string>
+    <string name="encryption_information_unknown_device">sessão desconhecida</string>
+    <string name="encryption_information_none">nenhuma</string>
 
-    <string name="encryption_information_verify">Verificar</string>
-    <string name="encryption_information_unverify">Marcar como não verificado</string>
+    <string name="encryption_information_verify">Confirmar</string>
+    <string name="encryption_information_unverify">Marcar como não confirmado</string>
     <string name="encryption_information_block">Colocar na lista negra</string>
     <string name="encryption_information_unblock">Retirar da lista negra</string>
 
-    <string name="encryption_information_verify_device">Verificar dispositivo</string>
-    <string name="encryption_information_verify_device_warning">Para confirmar que este dispositivo é confiável, entre em contato com o seu proprietário usando outros meios (por exemplo pessoalmente ou através de uma chamada telefônica) e pergunte a ele se a chave que ele está vendo na sua configuração de usuário para este dispositivo é igual à chave abaixo:</string>
-    <string name="encryption_information_verify_device_warning2">Se é igual, clique no botão verificar abaixo. Se não é igual, então alguém está interceptando este dispositivo e você pode querer clicar no botão bloquear. No futuro, este processo de verificação será mais sofisticado.</string>
+    <string name="encryption_information_verify_device">Confirmar sessão</string>
+    <string name="encryption_information_verify_device_warning">Compare as seguintes informações com aquelas na sessão do outro usuário e confirme:</string>
+    <string name="encryption_information_verify_device_warning2">Se não corresponderem, a segurança da sua comunicação pode estar comprometida.</string>
     <string name="encryption_information_verify_key_match">Eu confirmo que as chaves são iguais</string>
 
-    <string name="e2e_enabling_on_app_update">Element agora permite criptografia ponta-a-ponta mas você precisa fazer login de novo para ativá-la.\n\nVocê pode fazer isso mais tarde a partir das configurações do aplicativo.</string>
-
     <!-- unknown devices management -->
-    <string name="unknown_devices_alert_title">Esta sala contém dispositivos desconhecidos</string>
-    <string name="unknown_devices_alert_message">Esta sala contém dispositivos desconhecidos que não foram verificados.\nIsso significa que não se pode garantir que estes dispositivos realmente pertencem aos usuários identificados.\nRecomendamos que você faça o processo de verificação para cada dispositivo desconhecido antes de continuar, mas você pode reenviar a mensagem sem verificar o dispositivo se preferir.\n\nDispositivos desconhecidos nesta sala:</string>
+    <string name="unknown_devices_alert_title">Esta sala contém sessões desconhecidas</string>
+    <string name="unknown_devices_alert_message">Esta sala contém sessões desconhecidas que não foram confirmadas.↵ 
+\nIsso significa que não há garantia de que estas sessões realmente pertencem aos usuários identificados.↵ 
+\nRecomendamos que você faça o processo de confirmação para cada sessão desconhecida antes de continuar, mas você pode reenviar a mensagem sem confirmar os aparelhos, se preferir.↵ 
+\n↵ 
+\nSessões desconhecidas nesta sala:</string>
 
     <!-- directory activity  -->
     <string name="select_room_directory">Escolha uma lista pública de salas</string>
     <string name="directory_server_fail_to_retrieve_server">O servidor pode estar indisponível ou sobrecarregado</string>
     <string name="directory_server_type_homeserver">Entre com um servidor principal (homeserver) a partir do qual serão listadas as salas públicas</string>
-    <string name="directory_server_placeholder">URL do Servidor Principal (Homeserver)</string>
+    <string name="directory_server_placeholder">Endereço do servidor principal</string>
     <string name="directory_server_all_rooms_on_server">Todas as salas com o servidor %s</string>
     <string name="directory_server_native_rooms">Todas as salas nativas em %s</string>
 
     <!-- historical -->
     <string name="historical_placeholder">Pesquisar no histórico</string>
-    <string name="offline">Desconectada(o)</string>
+    <string name="offline">Desconectado</string>
 
-    <string name="user_directory_header">Lista de usuárias(os)</string>
+    <string name="user_directory_header">Lista de usuários</string>
     <string name="people_search_user_directory">LISTA DE USUÁRIAS(OS) (%s)</string>
-    <string name="settings_start_on_boot">Iniciar na inicialização do celular</string>
+    <string name="settings_start_on_boot">Iniciar com o sistema</string>
     <string name="settings_clear_media_cache">Esvaziar o cache de mídia</string>
     <string name="settings_keep_media">Manter mídia</string>
 
@@ -701,58 +708,56 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="dark_theme">Tema escuro</string>
     <string name="black_them">Tema preto</string>
 
-    <string name="notification_sync_in_progress">Sincronizando</string>
+    <string name="notification_sync_in_progress">Sincronizando…</string>
     <string name="notification_listening_for_events">Escutando eventos</string>
-    <string name="notification_noisy_notifications">Notificações ruidosas</string>
+    <string name="notification_noisy_notifications">Notificações com som</string>
     <string name="notification_silent_notifications">Notificações silenciosas</string>
 
-    <string name="title_activity_bug_report">Relatório de erros</string>
+    <string name="title_activity_bug_report">Relatar um erro</string>
     <string name="title_activity_group_details">Detalhes da comunidade</string>
 
     <string name="loading">Carregando…</string>
 
-    <string name="action_exit">Sair do App</string>
+    <string name="action_exit">Sair</string>
     <string name="bottom_action_groups">Comunidades</string>
 
     <string name="home_filter_placeholder_groups">Filtrar nomes de comunidades</string>
 
     <string name="groups_invite_header">Convidar</string>
     <string name="groups_header">Comunidades</string>
-    <string name="no_group_placeholder">Não há grupos</string>
+    <string name="no_group_placeholder">Nenhuma comunidade</string>
 
-    <string name="start_new_chat_prompt_msg">Você tem certeza que quer começar uma conversa com %s?</string>
-    <string name="start_voice_call_prompt_msg">Você tem certeza que quer iniciar uma chamada de voz?</string>
-    <string name="start_video_call_prompt_msg">Você tem certeza que quer iniciar uma chamada de vídeo?</string>
+    <string name="start_new_chat_prompt_msg">Tem certeza de que deseja iniciar uma nova conversa com %s\?</string>
+    <string name="start_voice_call_prompt_msg">Tem certeza de que deseja iniciar uma chamada de voz\?</string>
+    <string name="start_video_call_prompt_msg">Tem certeza de que deseja iniciar uma chamada de vídeo\?</string>
 
     <string name="option_take_photo">Tirar foto</string>
     <string name="option_take_video">Gravar vídeo</string>
 
-    <string name="login_mobile_device">Celular</string>
+    <string name="groups_list">Lista de comunidades</string>
 
-    <string name="groups_list">Lista dos grupos</string>
+    <string name="call">Chamada de voz</string>
+    <string name="room_participants_ban_prompt_msg">Banir o usuário resultará em sua remoção desta sala, impedindo-o de entrar nela novamente.</string>
 
-    <string name="call">Chamada</string>
-    <string name="room_participants_ban_prompt_msg">Tem certeza que quer banir esta pessoa desta conversa?</string>
-
-    <string name="room_settings_all_messages_noisy">Notificação sonora para cada mensagem</string>
-    <string name="room_settings_all_messages">Notificação para cada mensagem</string>
-    <string name="room_settings_mention_only">Apenas quando mencionado</string>
+    <string name="room_settings_all_messages_noisy">Todas as mensagens novas (com som)</string>
+    <string name="room_settings_all_messages">Todas as mensagens novas</string>
+    <string name="room_settings_mention_only">Apenas @menções</string>
     <string name="room_settings_mute">Silenciar</string>
     <string name="room_settings_add_homescreen_shortcut">Adicionar atalho na tela inicial</string>
 
     <string name="settings_notification_ringtone">Som de notificação</string>
-    <string name="settings_containing_my_display_name">Mensagens que contenham o meu nome público</string>
+    <string name="settings_containing_my_display_name">Mensagens que contenham o meu nome e sobrenome</string>
     <string name="settings_containing_my_user_name">Mensagens que contenham o meu nome de usuária(o)</string>
-    <string name="settings_inline_url_preview">Visualização prévia do URL</string>
+    <string name="settings_inline_url_preview">Visualização prévia do endereço</string>
     <string name="settings_12_24_timestamps">Mostrar a hora no formato de 12 horas</string>
     <string name="settings_vibrate_on_mention">Vibrar ao mencionar um usuário</string>
 
     <string name="settings_analytics">Estatísticas de uso</string>
 
-    <string name="settings_flair">Insígnias</string>
+    <string name="settings_flair">Ícone</string>
 
     <string name="room_settings_room_notifications_title">Notificações</string>
-    <string name="room_settings_no_flair">Esta sala não está mostrando insígnias para nenhuma comunidade</string>
+    <string name="room_settings_no_flair">Esta sala não está mostrando ícones de nenhuma comunidade</string>
     <string name="room_settings_add_new_group">Nova ID da comunidade (p.ex: +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">ID de comunidade inválido</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' não é um ID de comunidade válido</string>
@@ -760,13 +765,13 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
 
     <string name="widget_no_power_to_manage">Você necessita ter permissões para poder gerenciar os widgets desta sala</string>
     <string name="widget_creation_failure">A criação do widget falhou</string>
-    <string name="settings_labs_create_conference_with_jitsi">Criar chamadas de conferência com jitsi</string>
+    <string name="settings_labs_create_conference_with_jitsi">Crie chamadas em grupo com jitsi</string>
     <string name="widget_delete_message_confirmation">Você tem certeza que quer apagar este widget desta sala?</string>
 
     <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Impossível criar o widget.</string>
     <string name="widget_integration_failed_to_send_request">O envio do pedido falhou.</string>
-    <string name="widget_integration_positive_power_level">O nível de permissões tem que ser um número inteiro positivo.</string>
+    <string name="widget_integration_positive_power_level">O nível de permissão precisa ser um número inteiro positivo.</string>
     <string name="widget_integration_must_be_in_room">Você não está nesta sala.</string>
     <string name="widget_integration_no_permission_in_room">Você não tem permissões para fazer isso nesta sala.</string>
     <string name="widget_integration_missing_room_id">O pedido veio sem o room_id.</string>
@@ -776,15 +781,15 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="settings_labs_native_camera">Usar a câmera nativa</string>
 
     <!-- share keys -->
-    <string name="you_added_a_new_device">Você adicionou um novo dispositivo \'%s\', que está solicitando as chaves de criptografia.</string>
-    <string name="your_unverified_device_requesting">Seu dispositivo não-verificado \'%s\' está solicitando as chaves de criptografia.</string>
-    <string name="start_verification">Iniciar a verificação</string>
-    <string name="share_without_verifying">Compartilhar sem verificar</string>
+    <string name="you_added_a_new_device">Você adicionou uma nova sessão \'%s\', que está solicitando as chaves de criptografia.</string>
+    <string name="your_unverified_device_requesting">Sua sessão não confirmada \'%s\' está solicitando as chaves de criptografia.</string>
+    <string name="start_verification">Iniciar a confirmação</string>
+    <string name="share_without_verifying">Compartilhar sem confirmar</string>
     <string name="ignore_request">Ignorar a solicitação</string>
 
     <!-- conference call -->
     <string name="conference_call_warning_title">Atenção!</string>
-    <string name="conference_call_warning_message">Chamadas de conferência estão em desenvolvimento e portanto podem não ser confiáveis.</string>
+    <string name="conference_call_warning_message">Chamadas em grupo estão em desenvolvimento, portanto podem não ser estáveis.</string>
 
     <!-- slash commands -->
     <string name="command_error">Erro de comando</string>
@@ -792,7 +797,7 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
 
     <!-- notification statuses -->
     <string name="notification_off">Desativado</string>
-    <string name="notification_noisy">Alto</string>
+    <string name="notification_noisy">Ativado com som</string>
 
     <string name="encrypted_message">Mensagem criptografada</string>
 
@@ -811,15 +816,15 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="no_users_placeholder">Sem ninguém</string>
 
     <string name="rooms">Salas</string>
-    <string name="joined">Em que entrou</string>
+    <string name="joined">Entrou</string>
     <string name="invited">em que foi convidada/o</string>
-    <string name="filter_group_members">Filtrar integrantes do grupo</string>
-    <string name="filter_group_rooms">Filtrar salas de grupo</string>
+    <string name="filter_group_members">Filtrar integrantes da comunidade</string>
+    <string name="filter_group_rooms">Filtrar salas da comunidade</string>
 
     <string name="group_no_long_description">O(A) administrador(a) desta comunidade não definiu uma descrição longa da mesma.</string>
 
-    <string name="has_been_kicked">Você foi excluída/o da sala %1$s por %2$s</string>
-    <string name="has_been_banned">Você foi banida/o da sala %1$s por %2$s</string>
+    <string name="has_been_kicked">Você foi removido da sala %1$s por %2$s</string>
+    <string name="has_been_banned">Você foi banido da sala %1$s devido à %2$s</string>
     <string name="reason_colon">Motivo: %1$s</string>
     <string name="rejoin">Entrar novamente</string>
     <string name="forget_room">Esquecer a sala</string>
@@ -848,8 +853,8 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
         <item quantity="other">%1$s salas encontradas para %2$s</item>
     </plurals>
     <plurals name="membership_changes">
-        <item quantity="one">%d alteração de status de participação</item>
-        <item quantity="other">%s alterações de status de participação</item>
+        <item quantity="one">1 alteração na filiação</item>
+        <item quantity="other">%d alterações na filiação</item>
     </plurals>
 
     <string name="list_members">Lista de integrantes</string>
@@ -873,53 +878,53 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     </plurals>
 
     <!-- Widget Integration Manager -->
-    <string name="receipt_avatar">Imagem de recebimento</string>
-    <string name="notice_avatar">Imagem de aviso</string>
-    <string name="avatar">Imagem de perfil</string>
+    <string name="receipt_avatar">Foto de perfil para a confirmação de leitura</string>
+    <string name="notice_avatar">Foto de perfil para avisos</string>
+    <string name="avatar">Foto de perfil</string>
 
-    <string name="send_bug_report_rage_shake">Agite com raiva para reportar uma falha (bug)</string>
+    <string name="send_bug_report_rage_shake">Agite rapidamente para relatar um erro</string>
 
     <string name="settings_notification_privacy_normal">Normal</string>
     <string name="settings_notification_privacy_reduced">Privacidade reduzida</string>
     <string name="settings_notification_privacy_need_permission">O app necessita de permissão para rodar em segundo plano</string>
-    <string name="title_activity_choose_sticker">Enviar um sticker</string>
+    <string name="title_activity_choose_sticker">Enviar uma figurinha</string>
 
     <string name="dialog_title_third_party_licences">Licenças de terceiros</string>
 
     <string name="download">Baixar</string>
     <string name="speak">Falar</string>
-    <string name="clear">Apagar</string>
-    <string name="missing_permissions_error">Por falta de permissões, esta ação não é possível.</string>
+    <string name="clear">Limpar</string>
+    <string name="missing_permissions_error">Devido à falta de permissões, essa ação não é possível.</string>
     <string name="system_alerts_header">Alertas do sistema</string>
 
-    <string name="send_bug_report_description_in_english">Se possível, favor escrever a descrição em inglês.</string>
+    <string name="send_bug_report_description_in_english">Se possível, escreva a descrição em inglês, por favor.</string>
     <string name="option_send_voice">Enviar áudio</string>
 
-    <string name="option_send_sticker">Enviar um sticker</string>
-    <string name="no_sticker_application_dialog_content">Você não tem nenhum pacote de stickers habilitado no momento.
-
-Quer adicionar alguns agora?</string>
+    <string name="option_send_sticker">Enviar uma figurinha</string>
+    <string name="no_sticker_application_dialog_content">No momento, você não tem nenhum pacote de figurinhas ativado.↵
+\n↵
+\nQuer adicionar alguns agora\?</string>
 
     <string name="go_on_with">continuar com…</string>
-    <string name="error_no_external_application_found">Desculpe, mas não encontrei nenhum aplicativo externo para completar esta ação.</string>
+    <string name="error_no_external_application_found">Desculpe, nenhum aplicativo externo foi encontrado para concluir esta ação.</string>
 
-    <string name="e2e_re_request_encryption_key"><u>Pedir novamente as chaves de criptografia</u> de seus outros dispositivos.</string>
+    <string name="e2e_re_request_encryption_key">Solicitar novamente as chaves de criptografia das suas outras sessões.<u>Pedir novamente as chaves de criptografia</u> de seus outros dispositivos.</string>
 
-    <string name="e2e_re_request_encryption_key_sent">Pedido de chave enviado.</string>
+    <string name="e2e_re_request_encryption_key_sent">Requisição de chave enviada.</string>
 
-    <string name="e2e_re_request_encryption_key_dialog_title">Pedido enviado</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Por favor, use o Element em outro dispositivo que possa descriptografar a mensagem de modo que possa enviar as chaves a este dispositivo.</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">Requisição enviada</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Por favor, inicie o Element em outro aparelho que possa descriptografar a mensagem, de modo que ele possa enviar as chaves para esta sessão.</string>
 
     <plurals name="format_time_s">
-        <item quantity="one">%ds</item>
+        <item quantity="one">1s</item>
         <item quantity="other">%ds</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="one">%dmin</item>
-        <item quantity="other">%dmin</item>
+        <item quantity="one">1m</item>
+        <item quantity="other">%dm</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="one">%dh</item>
+        <item quantity="one">1h</item>
         <item quantity="other">%dh</item>
     </plurals>
     <plurals name="format_time_d">
@@ -934,8 +939,8 @@ Quer adicionar alguns agora?</string>
     <string name="room_participants_invite_join_names_and">%1$s e %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
 
-    <string name="room_message_placeholder_reply_to_encrypted">Enviar uma resposta criptografada…</string>
-    <string name="room_message_placeholder_reply_to_not_encrypted">Enviar uma resposta (não criptografada)…</string>
+    <string name="room_message_placeholder_reply_to_encrypted">Digite sua resposta criptografada…</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">Digite sua resposta (não criptografada)…</string>
     <plurals name="room_details_selected">
         <item quantity="one">%d selecionado</item>
         <item quantity="other">%d selecionados</item>
@@ -949,8 +954,8 @@ Quer adicionar alguns agora?</string>
 
     <string name="settings_preview_media_before_sending">Pré-visualizar a mídia antes de enviá-la</string>
 
-    <string name="settings_deactivate_account_section">Desativar a conta</string>
-    <string name="settings_deactivate_my_account">Desativar a minha conta</string>
+    <string name="settings_deactivate_account_section">Desativar minha conta</string>
+    <string name="settings_deactivate_my_account">Desativar minha conta</string>
 
     <string name="startup_notification_privacy_title">Privacidade das notificações</string>
     <string name="startup_notification_privacy_message">Element pode funcionar em segundo plano para gerenciar as suas notificações de forma segura e confidencial. Isso poderá impactar o uso da bateria.</string>
@@ -959,10 +964,10 @@ Quer adicionar alguns agora?</string>
 
     <string name="settings_opt_in_of_analytics">Enviar dados de uso</string>
     <string name="settings_opt_in_of_analytics_summary">Element coleta dados de uso anônimos para nos ajudar a melhorar o aplicativo.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Por favor, habilite o envio de dados de uso para nos ajudar a melhorar o Element.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Por favor, ative o envio de dados de uso para nos ajudar a melhorar o Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Sim, eu quero ajudar!</string>
 
-    <string name="settings_without_flair">Você não faz parte de nenhuma comunidade atualmente.</string>
+    <string name="settings_without_flair">Você não faz parte de alguma comunidade, no momento.</string>
 
     <string name="lock_screen_hint">Escreva aqui…</string>
 
@@ -972,16 +977,16 @@ Quer adicionar alguns agora?</string>
     <string name="settings_labs_enable_send_voice">Enviar mensagens de voz</string>
 
     <string name="command_description_emote">Mostra a ação</string>
-    <string name="command_description_ban_user">Remove a(o) usuária(o) com a ID fornecida</string>
-    <string name="command_description_unban_user">Desfaz a remoção de um(a) usuário(a) com um dado ID</string>
+    <string name="command_description_ban_user">Bane o usuário com a ID fornecida</string>
+    <string name="command_description_unban_user">Remove o banimento do usuário com a ID fornecida</string>
     <string name="command_description_op_user">Define o grau de poder de um(a) usuário(a)</string>
     <string name="command_description_deop_user">Retira o nível de operador(a) do(a) usuário(a) com o ID fornecido</string>
     <string name="command_description_invite_user">Convida a(o) usuária(o) com um dado ID para esta sala</string>
     <string name="command_description_join_room">Entra na sala com o alias fornecido</string>
     <string name="command_description_part_room">Deixa a sala</string>
-    <string name="command_description_topic">Define o tópico da sala</string>
-    <string name="command_description_kick_user">Expulsa a(o) usuária(o) com o ID fornecido</string>
-    <string name="command_description_nick">Altera o seu nome público de usuária(o)</string>
+    <string name="command_description_topic">Define a descrição da sala</string>
+    <string name="command_description_kick_user">Remove o usuário com o ID fornecido</string>
+    <string name="command_description_nick">Altera o seu nome e sobrenome</string>
     <string name="command_description_markdown">Ativar/Desativar o Markdown</string>
     <string name="command_description_clear_scalar_token">Reparar a gestão de aplicativos Matrix</string>
 
@@ -997,15 +1002,15 @@ Quer adicionar alguns agora?</string>
     <string name="dialog_user_consent_content">Para continuar usando o Servidor de Base %1$s, você precisa revisar e aceitar os termos e condições de uso.</string>
     <string name="dialog_user_consent_submit">Revisar agora</string>
 
-    <string name="deactivate_account_title">Desativar conta</string>
-    <string name="deactivate_account_content">Sua conta se tornará permanentemente inutilizável. Você não poderá iniciar uma sessão, e ninguém conseguirá registrar o mesmo ID de usuária(o). Isso fará que sua conta abandone todas as salas das quais participa, e eliminará os dados de sua conta do seu servidor de identidade. <b>Esta ação é irreversível</b>.
-
-Desativar a sua conta <b>não implica que as mensagens que você enviou sejam apagadas</b>. Se você quer que apaguemos suas mensagens, favor marcar a opção abaixo.
-
-A visibilidade de mensagens no Matrix é parecida com a dos e-mails. Se esquecermos as suas mensagens, isso significa que as mensagens que você enviou a nós não serão mais compartilhadas com novas(os) usuárias(os) ou por usuárias(os) não registradas(os), mas as(os) usuárias(os) registradas(os) que já tiveram acesso a estas mensagens conservarão a cópia das mesmas.</string>
-    <string name="deactivate_account_delete_checkbox">Por favor, esqueça todas as mensagens que enviei quando minha conta for desativada (Atenção: isso vai fazer com que futuras(os) usuárias(os) tenham uma visão incompleta das conversas)</string>
+    <string name="deactivate_account_title">Desativar minha conta</string>
+    <string name="deactivate_account_content">Isso tornará sua conta permanentemente inutilizável. Você não conseguirá efetuar login e ninguém poderá registrar novamente o mesmo ID de usuário. Isso fará com que sua conta saia de todas as salas das quais está participando e removerá os detalhes de sua conta do servidor de identidade. <b>Esta ação é irreversível</b>.↵
+\n↵
+\nDesativar sua conta <b>não faz com que, por padrão, suas mensagens enviadas sejam apagadas</b>. Se você deseja que suas mensagens também sejam apagadas, marque a opção abaixo.↵
+\n↵
+\nA visibilidade de mensagens na Matrix é semelhante a um e-mail. O fato de apagarmos suas mensagens significa que suas mensagens enviadas não serão compartilhadas com nenhum usuário novo ou ainda não registrado, mas os usuários registrados que já tiveram acesso a essas mensagens ainda terão acesso uma cópia delas.</string>
+    <string name="deactivate_account_delete_checkbox">Quando minha conta for desativada, exclua todas as mensagens que eu enviei (Atenção: isso fará com que futuros usuários tenham uma visão incompleta das conversas)</string>
     <string name="deactivate_account_prompt_password">Para continuar, entre com sua senha:</string>
-    <string name="deactivate_account_submit">Desativar conta</string>
+    <string name="deactivate_account_submit">Desativar minha conta</string>
 
     <string name="error_empty_field_your_password">Por favor, digite sua senha.</string>
     <string name="room_tombstone_versioned_description">Esta sala foi substituída e não está mais ativa</string>
@@ -1018,8 +1023,8 @@ A visibilidade de mensagens no Matrix é parecida com a dos e-mails. Se esquecer
 
     <string name="resource_limit_contact_admin">entre em contato com o administrador do seu serviço</string>
 
-    <string name="resource_limit_soft_default">Este homeserver excedeu um dos seus limites de recursos, portanto <b>alguns usuários não conseguirão fazer login</b>.</string>
-    <string name="resource_limit_hard_default">Este homeserver excedeu um de seus limites de recursos.</string>
+    <string name="resource_limit_soft_default">Este servidor local excedeu um dos seus limites de recursos, portanto <b>alguns usuários não conseguirão fazer login</b>.</string>
+    <string name="resource_limit_hard_default">Este servidor local excedeu um de seus limites de recursos.</string>
 
     <string name="resource_limit_soft_mau"> Este homeserver atingiu o seu limite mensal de usuários ativos, portanto <b>alguns usuários não conseguirão fazer login</b>.</string>
     <string name="resource_limit_hard_mau">Este homeserver atingiu o seu limite mensal de usuários ativos.</string>
@@ -1027,19 +1032,19 @@ A visibilidade de mensagens no Matrix é parecida com a dos e-mails. Se esquecer
     <string name="resource_limit_soft_contact">Por favor, %s para que este limite seja aumentado.</string>
     <string name="resource_limit_hard_contact">Por favor, %s para seguir usando este serviço.</string>
 
-    <string name="encryption_export_notice">Por favor, crie uma senha para cifrar as chaves exportadas. Precisará de usar a mesma senha para conseguir importar as chaves.</string>
+    <string name="encryption_export_notice">Crie uma frase secreta para criptografar as chaves exportadas. Você precisará inserir essa frase secreta para importar chaves criptografadas.</string>
     <string name="status_theme">Tema Status.im</string>
 
     <string name="accept">Aceitar</string>
 
     <string name="dialog_title_error">Erro</string>
 
-    <string name="auth_accept_policies">Por favor revise e aceite as políticas desse servidor doméstico:</string>
+    <string name="auth_accept_policies">Por favor, revise e aceite as políticas deste servidor local:</string>
 
     <string name="settings_call_category">Chamadas</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Use o toque padrão da Element para chamadas recebidas</string>
-    <string name="settings_call_ringtone_title">Toque de chamada recebida</string>
-    <string name="settings_call_ringtone_dialog_title">Selecione o toque para chamadas:</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Use o toque padrão do Element para chamadas recebidas</string>
+    <string name="settings_call_ringtone_title">Toque de chamadas recebidas</string>
+    <string name="settings_call_ringtone_dialog_title">Selecione o toque de chamadas:</string>
 
     <string name="reason_hint">Motivo</string>
 
@@ -1053,23 +1058,22 @@ A visibilidade de mensagens no Matrix é parecida com a dos e-mails. Se esquecer
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Um ou mais testes falharam, por favor relate um erro para nos ajudar a investigar.</string>
 
     <string name="settings_troubleshoot_test_system_settings_title">Configurações do sistema.</string>
-    <string name="settings_troubleshoot_test_system_settings_success">Notificações estão habilitadas nas configurações do sistema.</string>
-    <string name="settings_troubleshoot_test_system_settings_failed">Notificações estão desabilitadas nas configurações do sistema.
-Por favor revise as configurações do sistema.</string>
+    <string name="settings_troubleshoot_test_system_settings_success">Notificações estão ativadas nas configurações do sistema.</string>
+    <string name="settings_troubleshoot_test_system_settings_failed">Notificações estão desativadas nas configurações do sistema. Por favor, revise as configurações do sistema.</string>
     <string name="open_settings">Abra as Configurações</string>
 
     <string name="settings_troubleshoot_test_account_settings_title">Configurações da Conta.</string>
-    <string name="settings_troubleshoot_test_account_settings_success">Notificações estão habilitadas para sua conta.</string>
-    <string name="settings_troubleshoot_test_account_settings_failed">Notificações estão desabilitadas para sua conta.
-Por favor revise as configurações da conta.</string>
-    <string name="settings_troubleshoot_test_account_settings_quickfix">Habilitar</string>
+    <string name="settings_troubleshoot_test_account_settings_success">Notificações estão ativadas para sua conta.</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Notificações estão desativadas para sua conta.↵
+\nPor favor, revise as configurações da conta.</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">Ativar</string>
 
-    <string name="settings_troubleshoot_test_device_settings_title">Configurações do Dispositivo.</string>
-    <string name="settings_troubleshoot_test_device_settings_success">Notificações estão habilitadas para este dispositivo.</string>
-    <string name="room_participants_action_kick">Desconectar</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Notificações não são permitidas para este dispositivo.
-Por favor revise as configurações do Element.</string>
-    <string name="settings_troubleshoot_test_device_settings_quickfix">Habilitar</string>
+    <string name="settings_troubleshoot_test_device_settings_title">Configurações da sessão.</string>
+    <string name="settings_troubleshoot_test_device_settings_success">Notificações estão ativadas nesta sessão.</string>
+    <string name="room_participants_action_kick">Remover da sala</string>
+    <string name="settings_troubleshoot_test_device_settings_failed">Notificações não estão ativadas nesta sessão.↵
+\nPor favor, revise as configurações do Element.</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">Ativar</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Revisão do Play Services</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK está disponível e atualizado.</string>
@@ -1095,57 +1099,55 @@ Por favor revise as configurações do Element.</string>
 Tente reiniciar a aplicação.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Iniciar Serviço</string>
 
-    <string name="settings_troubleshoot_test_service_restart_success">Serviço foi finalizado e reiniciado automaticamente.</string>
+    <string name="settings_troubleshoot_test_service_restart_success">O serviço foi encerrado e reiniciado automaticamente.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Falha ao reiniciar Serviço</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Começar na inicialização</string>
-    <string name="settings_troubleshoot_test_service_boot_success">Serviço irá iniciar quando o dispositivo for reiniciado.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">O serviço não irá começar quando o dispositivo for reiniciado, você não irá receber notificações até o Element for aberto uma vez.</string>
-    <string name="settings_troubleshoot_test_service_boot_quickfix">Habilitar Começar na inicialização</string>
+    <string name="settings_troubleshoot_test_service_boot_success">O serviço iniciará quando o aparelho for reiniciado.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">O serviço não iniciará enquanto o aparelho não for reiniciado. Você não receberá notificações até que o Element for aberto ao menos uma vez.</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">Iniciar com o sistema</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Revisar restrições de segundo plano</string>
     <string name="settings_troubleshoot_test_battery_title">Otimização de bateria</string>
     <string name="settings_troubleshoot_test_battery_success">Element não é afetado pela Otimização de Bateria.</string>
     <string name="settings_troubleshoot_test_service_restart_title">Reinicialização Automática do Serviço de Notificações</string>
-    <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desabilitar restrições</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desativar restrições</string>
 
-    <string name="settings_troubleshoot_test_battery_quickfix">Ignorar Otimização</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">Ignorar a otimização</string>
 
     <string name="settings_inline_url_preview_summary">Prévia de links dentro do chat quando seu homeserver suporta este recurso.</string>
-    <string name="settings_send_typing_notifs">Enviar notificações de digitação</string>
-    <string name="settings_send_typing_notifs_summary">Deixar outros usuários saberem quando você estiver digitando.</string>
+    <string name="settings_send_typing_notifs">Permitir que saibam quando eu estiver digitando</string>
+    <string name="settings_send_typing_notifs_summary">Deixe outros usuários saberem quando você estiver digitando.</string>
     <string name="settings_show_read_receipts">Mostrar confirmações de leitura</string>
     <string name="settings_show_read_receipts_summary">Clique nas notificações de leitura para uma lista detalhada.</string>
     <string name="settings_show_join_leave_messages">Mostrar eventos de entrada e saída de sala</string>
-    <string name="settings_show_join_leave_messages_summary">Convites, chutes e proibições não são afetados.</string>
+    <string name="settings_show_join_leave_messages_summary">Convites, remoções e banimentos não são afetados.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Mostrar eventos da conta</string>
-    <string name="settings_show_avatar_display_name_changes_messages_summary">Inclui avatar e alterações no nome de exibição.</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">Mostrar alterações de foto de perfil e de nome e sobrenome.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Conexão em segundo plano</string>
     <string name="startup_notification_fdroid_battery_optim_message">Element precisa manter um baixo impacto na conexão em segundo plano para ter notificações confiáveis.
 Na próxima tela, você será solicitado a permitir que o Element funcione sempre em segundo plano, por favor aceite.</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Restrições de segundo plano estão desabilitadas para o Element. este teste deve executar usando os dados móveis (sem WIFI).
-%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Restrições em segundo plano estão habilitadas para o Element.
-Trabalhos que o aplicativo tentar fazer serão restringidos agressivamente enquanto isto estiver em segundo plano, isto poderá afetar as notificações.
-%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">Restrições de segundo plano estão desativadas para o Element. Este teste deve ser realizado usando dados móveis (sem Wi-Fi).↵
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Restrições em segundo plano estão ativadas para o Element.↵
+\nO aplicativo funciona bastante restringido enquanto está em segundo plano, o que pode afetar as notificações.↵
+\n%1$s</string>
     <string name="settings_send_markdown">Formatação Markdown</string>
     <string name="settings_send_markdown_summary">Fomatar mensagens usando a sintaxe markdown antes delas serem enviadas. Isto permite uma formatação avançada como usar asteriscos para mostrar texto em itálico.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Conceder permissão</string>
 
-    <string name="account_email_error">Ocorreu um erro ao verificar seu endereço de e-mail.</string>
+    <string name="account_email_error">Ocorreu um erro ao confirmar seu endereço de e-mail.</string>
 
     <string name="settings_password">Senha</string>
-    <string name="account_phone_number_error">Ocorreu um erro ao verificar seu número de telefone.</string>
+    <string name="account_phone_number_error">Ocorreu um erro ao confirmar seu número de telefone.</string>
     <string name="account_additional_info">Informação adicional: %s</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d chave(es) importada(as) com sucesso.</string>
-
-    <string name="settings_labs_native_camera_summary">Inicie a câmera do sistema em vez da tela de câmera personalizada.</string>
+    <string name="settings_labs_native_camera_summary">Inicie a câmera do sistema em vez da câmera personalizada.</string>
     <string name="settings_labs_enable_send_voice_summary">Esta opção requer um aplicativo de terceiros para gravar as mensagens.</string>
 
     <string name="command_problem_with_parameters">O comando \"%s\" precisa de mais parâmetros ou alguns parâmetros estão incorretos.</string>
-    <string name="markdown_has_been_enabled">Markdown foi habilitado.</string>
-    <string name="markdown_has_been_disabled">Markdown foi desabilitado.</string>
+    <string name="markdown_has_been_enabled">Markdown foi ativado.</string>
+    <string name="markdown_has_been_disabled">Markdown foi desativado.</string>
 
     <string name="settings_lazy_loading_description">Aumente o desempenho apenas carregando os membros da sala na primeira exibição.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Seu homeserver não suporta o carregamento Lazy de membros da sala ainda. Tente depois.</string>
@@ -1166,57 +1168,36 @@ Trabalhos que o aplicativo tentar fazer serão restringidos agressivamente enqua
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Nenhum APK do Google Play Services válido foi encontrado. Notificações podem não funcionar corretamente.</string>
 
-    <string name="store_title">Element - Comunique-se do seu jeito</string>
-    <string name="store_short_description">Um aplicativo de bate-papo universal seguro totalmente sob seu controle.</string>
-    <string name="settings_troubleshoot_test_battery_failed">Se um usuário deixar um dispositivo desconectado e parado por um período de tempo, com a tela desligada, o dispositivo entrará no modo Cochilo. Isso impede que os aplicativos acessem a rede e adiem seus trabalhos, sincronizações e alarmes padrão.</string>
-    <string name="passphrase_create_passphrase">Criar passphrase</string>
-    <string name="passphrase_passphrase_does_not_match">Passphrases devem corresponder</string>
+    <string name="settings_troubleshoot_test_battery_failed">Se um usuário deixar um aparelho desconectado por um período de tempo, com a tela desligada, o aparelho entrará no modo Soneca. Isso impede que os aplicativos acessem a rede, adiando seus trabalhos, sincronizações e alarmes padrão.</string>
+    <string name="passphrase_create_passphrase">Criar frase secreta</string>
+    <string name="passphrase_passphrase_does_not_match">A frase secreta está errada</string>
     <string name="settings_lazy_loading_title">Carregamento Lazy dos membros das salas</string>
-    <string name="store_full_description">"Um aplicativo de bate-papo, sob seu controle e totalmente flexível. Element permite que você se comunique do jeito que você quer. Desenvolvido para o [matrix] - o padrão para comunicação aberta e descentralizada.
 
-Obtenha uma conta matrix.org grátis, obtenha seu próprio servidor em https://modular.im ou use outro servidor Matrix.
+    <string name="video_call_in_progress">Chamada de vídeo em andamento…</string>
 
-Por que escolher o Element?
-
-• COMUNICAÇÃO COMPLETA: Construa salas em torno de suas equipes, seus amigos, sua comunidade - como quiser! Converse, compartilhe arquivos, adicione widgets e faça chamadas de voz e vídeo - tudo de graça.
-
-• INTEGRAÇÕES PODEROSAS: Use o Element com as ferramentas que você conhece e ama. Com Element você pode conversar com usuários e grupos em outros aplicativos de bate-papo.
-
-• PRIVADO E SEGURO: Mantenha suas conversas em segredo. A criptografia de ponta a ponta do estado da arte garante que a comunicação privada permaneça privada.
-
-• ABERTO, NÃO FECHADO: Código aberto e construído sobre o Matrix. Possua seus próprios dados hospedando seu próprio servidor ou selecionando um que você confia.
-
-• EM TODOS OS LUGARES: Mantenha-se em contato onde quer que esteja com o histórico de mensagens totalmente sincronizado em todos os seus dispositivos e online em https://riot.im."</string>
-
-    <string name="video_call_in_progress">Chamada de Vídeo em andamento…</string>
-
-    <string name="store_whats_new">"Estamos sempre fazendo alterações e melhorias no Element.
-O changelog completo pode ser encontrado aqui: %1$s.
-Para garantir que você não perca nada, mantenha suas atualizações ativadas."</string>
     <string name="title_activity_keys_backup_setup">Backup da chave</string>
     <string name="title_activity_keys_backup_restore">Usar Backup da chave</string>
 
-    <string name="keys_backup_is_not_finished_please_wait">Backup de chaves não está terminado, por favor aguarde …</string>
+    <string name="keys_backup_is_not_finished_please_wait">Backup de chaves não está concluído. Por favor, aguarde…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Você perderá suas mensagens criptografadas se sair agora</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Backup de chave em andamento. Se você sair agora, perderá o acesso às suas mensagens criptografadas.</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">O Backup de chave seguro deve estar ativo em todos os seus dispositivos para evitar perder o acesso às suas mensagens criptografadas.</string>
-    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Eu não quero minhas mensagens criptografadas</string>
-    <string name="sign_out_bottom_sheet_backing_up_keys">Fazendo backup de chaves …</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">O backup de chave segura deve estar ativado em todas as suas sessões, para evitar perder o acesso às suas mensagens criptografadas.</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Não quero minhas mensagens criptografadas</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Fazendo backup das chaves…</string>
     <string name="keys_backup_activate">Use o backup de chave</string>
-    <string name="are_you_sure">Você tem certeza?</string>
-    <string name="backup">Realizar o Backup</string>
-    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Você perderá o acesso às suas mensagens criptografadas, a menos que faça o backup das suas chaves antes de sair.</string>
+    <string name="are_you_sure">Tem certeza\?</string>
+    <string name="backup">Fazer o backup</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Você perderá o acesso às suas mensagens criptografadas, a menos que faça backup das suas chaves antes de sair.</string>
 
     <string name="keys_backup_info_title_signature">Assinatura</string>
 
-    <string name="stay">Permaneça</string>
+    <string name="stay">Ficar</string>
     <string name="skip">Pular</string>
-    <string name="done">Feito</string>
+    <string name="done">Fechar</string>
     <string name="abort">Abortar</string>
 
-    <string name="action_sign_out_confirmation_simple">Você tem certeza que deseja sair da conta\?</string>
-    <string name="settings_notification_advanced">Configurações Avançadas de Notificação</string>
-    <string name="settings_notification_advanced_summary">Definir a importância da notificação por evento, Configurar som, led, vibração</string>
+    <string name="action_sign_out_confirmation_simple">Deseja mesmo sair\?</string>
+    <string name="settings_notification_advanced">Configurações avançadas de notificações</string>
     <string name="settings_notification_by_event">Importância da notificação por evento</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Configurações personalizadas.</string>
@@ -1225,20 +1206,21 @@ Para garantir que você não perca nada, mantenha suas atualizações ativadas."
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Falha ao carregar regras personalizadas, tente novamente.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Verifique as configurações</string>
 
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nEste erro está fora do controle do Element e, de acordo com o Google, esse erro indica que o dispositivo tem muitos aplicativos registrados com FCM. O erro só ocorre nos casos em que há números extremos de aplicativos, portanto, isso não deve afetar o usuário comum.</string>
-    <string name="ignore">Ignorar</string>
+    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]↵
+\nEste erro está fora do controle do Element e, de acordo com o Google, esse erro indica que o aparelho tem muitos aplicativos registrados com FCM. O erro só ocorre nos casos em que há números extremos de aplicativos, portanto, isso não deve afetar o usuário comum.</string>
+    <string name="ignore">Bloquear</string>
 
-    <string name="auth_login_sso">Entre com o logon único</string>
-    <string name="login_error_unknown_host">Este URL não está acessível, por favor verifique</string>
-    <string name="login_error_ssl_handshake">Seu dispositivo está usando um protocolo de segurança TLS desatualizado, vulnerável a ataques. Para sua segurança, você não poderá se conectar</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nEste erro está fora de controle da Element. Isso pode ocorrer por vários motivos. Talvez funcione se você tentar novamente mais tarde. Você também pode verificar se o Google Play Service não está restrito ao uso de dados nas configurações do sistema ou se o relógio do dispositivo está correto ou pode acontecer na ROM personalizada.</string>
-    <string name="notification_sync_init">Inicializando o serviço</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]\nEste erro está fora de controle do Element. Não há conta do Google no telefone. Por favor, abra o gerenciador de contas e adicione uma conta do Google.</string>
+    <string name="auth_login_sso">Entre com o login único</string>
+    <string name="login_error_unknown_host">Este endereço não está acessível. Por favor, verifique-o</string>
+    <string name="login_error_ssl_handshake">Seu aparelho está usando um protocolo de segurança TLS desatualizado, vulnerável a ataques. Para sua segurança, você não poderá se conectar</string>
+    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]↵
+\nEste erro está fora de controle da Element. Isso pode ocorrer por vários motivos. Talvez funcione se você tentar novamente mais tarde. Você também pode verificar se o uso de dados do Google Play Service está restrito nas configurações do sistema, ou se o relógio do seu aparelho está correto. O erro também pode ocorrer em ROMs personalizadas.</string>
+    <string name="notification_sync_init">Iniciando o serviço</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nEste erro está fora de controle do Element. Não há conta do Google no celular. Por favor, abra o gerenciador de contas e adicione uma conta do Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Adicionar Conta</string>
 
-    <string name="settings_noisy_notifications_preferences">Configurar notificações ruidosas</string>
+    <string name="settings_noisy_notifications_preferences">Configurar notificações com som</string>
     <string name="settings_call_notifications_preferences">Configurar notificações de chamada</string>
     <string name="settings_silent_notifications_preferences">Configurar notificações silenciosas</string>
     <string name="settings_system_preferences_summary">Escolha a cor do LED, vibração, som…</string>
@@ -1248,16 +1230,1390 @@ Para garantir que você não perca nada, mantenha suas atualizações ativadas."
     <string name="settings_send_message_with_enter">Enviar mensagem com a tecla enter</string>
     <string name="resources_script">Latn</string>
 
-    <string name="title_activity_verify_device">Verificar sessão</string>
+    <string name="title_activity_verify_device">Confirmar sessão</string>
 
-    <string name="none">Nenhum</string>
+    <string name="none">Nenhuma</string>
     <string name="revoke">Revogar</string>
     <string name="disconnect">Desconectar</string>
     <string name="review">Revisar</string>
-    <string name="decline">Negar</string>
+    <string name="decline">Recusar</string>
 
-    <string name="action_mark_room_read">Marcar como lido</string>
-    <string name="people_no_identity_server">Nenhum servidor de identidade configurado.</string>
+    <string name="action_mark_room_read">Marcar como lida</string>
+    <string name="people_no_identity_server">Nenhum servidor de identidade está configurado.</string>
 
-    <string name="call_failed_no_ice_title">Ligação falhou devido ao servidor mal configurado</string>
+    <string name="call_failed_no_ice_title">A chamada falhou por conta de má configuração no servidor</string>
+    <string name="play_video">Reproduzir</string>
+    <string name="pause_video">Pausar</string>
+    <string name="dismiss">Descartar</string>
+
+
+    <string name="action_copy">Copiar</string>
+    <string name="dialog_title_success">Pronto</string>
+
+    <string name="bottom_action_notification">Notificações</string>
+    <string name="call_failed_no_ice_description">Peça ao administrador do seu servidor principal (%1$s) que configure um servidor TURN para que as chamadas funcionem de maneira confiável.↵
+\n↵
+\nAlternativamente, você pode tentar usar o servidor público em %2$s. No entanto, ele não é tão confiável e compartilhará o seu IP com esse servidor. Você também pode configurar isso nas Configurações.</string>
+    <string name="call_failed_no_ice_use_alt">Tente usar %s</string>
+    <string name="call_failed_dont_ask_again">Não pergunte novamente</string>
+
+    <string name="call_failed_no_connection">A chamada falhou</string>
+    <string name="call_failed_no_connection_description">Falha ao estabelecer conexão em tempo real.↵
+\nPor favor, peça ao administrador do seu servidor para configurar um servidor TURN, de modo que as chamadas funcionem de maneira estável.</string>
+
+    <string name="call_select_sound_device">Selecione a caixa de som</string>
+    <string name="sound_device_phone">Celular</string>
+    <string name="sound_device_speaker">Alto-falante</string>
+    <string name="sound_device_headset">Fone de ouvido</string>
+    <string name="sound_device_wireless_headset">Fone de ouvido sem fio</string>
+    <string name="call_switch_camera">Trocar a câmera</string>
+    <string name="call_camera_front">Frontal</string>
+    <string name="call_camera_back">Traseira</string>
+    <string name="call_format_turn_hd_off">Desativar vídeo de alta definição</string>
+    <string name="call_format_turn_hd_on">Ativar vídeo de alta definição</string>
+
+    <string name="auth_add_email_message_2">Defina um e-mail para recuperação da conta. Posteriormente, você pode permitir que as pessoas encontrem você através dele.</string>
+    <string name="auth_add_phone_message_2">Defina um número de telefone. Posteriormente, você pode permitir que as pessoas encontrem você através dele.</string>
+    <string name="auth_add_email_phone_message_2">Defina um e-mail para a recuperação da conta. Posteriormente, um endereço de e-mail ou número de telefone pode ser usado para ser encontrado por outras pessoas.</string>
+    <string name="auth_add_email_and_phone_message_2">Defina um e-mail para recuperação da conta. Posteriormente, você pode permitir que as pessoas encontrem você através dele, ou através do número de telefone.</string>
+    <string name="login_error_no_homeserver_found">Este não é um endereço de servidor Matrix válido</string>
+    <string name="login_error_homeserver_not_found">Não foi possível acessar um servidor local neste endereço. Por favor, verifique-o</string>
+    <string name="login_error_ssl_peer_unverified">Erro de SSL: a identidade da pessoa não foi confirmada.</string>
+    <string name="login_error_ssl_other">Erro de SSL.</string>
+    <string name="settings_call_ringtone_use_default_stun">Permitir a assistência do servidor de chamadas reserva</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Permitir a assistência do servidor de chamadas reserva %s quando seu servidor não oferecer este serviço (seu endereço IP será transmitido quando você ligar)</string>
+    <string name="active_call_with_duration">Chamada em andamento (%s)</string>
+    <string name="return_to_call">Retornar à chamada</string>
+
+    <string name="invite_no_identity_server_error">Adicionar um servidor de identidade nas suas configurações para executar esta ação.</string>
+    <string name="room_participants_action_cancel_invite">Cancelar convite</string>
+    <string name="room_participants_power_level_demote_warning_title">Reduzir privilégios\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Você não poderá desfazer essa alteração, já que está reduzido seus privilégios. Se você for a última pessoa nesta sala, será impossível recuperar a permissão atual.</string>
+    <string name="room_participants_power_level_demote">Reduzir privilégio</string>
+
+
+    <string name="room_participants_action_ignore_title">Bloquear usuário</string>
+    <string name="room_participants_action_ignore_prompt_msg">Ao bloquear este usuário, as mensagens dele serão ocultadas de você em todas as salas.↵
+\n↵
+\nVocê pode reverter esta ação a qualquer momento nas configurações.</string>
+    <string name="room_participants_action_unignore_title">Desbloquear usuário</string>
+    <string name="room_participants_action_unignore_prompt_msg">Desbloquear este usuário mostrará todas as mensagens dele novamente.</string>
+    <string name="room_participants_action_cancel_invite_title">Cancelar convite</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Tem certeza que quer cancelar o convite para este usuário\?</string>
+    <string name="room_participants_kick_title">Remover usuário</string>
+    <string name="room_participants_kick_reason">Motivo da remoção</string>
+    <string name="room_participants_kick_prompt_msg">esta ação removerá o usuário desta sala.↵ 
+\n↵ 
+\nPara impedir que o usuário nunca mais entre novamente, você precisará bani-lo.</string>
+    <string name="room_participants_ban_title">Banir usuário</string>
+    <string name="room_participants_ban_reason">Motivo do banimento</string>
+    <string name="room_participants_unban_title">Remover banimento do usuário</string>
+    <string name="room_participants_unban_prompt_msg">Remover o banimento do usuário permitirá que ele entre novamente na sala.</string>
+
+    <string name="settings_add_3pid_confirm_password_title">Confirme sua senha</string>
+    <string name="settings_add_3pid_flow_not_supported">Não pode fazer isto pelo Element app</string>
+    <string name="settings_add_3pid_authentication_needed">Autenticação exigida</string>
+
+
+    <string name="settings_notification_privacy_no_background_sync">O aplicativo <b>não</b> precisa de se conectar ao servidor em segundo plano, isto deve reduzir a utilização da bateria</string>
+    <string name="settings_background_fdroid_sync_mode">Sincronização em segundo plano (Experimental)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimizado para bateria</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element sincronizará em segundo plano para preservar os recursos limitados do aparelho (bateria).↵
+\nDependendo do estado dos recursos do seu aparelho, a sincronização pode ser adiada pelo sistema operacional.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Optimizado em tempo real</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">O Element sincronizará periodicamente em segundo plano, no momento estabelecido (configurável).↵
+\nIsso afetará o uso de dados e da bateria. Haverá uma notificação permanente informando que o Element está sincronizando.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Sem sincronização em segundo plano</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Você não será notificado sobre mensagens recebidas quando o Element estiver em segundo plano.</string>
+    <string name="settings_background_sync_update_error">Não foi possível actualizar a configuração.</string>
+
+
+    <string name="settings_set_workmanager_delay">Intervalo de sincronização preferido</string>
+    <string name="settings_set_workmanager_delay_summary">%s↵
+\nA sincronização pode ser adiada dependendo dos recursos (bateria) ou do estado do aparelho (modo de suspensão).</string>
+    <string name="settings_integrations">Integrações</string>
+    <string name="settings_integrations_summary">Use o Gerenciador de Integrações para gerenciar bots, pontes, widgets e pacotes de figurinhas.↵
+\n
+\nO Gerenciador de Integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de privilégios em seu nome.</string>
+    <string name="settings_send_message_with_enter_summary">Botão enter do teclado enviará a mensagem em vez de adicionar uma quebra de linha</string>
+
+    <string name="settings_secure_backup_section_title">Backup Seguro</string>
+    <string name="settings_secure_backup_manage">Gerenciar</string>
+    <string name="settings_secure_backup_setup">Configurar Backup Seguro</string>
+    <string name="settings_secure_backup_reset">Restaurar Backup Seguro</string>
+    <string name="settings_secure_backup_enter_to_setup">Configurar neste aparelho</string>
+    <string name="settings_secure_backup_section_info">Prevenir contra a perda de acesso a mensagens e dados encriptados, guardando as chaves de encriptação no seu servidor.</string>
+    <string name="reset_secure_backup_title">Gerar uma nova Chave de Segurança ou definir uma nova Frase de Segurança para o seu backup existente.</string>
+    <string name="reset_secure_backup_warning">Isto irá substituir a sua Chave ou Frase actual.</string>
+
+    <string name="settings_discovery_category">Encontrar</string>
+    <string name="settings_discovery_manage">Gerencie suas configurações de descoberta.</string>
+    <string name="settings_data_save_mode_summary">O modo de baixo uso de dados desativa a atualização de presença e a animação de que alguém está digitando.</string>
+
+    <string name="settings_integration_allow">Permitir integrações</string>
+    <string name="settings_integration_manager">Gerenciador de Integrações</string>
+
+    <string name="disabled_integration_dialog_title">As integrações estão desativadas</string>
+    <string name="disabled_integration_dialog_content">Ative \'Permitir integrações\' nas Configurações para fazer isso.</string>
+
+    <string name="settings_change_password_submit">Atualizar Senha</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">A senha não é válida</string>
+    <string name="passwords_do_not_match">As senhas não são iguais</string>
+
+    <string name="settings_media">Média</string>
+    <string name="settings_default_compression">Compressão predefinida</string>
+    <string name="compression_opt_list_choose">Escolher</string>
+    <string name="settings_default_media_source">Fonte de mídia por padrão</string>
+    <string name="media_source_choose">Escolher</string>
+    <string name="settings_play_shutter_sound">Tocar o som da câmera</string>
+
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d usuário banido</item>
+        <item quantity="other">%d usuários banidos</item>
+    </plurals>
+
+    <string name="encryption_information_device_name_with_warning">O nome público (visível para as pessoas com quem você se comunica)</string>
+    <string name="device_name_warning">O nome público de uma sessão é visível para as pessoas com quem você se comunica</string>
+    <string name="encryption_exported_successfully">Chaves exportadas com sucesso</string>
+
+    <string name="encryption_message_recovery">Recuperação de mensagens criptografadas</string>
+    <string name="encryption_settings_manage_message_recovery_summary">Gerenciar Backup das Chaves</string>
+
+    <string name="encryption_information_unknown_ip">IP desconhecido</string>
+    <plurals name="notification_compat_summary_line_for_room">
+        <item quantity="one">%1$s: 1 mensagem</item>
+        <item quantity="other">%1$s: %2$d mensagens</item>
+    </plurals>
+    <plurals name="notification_compat_summary_title">
+        <item quantity="one">%d notificação</item>
+        <item quantity="other">%d notificações</item>
+    </plurals>
+
+    <string name="notification_unknown_new_event">Novo Evento</string>
+    <string name="notification_unknown_room_name">Sala</string>
+    <string name="notification_new_messages">Novas Mensagens</string>
+    <string name="notification_new_invitation">Novo Convite</string>
+    <string name="notification_sender_me">Eu</string>
+    <string name="notification_inline_reply_failed">** Não foi possível enviar - por favor abra a sala</string>
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+
+    <string name="active_widget_view_action">VISTA</string>
+    <string name="active_widgets_title">Widgets Ativos</string>
+
+
+    <string name="room_widget_activity_title">Widget</string>
+    <string name="room_widget_permission_title">Carregar widget</string>
+    <string name="room_widget_permission_added_by">Widget adicionado por:</string>
+    <string name="room_widget_permission_webview_shared_info_title">A sua utilização pode definir cookies e compartilhar dados com %s:</string>
+    <string name="room_widget_permission_shared_info_title">A sua utilização pode compartilhar dados com %s:</string>
+    <string name="room_widget_failed_to_load">Falha ao carregar widget.↵
+\n%s</string>
+    <string name="room_widget_reload">Recarregar widget</string>
+    <string name="room_widget_open_in_browser">Abrir no navegador</string>
+    <string name="room_widget_revoke_access">Remover para mim</string>
+
+    <string name="room_widget_permission_display_name">O seu nome e sobrenome</string>
+    <string name="room_widget_permission_avatar_url">Link da sua foto de perfil</string>
+    <string name="room_widget_permission_user_id">Sua ID de usuário</string>
+    <string name="room_widget_permission_theme">Seu tema</string>
+    <string name="room_widget_permission_widget_id">ID do widget</string>
+    <string name="room_widget_permission_room_id">ID da sala</string>
+
+
+    <string name="error_jitsi_not_supported_on_old_device">Desculpe, as chamadas em grupo com o Jitsi não são suportadas em aparelhos antigos (com versões do Android anteriores a 5.0)</string>
+    <string name="room_widget_resource_permission_title">Este wigdet deseja utilizar os seguintes recursos:</string>
+    <string name="room_widget_resource_grant_permission">Permitir</string>
+    <string name="room_widget_resource_decline_permission">Bloquear Tudo</string>
+    <string name="room_widget_webview_access_camera">Usar a câmera</string>
+    <string name="room_widget_webview_access_microphone">Usar o microfone</string>
+    <string name="room_widget_webview_read_protected_media">Ler as mídias protegidos por DRM</string>
+
+    <string name="integration_manager_not_configured">O gerenciador de integrações não está configurado.</string>
+    <string name="widget_integration_review_terms">Para continuar, você precisa aceitar os termos de serviço.</string>
+
+    <string name="you_added_a_new_device_with_info">Uma nova sessão está solicitando chaves de criptografia. Nome da sessão: %1$s↵
+\nVisto por último às: %2$s↵
+\nSe você não fez login em outra sessão, ignore essa solicitação.</string>
+    <string name="your_unverified_device_requesting_with_info">Uma nova sessão está solicitando chaves de criptografia.↵
+\nNome da sessão: %1$s↵
+\nVisto por último às: %2$s↵
+\nSe você não fez login em outra sessão, ignore essa solicitação.</string>
+
+    <string name="start_verification_short_label">Confirmar</string>
+    <string name="share_without_verifying_short_label">Compartilhar</string>
+    <string name="key_share_request">Pedido de compartilhamento das Chaves</string>
+    <string name="ignore_request_short_label">Ignorar</string>
+
+    <string name="notification_silent">Ativado</string>
+    <string name="error_empty_field_enter_user_name">Digite o nome de usuário.</string>
+    <string name="passphrase_empty_error_message">Digite a sua frase secreta</string>
+    <string name="passphrase_passphrase_too_weak">A frase secreta é muito fraca</string>
+
+    <string name="keys_backup_passphrase_not_empty_error_message">Por favor, apague a frase secreta se desejar que o Element gere uma chave de recuperação.</string>
+    <string name="keys_backup_no_session_error">Nenhuma sessão Matrix disponível</string>
+
+    <string name="keys_backup_setup_step1_title">Nunca perca mensagens criptografadas</string>
+    <string name="keys_backup_setup_step1_description">As mensagens em salas criptografadas são protegidas com a criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens.↵
+\n↵
+\nFaça backup de suas chaves de segurança para evitar perdê-las.</string>
+    <string name="keys_backup_setup">Comece a usar o Backup de Chave</string>
+    <string name="keys_backup_setup_step1_advanced">(Avançado)</string>
+    <string name="keys_backup_setup_step1_manual_export">Exportar as chaves manualmente</string>
+
+    <string name="keys_backup_setup_step2_text_title">Proteja seu backup com uma frase secreta.</string>
+    <string name="keys_backup_setup_step2_text_description">Armazenaremos uma cópia criptografada de suas chaves em nosso servidor. Proteja seu backup com uma frase secreta para mantê-lo seguro. 
+\n
+\nPara segurança máxima, isso deve ser diferente da senha da sua conta.</string>
+    <string name="keys_backup_setup_step2_button_title">Criar frase secreta</string>
+    <string name="keys_backup_setup_creating_backup">Criar Backup</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Ou proteja seu backup com uma chave de recuperação, salvando-a em algum lugar seguro.</string>
+    <string name="keys_backup_setup_step2_skip_button_title">(Avançado) Configurar a chave de recuperação</string>
+    <string name="keys_backup_setup_step3_success_title">Parabéns !</string>
+    <string name="keys_backup_setup_step3_text_line1">Está sendo feito backup das suas chaves.</string>
+    <string name="keys_backup_setup_step3_text_line2">Sua chave de recuperação é uma rede de proteção - você pode usá-la para restaurar o acesso às suas mensagens criptografadas se você esquecer sua frase de recuperação.
+\nMantenha a sua chave de recuperação em algum lugar muito seguro, como um gerenciador de senhas (ou um cofre)</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Mantenha sua chave de recuperação em algum lugar muito seguro, como um gerenciador de senhas (ou um cofre)</string>
+    <string name="keys_backup_setup_step3_button_title">Fechar</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Já fiz uma cópia</string>
+    <string name="keys_backup_setup_step3_copy_button_title">Salvar chave de recuperação</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">Compartilhar</string>
+    <string name="keys_backup_setup_step3_save_button_title">Salvar como um arquivo</string>
+    <string name="recovery_key_export_saved_as_warning">A chave de recuperação foi guardada para \"%s\".
+\n
+\nAtenção: este arquivo pode ser removido se o aplicativo for desinstalado.</string>
+    <string name="recovery_key_export_saved">A chave de recuperação foi guardada.</string>
+
+    <string name="keys_backup_setup_override_backup_prompt_tile">Já existe uma cópia de segurança no servidor</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Parece que você já tem configuração backup da chave de outra sessão. Queres substituí-lo pela nova que estás criando \?</string>
+    <string name="keys_backup_setup_override_replace">Substituir</string>
+    <string name="keys_backup_setup_override_stop">Parar</string>
+
+    <string name="keys_backup_setup_step3_please_make_copy">Faça uma cópia</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Compartilhar chave de recuperação com…</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Gerando Chave de Recuperação usando a frase secreta, este processo pode levar alguns segundos.</string>
+    <string name="recovery_key">Chave de recuperação</string>
+    <string name="unexpected_error">Erro inesperado</string>
+    <string name="keys_backup_setup_backup_started_title">A Cópia de Segurança foi iniciada</string>
+    <string name="keys_backup_setup_backup_started_message">As suas chaves de encriptação estão sendo copiadas em segundo plano para o seu servidor. O backup inicial pode demorar vários minutos.</string>
+
+
+    <string name="keys_backup_setup_skip_title">Você tem certeza\?</string>
+    <string name="keys_backup_setup_skip_msg">Você pode perder o acesso às suas mensagens se você sair do Element ou perder este aparelho.</string>
+
+    <string name="keys_backup_restore_is_getting_backup_version">Obtendo versão do backup…</string>
+    <string name="keys_backup_restore_with_passphrase">Use sua frase secreta de recuperação para desbloquear seu histórico de mensagens seguras</string>
+    <string name="keys_backup_restore_use_recovery_key">use sua chave de recuperação</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Não sabe sua frase secreta de recuperação, você pode %s.</string>
+
+    <string name="keys_backup_restore_with_recovery_key">Use a sua Chave de Recuperação para desbloquear o seu histórico de mensagens criptografadas</string>
+    <string name="keys_backup_restore_key_enter_hint">Digite a chave de recuperação</string>
+
+    <string name="keys_backup_restore_setup_recovery_key">Recuperação de Mensagem</string>
+
+    <string name="keys_backup_restore_with_key_helper">Perdeu sua chave de recuperação\? Você pode configurar uma nova nas configurações.</string>
+    <string name="keys_backup_passphrase_error_decrypt">O backup não pôde ser descriptografado com essa frase secreta: verifique se você digitou a frase secreta de recuperação correta.</string>
+    <string name="network_error_please_check_and_retry">Erro de rede: verifique a sua conexão e tente de novo, por favor.</string>
+
+    <string name="keys_backup_restoring_waiting_message">Restaurando o backup:</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Processando a chave de recuperação…</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">Baixando as chaves…</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">Importando as chaves…</string>
+    <string name="keys_backup_unlock_button">Desbloquear Histórico</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Digite uma chave de recuperação</string>
+    <string name="keys_backup_recovery_code_error_decrypt">O backup não pôde ser descriptografado com essa chave de recuperação: verifique se você digitou a chave de recuperação correta.</string>
+
+    <string name="keys_backup_restore_success_title">Backup restaurado %s !</string>
+    <plurals name="keys_backup_restore_success_description_part1">
+        <item quantity="one">Restaurou um backup com chave %d.</item>
+        <item quantity="other">Restaurou um backup com chaves %d.</item>
+    </plurals>
+    <plurals name="keys_backup_restore_success_description_part2">
+        <item quantity="one">%d nova chave foi adicionada a esta sessão.</item>
+        <item quantity="other">%d novas chaves foram adicionadas a esta sessão.</item>
+    </plurals>
+
+    <string name="keys_backup_get_version_error">Não foi possível obter a versão mais recente das chaves de recuperação (%s).</string>
+    <string name="keys_backup_no_keysbackup_sdk_error">A sessão criptografada não está activa</string>
+
+
+    <string name="keys_backup_settings_restore_backup_button">Restaurar do backup</string>
+    <string name="keys_backup_settings_delete_backup_button">Excluir Backup</string>
+
+    <string name="keys_backup_settings_status_ok">A chave do backup foi configurada correctamente para esta sessão.</string>
+    <string name="keys_backup_settings_status_ko">A chave do backup não está activa nesta sessão.</string>
+    <string name="keys_backup_settings_status_not_setup">Não está sendo feito backup das suas chaves nesta sessão.</string>
+
+    <string name="keys_backup_settings_signature_from_unknown_device">O backup tem uma assinatura da sessão desconhecida com o ID %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">O backup tem uma assinatura válida desta sessão.</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">O backup tem uma assinatura válida da sessão confirmada %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">O backup tem uma assinatura válida da sessão não confirmada %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">O backup tem uma assinatura inválida da sessão confirmada %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">O backup tem uma assinatura inválida da sessão não confirmada %s</string>
+    <string name="keys_backup_get_trust_error">Não foi possível obter a informação de confiança para o backup (%s).</string>
+
+    <string name="keys_backup_settings_untrusted_backup">Para usar o Backup de Chaves nesta sessão, restaure com a sua frase secreta ou chave de recuperação agora.</string>
+    <string name="keys_backup_settings_deleting_backup">Excluindo o backup…</string>
+    <string name="keys_backup_settings_delete_backup_error">Não foi possível excluir o backup (%s)</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Verificando a situação do backup</string>
+    <string name="keys_backup_settings_delete_confirm_title">Excluir Backup</string>
+    <string name="keys_backup_settings_delete_confirm_message">Excluir as chaves de criptografia do servidor\? Você não será mais capaz de usar a sua chave de recuperação para ler o histórico de mensagens criptografadas.</string>
+
+    <string name="new_recovery_method_popup_title">Novo Backup da Chave</string>
+    <string name="new_recovery_method_popup_description">Foi detectado um novo backup da chave de mensagem.↵
+\n↵
+\nSe você não definiu o novo método de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina um novo método de recuperação imediatamente nas Configurações.</string>
+    <string name="new_recovery_method_popup_was_me">Foi eu</string>
+
+    <string name="keys_backup_banner_setup_line1">Nunca perca mensagens criptografadas</string>
+    <string name="keys_backup_banner_setup_line2">Comece a usar o Backup da Chave</string>
+
+    <string name="secure_backup_banner_setup_line1">Backup Seguro</string>
+    <string name="secure_backup_banner_setup_line2">Proteja-se contra a perda de acesso a mensagens e dados criptografados</string>
+
+    <string name="keys_backup_banner_recover_line1">Nunca perca mensagens criptografadas</string>
+    <string name="keys_backup_banner_recover_line2">Use o backup da chave</string>
+
+    <string name="keys_backup_banner_update_line1">Novas chaves de mensagens seguras</string>
+    <string name="keys_backup_banner_update_line2">Gerenciar Backup das Chaves</string>
+
+    <string name="keys_backup_banner_in_progress">Fazendo backup das chaves. Isto pode demorar vários minutos.…</string>
+
+
+    <string name="secure_backup_setup">Configurar Backup Seguro</string>
+
+    <string name="keys_backup_info_keys_all_backup_up">O backup de todas as chaves foi concluído</string>
+    <plurals name="keys_backup_info_keys_backing_up">
+        <item quantity="one">Fazendo o backup da chave %d …</item>
+        <item quantity="other">Fazendo o backup das chaves %d …</item>
+    </plurals>
+
+    <string name="keys_backup_info_title_version">Versão</string>
+    <string name="keys_backup_info_title_algorithm">Algoritmo</string>
+    <string name="autodiscover_invalid_response">Resposta de descoberta inválida no servidor local</string>
+    <string name="autodiscover_well_known_autofill_dialog_title">Completar Automaticamente as Opções do Servidor</string>
+    <string name="autodiscover_well_known_autofill_dialog_message">Element detectou uma configuração personalizada do servidor para a sua ID de usuário \"%1$s\":↵
+\n%2$s</string>
+    <string name="autodiscover_well_known_autofill_confirm">Usar a Configuração</string>
+
+    <string name="invalid_or_expired_credentials">Você foi desligado devido as credenciais inválidas ou caducadas.</string>
+
+    <string name="sas_verify_title">Confirmar comparando um texto curto.</string>
+    <string name="sas_security_advise">Para máxima segurança, recomendamos que você faça isso pessoalmente ou use outro meio de comunicação confiável.</string>
+    <string name="sas_verify_start_button_title">Iniciar a confirmação</string>
+    <string name="sas_incoming_request_title">Recebendo solicitação de confirmação</string>
+    <string name="sas_incoming_request_description">Confirme se esta sessão é sua. Confirmar sessões fornece segurança adicional, ao usar mensagens criptografadas de ponta a ponta.</string>
+    <string name="sas_incoming_request_description_2">Ao confirmar se esta sessão é sua, você também a tornará confirmada para o seu contato.</string>
+
+    <string name="sas_emoji_description">Confirme esta sessão, comparando os emojis a seguir que serão exibidos para você e seu contato</string>
+    <string name="sas_decimal_description">Confirme esta sessão, comparando os números a seguir que serão exibidos para você e seu contato</string>
+
+    <string name="sas_incoming_verification_request_dialog">Você recebeu uma solicitação de confirmação.</string>
+    <string name="sas_view_request_action">Ver pedido</string>
+    <string name="sas_waiting_for_partner">Aguardando seu contato confirmar…</string>
+
+    <string name="sas_verified">Confirmado!</string>
+    <string name="sas_verified_successful">Você confirmou essa sessão com êxito.</string>
+    <string name="sas_verified_successful_description">As mensagens com este usuário estão criptografadas de ponta a ponta e não podem ser lidas por terceiros.</string>
+    <string name="sas_got_it">Ok, entendi</string>
+
+    <string name="sas_verifying_keys">Não aparece nada\? Nem todos os clientes suportam a confirmação interativa. Use a confirmação tradicional.</string>
+    <string name="sas_legacy_verification_button_title">Use a confirmação tradicional.</string>
+
+    <string name="sas_verification_request_notification_channel_title">Verificação da chave</string>
+    <string name="sas_cancelled_dialog_title">Pedido Cancelado</string>
+    <string name="sas_cancelled_by_other">Seu contato cancelou a confirmação.
+\n%s</string>
+    <string name="sas_cancelled_by_me">A confirmação foi cancelada.
+\nMotivo: %s</string>
+
+    <string name="sas_verification_request_notification_channel">Confirmação interativa da sessão</string>
+    <string name="sas_incoming_request_notif_title">Solicitação de confirmação</string>
+    <string name="sas_incoming_request_notif_content">%s quer confirmar a sua sessão</string>
+
+    <string name="sas_error_m_user">O contato cancelou a confirmação</string>
+    <string name="sas_error_m_timeout">O tempo de confirmação expirou</string>
+    <string name="sas_error_m_unknown_transaction">A sessão não sabe sobre essa transacção</string>
+    <string name="sas_error_m_unknown_method">A sessão não pode chegar a acordo sobre a chave, método hash, MAC, or SAS</string>
+    <string name="sas_error_m_mismatched_commitment">O compromisso de hash não coincidiu</string>
+    <string name="sas_error_m_mismatched_sas">O SAS não corresponde</string>
+    <string name="sas_error_m_unexpected_message">A sessão recebeu uma mensagem inesperada</string>
+    <string name="sas_error_m_invalid_message">Foi recebida uma mensagem inválida</string>
+    <string name="sas_error_m_key_mismatch">Chave incorreta</string>
+    <string name="sas_error_m_user_error">Contato não corresponde</string>
+    <string name="sas_error_unknown">Erro Desconhecido</string>
+
+    <string name="identity_server_not_defined">Você não está usando nenhum Servidor de Identidade</string>
+    <string name="identity_server_not_defined_for_password_reset">Nenhum servidor de identidade está configurado. É necessário usar um para redefinir sua senha.</string>
+
+    <string name="error_user_already_logged_in">Parece que você está tentando se conectar com outro servidor local. Deseja sair\?</string>
+
+    <string name="edit">Editar</string>
+    <string name="reply">Responder</string>
+
+    <string name="global_retry">Tentar novamente</string>
+    <string name="room_list_empty">Conecta-se a uma sala para começar a usar o aplicativo.</string>
+    <string name="send_you_invite">Enviou um convite</string>
+    <string name="invited_by">Convidado por %s</string>
+
+    <string name="room_list_catchup_empty_title">Vocês estão todos tão envolvidos em tudo aquilo!</string>
+    <string name="room_list_catchup_empty_body">Você não tem mais mensagens não lidas</string>
+    <string name="room_list_catchup_welcome_title">Bem-vindo a casa!</string>
+    <string name="room_list_catchup_welcome_body">Encarregar-se de mensagens não lidas</string>
+    <string name="room_list_people_empty_title">Conversas</string>
+    <string name="room_list_people_empty_body">Suas conversas serão exibidas aqui</string>
+    <string name="room_list_rooms_empty_title">Salas</string>
+    <string name="room_list_rooms_empty_body">Seus salas serão exibidas aqui</string>
+
+    <string name="title_activity_emoji_reaction_picker">Reações</string>
+    <string name="reactions_agree">Concordo</string>
+    <string name="reactions_like">Curtir</string>
+    <string name="message_add_reaction">Adicionar reação</string>
+    <string name="message_view_reaction">Veja as reações</string>
+    <string name="reactions">Reações</string>
+
+    <string name="event_redacted">Mensagens excluídas</string>
+    <string name="settings_show_redacted">Mostrar mensagens excluídas</string>
+    <string name="settings_show_redacted_summary">Mostrar um espaço reservado para mensagens excluídas</string>
+    <string name="event_redacted_by_user_reason">Evento excluído pelo usuário</string>
+    <string name="event_redacted_by_admin_reason">Evento moderado pelo administrador da sala</string>
+    <string name="last_edited_info_message">Última edição por %1$s em %2$s</string>
+
+
+    <string name="malformed_message">Evento malformado, não pode ser exibido</string>
+    <string name="create_new_room">Criar Nova Sala</string>
+    <string name="error_no_network">Sem rede. Por favor, verifique sua conexão de internet.</string>
+    <string name="action_change">Alterar</string>
+    <string name="change_room_directory_network">Alterar a rede</string>
+    <string name="please_wait">Por favor, aguarde…</string>
+    <string name="group_all_communities">Todas as comunidades</string>
+
+    <string name="room_preview_no_preview">Esta sala não pode ser visualizada</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">A visualização da sala global ainda não é suportada por Element</string>
+
+    <string name="fab_menu_create_room">Salas</string>
+    <string name="fab_menu_create_chat">Conversas</string>
+
+    <string name="create_room_title">Nova Sala</string>
+    <string name="create_room_action_create">CRIAR</string>
+    <string name="create_room_name_hint">Nome da sala</string>
+    <string name="create_room_public_title">Público</string>
+    <string name="create_room_public_description">Qualquer pessoa poderá entrar nesta sala</string>
+    <string name="create_room_directory_title">Lista de Salas</string>
+    <string name="create_room_directory_description">Publicar esta sala na lista das salas</string>
+
+    <string name="keys_backup_unable_to_get_trust_info">Ocorreu um erro ao receber informações de confiança</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">Ocorreu um erro ao obter dados de backup de chaves</string>
+
+    <string name="import_e2e_keys_from_file">Importar as chaves de arquivo \"%1$s\".</string>
+
+    <string name="settings_sdk_version">Versão SDK de Matrix</string>
+    <string name="settings_other_third_party_notices">Outros avisos de terceiros</string>
+    <string name="navigate_to_room_when_already_in_the_room">Você já está vendo esta sala!</string>
+
+    <string name="quick_reactions">Reações rápidas</string>
+
+    <string name="settings_general_title">Geral</string>
+    <string name="settings_preferences">Preferências</string>
+    <string name="settings_security_and_privacy">Segurança e Privacidade</string>
+    <string name="settings_expert">Experiente</string>
+    <string name="settings_push_rules">Regras do Push</string>
+    <string name="settings_push_rules_no_rules">Nenhuma regra Push definida</string>
+    <string name="settings_push_gateway_no_pushers">Nenhuma entrada Push registrada</string>
+
+    <string name="push_gateway_item_app_id">id_do_app:</string>
+    <string name="push_gateway_item_push_key">chave_push:</string>
+    <string name="push_gateway_item_app_display_name">nome_da_ tela_ do_app:</string>
+    <string name="push_gateway_item_device_name">nome_da_sessão:</string>
+    <string name="push_gateway_item_url">Link:</string>
+    <string name="push_gateway_item_format">Formato:</string>
+
+    <string name="preference_voice_and_video">Voz e vídeo</string>
+    <string name="preference_root_help_about">Ajuda e Sobre</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Registrar token</string>
+
+    <string name="send_suggestion">Faça uma sugestão</string>
+    <string name="send_suggestion_content">Por favor, escreva sua sugestão abaixo.</string>
+    <string name="send_suggestion_report_placeholder">Descreva aqui sua sugestão</string>
+    <string name="send_suggestion_sent">Obrigado, a sugestão foi enviada com êxito</string>
+    <string name="send_suggestion_failed">A sugestão não foi enviada (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Mostrar eventos ocultos na linha do tempo</string>
+
+    <string name="bottom_action_people_x">Conversas</string>
+
+    <string name="send_file_step_idle">Aguardando…</string>
+    <string name="send_file_step_encrypting_thumbnail">Criptografando imagem miniatura…</string>
+    <string name="send_file_step_sending_thumbnail">Enviando imagem miniatura (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Criptografando arquivo…</string>
+    <string name="send_file_step_sending_file">Enviando arquivo (%1$s / %2$s)</string>
+
+    <string name="downloading_file">Baixando arquivo %1$s…</string>
+    <string name="downloaded_file">O arquivo %1$s foi baixado!</string>
+
+    <string name="edited_suffix">(editado)</string>
+
+    <string name="message_edits">Edições na mensagem</string>
+    <string name="no_message_edits_found">Nenhuma edição encontrada</string>
+
+    <string name="room_filtering_filter_hint">Filtrar conversas…</string>
+    <string name="room_filtering_footer_title">Não consegue encontrar o que você está procurando\?</string>
+    <string name="room_filtering_footer_create_new_room">Criar uma sala nova</string>
+    <string name="room_filtering_footer_create_new_direct_message">Enviar nova mensagem</string>
+    <string name="room_filtering_footer_open_room_directory">Veja lista das salas</string>
+
+    <string name="room_directory_search_hint">Nome ou ID (#example:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Ativar o recurso de deslizar para responder nas conversas</string>
+    <string name="labs_merge_e2e_in_timeline">Merge não conseguiu decifrar a mensagem na linha do tempo</string>
+    <string name="labs_show_unread_notifications_as_tab">Adicione uma aba dedicada para notificações não lidas na tela principal.</string>
+
+    <string name="link_copied_to_clipboard">Link copiado para a memória</string>
+
+    <string name="add_by_matrix_id">Adicionar por ID do Matrix</string>
+    <string name="creating_direct_room">Criando a sala…</string>
+    <string name="direct_room_no_known_users">Nenhum resultado encontrado, use adicionar por ID do Matrix para pesquisar no servidor.</string>
+    <string name="direct_room_start_search">Comece a digitar para obter resultados</string>
+    <string name="direct_room_filter_hint">Filtrar por nome do usuário ou ID…</string>
+
+    <string name="joining_room">Entrando na sala…</string>
+
+    <string name="message_view_edit_history">Veja Histórico das Edições</string>
+
+    <string name="terms_of_service">Termos de serviço</string>
+    <string name="review_terms">Revisar termos</string>
+    <string name="terms_description_for_identity_server">Seja descoberto por outros</string>
+    <string name="terms_description_for_integration_manager">Use bots, pontes, widgets e pacotes de figurinhas</string>
+
+    <string name="read_at">Leia em</string>
+
+
+    <string name="identity_server">Servidor de identidade</string>
+    <string name="disconnect_identity_server">Desconectar servidor de identidade</string>
+    <string name="add_identity_server">Configurar servidor de identidade</string>
+    <string name="change_identity_server">Alterar o servidor de identidade</string>
+    <string name="settings_discovery_identity_server_info">Atualmente você está usando %1$s para descobrir e ser descoberto pelos contatos existentes.</string>
+    <string name="settings_discovery_identity_server_info_none">No momento, você não está usando um servidor de identidade. Para descobrir e ser descoberto pelos contatos existentes, adicione um abaixo.</string>
+    <string name="settings_discovery_emails_title">Endereços de e-mail detectáveis</string>
+    <string name="settings_discovery_no_mails">As opções de descoberta aparecerão uma vez que você tenha adicionado um e-mail.</string>
+    <string name="settings_discovery_no_msisdn">As opções de descoberta aparecerão uma vez que você tenha adicionado um número de telefone.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Desconectar-se de seu servidor de identidade resultará em que você não poderá ser descoberto por outros usuários e não poderá convidar outros por e-mail ou número de telefone.</string>
+    <string name="settings_discovery_msisdn_title">Números de telefone detectáveis</string>
+    <string name="settings_discovery_confirm_mail">Enviamos um e-mail de confirmação para %s, verifique seu e-mail e clique no link de confirmação</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Enviamos um e-mail de confirmação para %s. Por favor, verifique seu e-mail e clique no link de confirmação</string>
+    <string name="settings_discovery_mail_pending">Aguardando</string>
+
+    <string name="settings_discovery_enter_identity_server">Digite o endereço de um servidor de identidade</string>
+    <string name="settings_discovery_bad_identity_server">Não foi possível conectar-se ao servidor de identidade</string>
+    <string name="settings_discovery_please_enter_server">Digite o endereço do servidor de identidade</string>
+    <string name="settings_discovery_no_terms_title">O servidor de identidade não tem termos de serviço</string>
+    <string name="settings_discovery_no_terms">O servidor de identidade que você escolheu não possui termos de serviço. Continue apenas se você confiar no proprietário do servidor</string>
+    <string name="settings_text_message_sent">Uma mensagem de texto foi enviada para %s. Por favor, digite o código de confirmação que ela contém.</string>
+    <string name="settings_text_message_sent_wrong_code">O código de confirmação não está correto.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">Atualmente, você está compartilhando endereços de e-mail ou números de telefone no servidor de identidade %1$s. Você precisará reconectar-se a %2$s para parar de compartilhá-los.</string>
+    <string name="settings_agree_to_terms">Concorde com os Termos de Serviço do servidor de identidade (%s), para que você possa ser descoberto por endereço de e-mail ou por número de telefone.</string>
+
+    <string name="labs_allow_extended_logging">Ativar registros detalhados.</string>
+    <string name="labs_allow_extended_logging_summary">Os registros detalhados ajudarão os desenvolvedores, ao fornecerem mais registros quando você usar sacudir o aparelho. Mesmo quando ativado, o aplicativo não registra o conteúdo da mensagem ou qualquer outro dado privado.</string>
+
+
+    <string name="error_terms_not_accepted">Por favor, tente novamente quando tiver aceitado os termos e condições de seu servidor.</string>
+
+    <string name="error_network_timeout">Parece que o servidor está demorando muito para responder, isto pode ser causado ou por má conectividade ou por um erro com o servidor. Por favor, tente novamente daqui a pouco.</string>
+
+    <string name="send_attachment">Enviar anexo</string>
+
+    <string name="a11y_open_drawer">Abra a gaveta de navegação</string>
+    <string name="a11y_create_menu_open">Abra o menu de criar a sala</string>
+    <string name="a11y_create_menu_close">Fecha o menu de criar a sala…</string>
+    <string name="a11y_create_direct_message">Criar uma nova conversa direta</string>
+    <string name="a11y_create_room">Criar uma sala nova</string>
+    <string name="a11y_close_keys_backup_banner">Fechar o aviso de backup das chaves</string>
+    <string name="a11y_show_password">Mostrar senha</string>
+    <string name="a11y_hide_password">Esconder senha</string>
+    <string name="a11y_jump_to_bottom">Saltar para parte inferior</string>
+
+    <string name="three_users_read">%1$s, %2$s e %3$s leu</string>
+    <string name="two_users_read">%1$s e %2$s lê</string>
+    <string name="one_user_read">%s lê</string>
+    <plurals name="fallback_users_read">
+        <item quantity="one">1 usuário leu</item>
+        <item quantity="other">%d usuários leram</item>
+    </plurals>
+
+    <string name="error_file_too_big">O arquivo \'%1$s\' (%2$s) é muito grande para ser carregado. O limite é de %3$s.</string>
+
+    <string name="error_attachment">Ocorreu um erro durante a recuperação do anexo.</string>
+    <string name="attachment_type_file">Arquivo</string>
+    <string name="attachment_type_contact">Contato</string>
+    <string name="attachment_type_camera">Câmera</string>
+    <string name="attachment_type_audio">Áudio</string>
+    <string name="attachment_type_gallery">Galeria</string>
+    <string name="attachment_type_sticker">Figurinha</string>
+    <string name="error_handling_incoming_share">Não conseguia lidar com dados compartilhados</string>
+
+    <string name="uploads_media_title">MÍDIA</string>
+    <string name="uploads_media_no_result">Não há mídia nesta sala</string>
+    <string name="uploads_files_title">ARQUIVOS</string>
+    <string name="uploads_files_subtitle">%1$s em %2$s</string>
+    <string name="uploads_files_no_result">Não há arquivos nesta sala</string>
+
+    <string name="report_content_spam">É spam</string>
+    <string name="report_content_inappropriate">É inapropriado</string>
+    <string name="report_content_custom">Relatório personalizado…</string>
+    <string name="report_content_custom_title">Denunciar conteúdo</string>
+    <string name="report_content_custom_hint">Motivo para denúnciar este conteúdo</string>
+    <string name="report_content_custom_submit">RELATÓRIO</string>
+    <string name="block_user">BLOQUEAR USUÁRIO</string>
+
+    <string name="content_reported_title">Conteúdo relatado</string>
+    <string name="content_reported_content">Este conteúdo foi relatado.
+\n
+\nSe você não quiser ver mais conteúdo deste usuário, você pode bloqueá-lo para esconder suas mensagens</string>
+    <string name="content_reported_as_spam_title">Denunciado como spam</string>
+    <string name="content_reported_as_spam_content">Este conteúdo foi reportado como spam.
+\n
+\nSe você não quiser ver mais conteúdo deste usuário, você pode bloqueá-lo para esconder suas mensagens</string>
+    <string name="content_reported_as_inappropriate_title">Denunciado como inadequado</string>
+    <string name="content_reported_as_inappropriate_content">Este conteúdo foi relatado como inadequado.
+\n
+\nSe você não quiser ver mais conteúdo deste usuário, você pode bloqueá-lo para esconder suas mensagens</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Element precisa de permissão para salvar suas chaves E2E no aparelho.↵
+\n↵
+\nPermita o acesso na próxima janela para poder exportar suas chaves manualmente.</string>
+
+    <string name="no_network_indicator">Não há conexão de rede neste momento</string>
+
+    <string name="message_ignore_user">Bloqueia usuário</string>
+
+    <string name="room_list_quick_actions_notifications_all_noisy">Todas as mensagens novas (com som)</string>
+    <string name="room_list_quick_actions_notifications_all">Todas as mensagens novas</string>
+    <string name="room_list_quick_actions_notifications_mentions">Apenas @menções</string>
+    <string name="room_list_quick_actions_notifications_mute">Silenciar</string>
+    <string name="room_list_quick_actions_settings">Configurações</string>
+    <string name="room_list_quick_actions_favorite_add">Adicionar aos favoritos</string>
+    <string name="room_list_quick_actions_favorite_remove">Excluír dos favoritos</string>
+    <string name="room_list_quick_actions_leave">Sair da sala</string>
+    <string name="notice_member_no_changes">%1$s não fez nenhuma alteração</string>
+    <string name="notice_member_no_changes_by_you">Você não fez nenhuma alteração</string>
+    <string name="command_description_spoiler">Envia esta mensagem como um spoiler</string>
+    <string name="spoiler">Estraga-Surpresa</string>
+    <string name="reaction_search_type_hint">Digite palavras-chave para encontrar uma reação.</string>
+
+    <string name="no_ignored_users">Você não está bloqueando nenhum usuário</string>
+
+    <string name="help_long_click_on_room_for_more_options">Clique longo sobre uma sala para ver mais opções</string>
+
+
+    <string name="room_join_rules_public">%1$s tornou a sala pública para quem conhece o link.</string>
+    <string name="room_join_rules_public_by_you">Você tornou a sala pública para quem conhece o link.</string>
+    <string name="room_join_rules_invite">%1$s tornou a sala acessível somente com convite.</string>
+    <string name="room_join_rules_invite_by_you">Você tornou a sala acessível somente com convite.</string>
+    <string name="timeline_unread_messages">Mensagens não lidas</string>
+
+    <string name="login_splash_title">É a sua conversa. Vira um admin.</string>
+    <string name="login_splash_text1">Converse com as pessoas diretamente ou em comunidades</string>
+    <string name="login_splash_text2">Manter conversas privadas com criptografia</string>
+    <string name="login_splash_text3">Amplie e personalize sua experiência</string>
+    <string name="login_splash_submit">Comece agora</string>
+
+    <string name="login_server_title">Selecione um servidor</string>
+    <string name="login_server_text">Assim como o e-mail, as contas têm uma casa, embora você possa falar com qualquer pessoa</string>
+    <string name="login_server_matrix_org_text">Junte-se gratuitamente aos milhões no maior servidor público</string>
+    <string name="login_server_modular_text">Hospedagem Premium para organizações</string>
+    <string name="login_server_modular_learn_more">Saiba mais</string>
+    <string name="login_server_other_title">Outros</string>
+    <string name="login_server_other_text">Configurações personalizadas</string>
+
+    <string name="login_continue">Continuar</string>
+    <string name="login_connect_to">Conecte-se a %1$s</string>
+    <string name="login_connect_to_modular">Conecte-se aos serviços de Element no Matrix</string>
+    <string name="login_connect_to_a_custom_server">Conectar-se a um servidor personalizado</string>
+    <string name="login_signin_to">Entrar com %1$s</string>
+    <string name="login_signup">Cadastre-se</string>
+    <string name="login_signin">Entrar</string>
+    <string name="login_signin_sso">Continuar com ID único</string>
+
+    <string name="login_server_url_form_modular_hint">Endereço de serviço Element no Matrix</string>
+    <string name="login_server_url_form_other_hint">Endereço</string>
+    <string name="login_server_url_form_modular_text">Hospedagem Premium para organizações</string>
+    <string name="login_server_url_form_modular_notice">Digite o endereço de Element Modular ou Servidor que você deseja usar</string>
+    <string name="login_server_url_form_other_notice">Digite o endereço do Servidor ou o servidor do Element que você quer entrar</string>
+    <string name="login_server_url_form_common_notice">Digite o endereço do servidor que você deseja usar</string>
+
+    <string name="login_sso_error_message">Ocorreu um erro ao carregar a página: %1$s (%2$d)</string>
+    <string name="login_mode_not_supported">O aplicativo não pode entrar neste servidor. O servidor suporta os seguintes tipos de login: %1$s.↵
+\n↵
+\nDeseja entrar no servidor usando o Element Web\?</string>
+    <string name="login_registration_disabled">Desculpe, este servidor não está aceitando novas contas.</string>
+    <string name="login_registration_not_supported">O aplicativo não pode criar uma conta neste servidor.↵
+\n↵
+\nDeseja criar uma conta no servidor usando o Element Web\?</string>
+
+    <string name="login_login_with_email_error">Este e-mail não está associado a nenhuma conta.</string>
+
+    <string name="login_reset_password_on">Redefinir senha em %1$s</string>
+    <string name="login_reset_password_notice">Um e-mail de confirmação será enviado para sua caixa de entrada, para você confirmar a definição de sua nova senha.</string>
+    <string name="login_reset_password_submit">Próximo</string>
+    <string name="login_reset_password_email_hint">E-mail</string>
+    <string name="login_reset_password_password_hint">Senha nova</string>
+
+    <string name="login_reset_password_warning_title">Atenção!</string>
+    <string name="login_reset_password_warning_content">Alterar a sua senha redefinirá todas as chaves de criptografia de ponta a ponta existentes em todas as suas sessões, tornando o histórico de mensagens criptografadas ilegível. Faça uma cópia (backup) das suas chaves, ou exporte as chaves de outra sessão antes de alterar a sua senha.</string>
+    <string name="login_reset_password_warning_submit">Continuar</string>
+
+    <string name="login_reset_password_error_not_found">Este e-mail não está associado a nenhuma conta</string>
+
+    <string name="login_reset_password_mail_confirmation_title">Verifique sua caixa de entrada no e-mail</string>
+    <string name="login_reset_password_mail_confirmation_notice">Um e-mail de confirmação foi enviado para %1$s.</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Toque no link para confirmar sua nova senha. Uma vez que você tenha clicado o link que ele contém, clique abaixo.</string>
+    <string name="login_reset_password_mail_confirmation_submit">Verifiquei meu endereço de e-mail</string>
+
+    <string name="login_reset_password_success_title">Parabéns!</string>
+    <string name="login_reset_password_success_notice">Sua senha foi alterada.</string>
+    <string name="login_reset_password_success_notice_2">Você foi desconectado de todas as sessões e não receberá mais notificações pop-up. Para reativar as notificações, faça o login novamente em cada aparelho.</string>
+    <string name="login_reset_password_success_submit">Voltar para Entrar</string>
+
+    <string name="login_reset_password_cancel_confirmation_title">Atenção</string>
+    <string name="login_reset_password_cancel_confirmation_content">Sua senha ainda não foi alterada.↵
+\n↵
+\nInterromper a alteração de senha\?</string>
+
+    <string name="login_set_email_title">Defina um endereço de e-mail</string>
+    <string name="login_set_email_notice">Defina um e-mail para recuperar sua conta. Mais tarde, você pode, opcionalmente, permitir que as pessoas que você conhece o descubram por seu e-mail.</string>
+    <string name="login_set_email_mandatory_hint">E-mail</string>
+    <string name="login_set_email_optional_hint">E-mail (opcional)</string>
+    <string name="login_set_email_submit">Próximo</string>
+
+    <string name="login_set_msisdn_title">Defina número de telefone</string>
+    <string name="login_set_msisdn_notice">Defina um número de telefone para, opcionalmente, permitir que as pessoas que você conhece o encontram.</string>
+    <string name="login_set_msisdn_notice2">Por favor, use o formato internacional.</string>
+    <string name="login_set_msisdn_mandatory_hint">Número de telefone</string>
+    <string name="login_set_msisdn_optional_hint">Número de telefone (opcional)</string>
+    <string name="login_set_msisdn_submit">Próximo</string>
+
+    <string name="login_msisdn_confirm_title">Confirme o número de telefone</string>
+    <string name="login_msisdn_confirm_notice">Acabamos de enviar um código para %1$s. Digite-o abaixo para confirmar se é você.</string>
+    <string name="login_msisdn_confirm_hint">Digite o código</string>
+    <string name="login_msisdn_confirm_send_again">Enviar novamente</string>
+    <string name="login_msisdn_confirm_submit">Próximo</string>
+
+    <string name="login_msisdn_error_not_international">Os números de telefone internacionais devem começar com \'+\'</string>
+    <string name="login_msisdn_error_other">O número de telefone parece inválido. Favor verificá-lo</string>
+
+    <string name="login_signup_to">Registar em %1$s</string>
+    <string name="login_signin_username_hint">Nome de usuário ou e-mail</string>
+    <string name="login_signup_username_hint">Nome de usuário</string>
+    <string name="login_signup_password_hint">Senha</string>
+    <string name="login_signup_submit">Próximo</string>
+    <string name="login_signup_error_user_in_use">Esse nome de usuário está indisponível</string>
+    <string name="login_signup_cancel_confirmation_title">Atenção</string>
+    <string name="login_signup_cancel_confirmation_content">Sua conta ainda não foi criada.
+\n
+\n
+\nParar o processo de registro\?</string>
+
+    <string name="login_a11y_choose_matrix_org">Selecione matrix.org</string>
+    <string name="login_a11y_choose_modular">Selecione Element nos Serviços de Matrix</string>
+    <string name="login_a11y_choose_other">Selecione um servidor personalizado</string>
+    <string name="login_a11y_captcha_container">Por favor, realize o desafio de Captcha</string>
+    <string name="login_terms_title">Aceitar termos para continuar</string>
+
+    <string name="login_wait_for_email_title">Por favor, verifique seu e-mail</string>
+    <string name="login_wait_for_email_notice">Acabamos de enviar um e-mail para %1$s.↵
+\nPor favor, clique no link que ele contém para continuar a criação da conta.</string>
+    <string name="login_validation_code_is_not_correct">O código digitado não está correto. Por favor, verifique-o.</string>
+    <string name="login_error_outdated_homeserver_title">Servidor desatualizado</string>
+    <string name="login_error_outdated_homeserver_content">Este servidor tem uma versão muito antiga que não é compatível com nosso servidor. Peça ao administrador para fazer atualização.</string>
+
+    <plurals name="login_error_limit_exceeded_retry_after">
+        <item quantity="one">Recebemos demasiado pedidos. Você pode tentar novamente em %1$d segundo…</item>
+        <item quantity="other">Recebemos demasiado pedidos. Você pode tentar novamente em %1$d segundos…</item>
+    </plurals>
+
+    <string name="login_connect_using_matrix_id_notice">Alternativamente, se você já tem uma conta e conhece a sua ID de usuário na Matrix e a senha, você pode usar este método:</string>
+    <string name="login_connect_using_matrix_id_submit">Entre com ID do Matrix</string>
+    <string name="login_signin_matrix_id_title">Entre com ID do Matrix</string>
+    <string name="login_signin_matrix_id_notice">Se você criar uma conta no servidor local, use ID do Matrix (e.g. @user:domain.com) e a senha abaixo.</string>
+    <string name="login_signin_matrix_id_hint">ID do Matrix</string>
+    <string name="login_signin_matrix_id_password_notice">Se você não souber sua senha, volte para redefinir-a.</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Este não é um identificador de usuário válido. Formato esperado: \'@user:homeserver.org\'</string>
+    <string name="autodiscover_well_known_error">Incapaz de encontrar um servidor válido. Por favor, verifique seu identificador</string>
+
+    <string name="seen_by">Lida por</string>
+
+    <string name="signed_out_title">Você está desconectada/o</string>
+    <string name="signed_out_notice">Isso pode ser devido à vários motivos:↵
+\n↵
+\n• Você alterou sua senha em outra sessão.↵
+\n↵
+\n• Você excluiu esta sessão de outra sessão.↵
+\n↵
+\n• O administrador do seu servidor invalidou seu acesso por motivos de segurança.</string>
+    <string name="signed_out_submit">Entrar novamente</string>
+
+    <string name="soft_logout_title">Você está desconectada/o</string>
+    <string name="soft_logout_signin_title">Entrar</string>
+    <string name="soft_logout_signin_notice">Administrador do seu servidor (%1$s) invalidou seu acesso %2$s (%3$s).</string>
+    <string name="soft_logout_signin_e2e_warning_notice">Faça login para recuperar as chaves de criptografia armazenadas exclusivamente neste aparelho. Você precisa delas para ler todas as suas mensagens seguras em qualquer aparelho.</string>
+    <string name="soft_logout_signin_submit">Entrar</string>
+    <string name="soft_logout_signin_password_hint">Senha</string>
+    <string name="soft_logout_clear_data_title">Limpar dados pessoais</string>
+    <string name="soft_logout_clear_data_notice">Atenção: Seus dados pessoais (incluindo chaves de criptografia) ainda estão armazenados neste aparelho.↵
+\n↵
+\nApague-os quando não usar mais este aparelho, ou se quiser entrar em outra conta.</string>
+    <string name="soft_logout_clear_data_submit">Limpar todos os dados</string>
+
+    <string name="soft_logout_clear_data_dialog_title">Limpar dados</string>
+    <string name="soft_logout_clear_data_dialog_content">Limpar todos os dados atualmente armazenados neste aparelho\?↵
+\nEntre novamente para acessar os dados e mensagens da sua conta.</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">Você perderá o acesso as mensagens seguras a menos que você faça login para recuperar suas chaves de criptografia.</string>
+    <string name="soft_logout_clear_data_dialog_submit">Limpar dados</string>
+    <string name="soft_logout_sso_not_same_user_error">A sessão atual é para o usuário %1$s e você fornece credenciais para o usuário %2$s. Isto não é suportado por Element.
+\n
+\nPor favor, primeiro limpe os dados, depois faça o login novamente em outra conta.</string>
+
+    <string name="permalink_malformed">Seu link do matrix.to foi malformado</string>
+    <string name="bug_report_error_too_short">A descrição é curta demais</string>
+
+    <string name="notification_initial_sync">Sincronia Inicial…</string>
+
+    <string name="settings_show_devices_list">Veja todas as minhas sessões</string>
+    <string name="settings_advanced_settings">Configurações avançadas</string>
+    <string name="settings_developer_mode">Modo desenvolvedor</string>
+    <string name="settings_developer_mode_summary">O modo desenvolvedor ativa características ocultas e pode também tornar o aplicativo menos estável. Somente para desenvolvedores!</string>
+    <string name="settings_rageshake">Agitar celular</string>
+    <string name="settings_rageshake_detection_threshold">Detectar patamar</string>
+    <string name="settings_rageshake_detection_threshold_summary">Agite seu telefone para testar o limiar de detecção</string>
+    <string name="rageshake_detected">A sacudida detectada!</string>
+    <string name="settings">Configurações</string>
+    <string name="devices_current_device">Sessão atual</string>
+    <string name="devices_other_devices">Outras sessões</string>
+
+    <string name="autocomplete_limited_results">Mostrando apenas os primeiros resultados, digite mais letras…</string>
+
+    <string name="settings_developer_mode_fail_fast_title">Relatar imediatamente as falhas</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element pode quebrar com mais freqüência quando ocorre um erro inesperado</string>
+
+    <string name="command_description_shrug">Adicionar ¯\\_(ツ)_/¯ para uma mensagem de texto simples</string>
+
+    <string name="create_room_encryption_title">Ativar criptografia</string>
+    <string name="create_room_encryption_description">Uma vez ativada, a criptografia não poderá ser desativada.</string>
+
+    <string name="login_error_threepid_denied">Seu domínio de e-mail não está permitido a se registrar neste servidor</string>
+
+    <string name="verification_conclusion_warning">Entrada não confiável</string>
+    <string name="verification_sas_match">Correspondem</string>
+    <string name="verification_sas_do_not_match">Não correspondem</string>
+    <string name="verify_user_sas_emoji_help_text">Confirme este usuário, comparando os emojis a seguir que serão exibidos na tela dele, na mesma ordem.</string>
+    <string name="verify_user_sas_emoji_security_tip">Para maior segurança, use outro meio de comunicação confiável ou faça isso pessoalmente.</string>
+    <string name="verification_green_shield">Procure o escudo verde para garantir que um usuário seja confiável. Confie em todos os usuários numa sala para garantir que a sala é segura.</string>
+
+    <string name="verification_conclusion_not_secure">Não seguro</string>
+    <string name="verification_conclusion_compromised">Um dos seguintes casos pode estar comprometido:↵
+\n↵
+\n·- Seu servidor doméstico↵
+\n·- O servidor do usuário que você está verificando↵
+\n·- A sua, ou a conexão de outros usuários à internet↵
+\n·- O seu, ou o aparelho dos outros usuários</string>
+
+    <string name="sent_a_video">Vídeo.</string>
+    <string name="sent_an_image">Imagem.</string>
+    <string name="sent_an_audio_file">Áudio</string>
+    <string name="sent_a_file">Arquivo</string>
+    <string name="send_a_sticker">Figurinha</string>
+
+    <string name="verification_request_waiting">Aguardando…</string>
+    <string name="verification_request_other_cancelled">%s cancelado</string>
+    <string name="verification_request_you_cancelled">Você cancelou</string>
+    <string name="verification_request_other_accepted">%s aceitou</string>
+    <string name="verification_request_you_accepted">Você aceitou</string>
+    <string name="verification_sent">Confirmação enviada</string>
+    <string name="verification_request">Solicitação de confirmação</string>
+    <string name="verification_verify_device">Confirmar esta sessão</string>
+    <string name="verification_verify_device_manually">Confirmar manualmente</string>
+
+    <string name="you">Você</string>
+
+    <string name="verification_scan_notice">Escaneie o código com a câmera do aparelho do outro usuário para confirmar a segurança entre vocês</string>
+    <string name="verification_scan_their_code">Escanea o código do seu contato</string>
+    <string name="verification_scan_emoji_title">Não pode escanear</string>
+    <string name="verification_scan_emoji_subtitle">Se você não está presente, alternativamente compare emoji</string>
+
+    <string name="verification_no_scan_emoji_title">Confirmar comparando emojis</string>
+
+    <string name="verify_by_emoji_title">Confirmar por emojis</string>
+    <string name="verify_by_emoji_description">Se você não consegue escanear o código acima, confirme via comparação de emojis.</string>
+
+    <string name="a13n_qr_code_description">Imagem em código QR</string>
+
+    <string name="verification_verify_user">Confirmar %s</string>
+    <string name="verification_verified_user">Confirmou %s</string>
+    <string name="verification_request_waiting_for">Aguardando por %s…</string>
+    <string name="verification_request_alert_description">Para segurança extra, confirme %s comparando um código único em ambos os aparelhos.↵ 
+\n↵ 
+\nPara máxima segurança, faça isso pessoalmente.</string>
+    <string name="room_profile_not_encrypted_subtitle">As mensagens nesta sala não estão criptografadas de ponta a ponta.</string>
+    <string name="room_profile_encrypted_subtitle">As mensagens nesta sala são criptografadas de ponta a ponta.↵
+\n↵
+\nSuas mensagens são protegidas com cadeados e somente você e o destinatário têm as chaves exclusivas que permitam a sua leitura.</string>
+    <string name="room_profile_section_security">Segurança</string>
+    <string name="room_profile_section_security_learn_more">Saiba mais</string>
+    <string name="room_profile_section_more">Mais</string>
+    <string name="room_profile_section_admin">Ações do administrador</string>
+    <string name="room_profile_section_more_settings">Configurações da sala</string>
+    <string name="room_profile_section_more_notifications">Notificações</string>
+    <plurals name="room_profile_section_more_member_list">
+        <item quantity="one">Uma pessoa</item>
+        <item quantity="other">%1$d pessoas</item>
+    </plurals>
+    <string name="room_profile_section_more_uploads">Subidas</string>
+    <string name="room_profile_section_more_leave">Deixar a sala</string>
+    <string name="room_profile_leaving_room">Deixando a sala…</string>
+
+    <string name="room_member_power_level_admins">Administradores</string>
+    <string name="room_member_power_level_moderators">Moderadores</string>
+    <string name="room_member_power_level_custom">Personalizado</string>
+    <string name="room_member_power_level_invites">Convites</string>
+    <string name="room_member_power_level_users">Usuários</string>
+
+    <string name="room_member_power_level_admin_in">Administrador em %1$s</string>
+    <string name="room_member_power_level_moderator_in">Moderador em %1$s</string>
+    <string name="room_member_power_level_default_in">Padrão em %1$s</string>
+    <string name="room_member_power_level_custom_in">Personalizado (%1$d) em %2$s</string>
+
+    <string name="room_member_jump_to_read_receipt">Ir para a confirmação de leitura</string>
+
+    <string name="rendering_event_error_type_of_event_not_handled">Element não lida com eventos do tipo \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element não lida com mensagens do tipo \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element encontrou um problema ao render o conteúdo de um evento com \'%1$s\' ID</string>
+
+    <string name="unignore">Desbloquear</string>
+
+    <string name="verify_cannot_cross_sign">Esta sessão não pode compartilhar essa confirmação com suas outras sessões.↵ 
+\nA confirmação será salvada localmente e será compartilhada em uma versão futura do aplicativo.</string>
+
+    <string name="room_list_sharing_header_recent_rooms">Salas recentes</string>
+    <string name="room_list_sharing_header_other_rooms">Outras salas</string>
+
+    <string name="command_description_rainbow">Envia a mensagem colorida como arco-íris</string>
+    <string name="command_description_rainbow_emote">Envia o emoji colorido como um arco-íris</string>
+
+    <string name="settings_category_timeline">Linha do Tempo</string>
+
+    <string name="settings_category_composer">Editor de mensagens</string>
+
+    <string name="room_settings_enable_encryption">Ativar a criptografia de ponta a ponta</string>
+    <string name="room_settings_enable_encryption_warning">Uma vez ativada, a criptografia não poderá ser desativada.</string>
+
+    <string name="room_settings_enable_encryption_dialog_title">Ativar criptografia\?</string>
+    <string name="room_settings_enable_encryption_dialog_content">Uma vez ativada, a criptografia de uma sala não pode ser desativada. As mensagens enviadas em uma sala criptografada não podem ser lidas pelo servidor, apenas pelos participantes desta sala. A ativação da criptografia pode impedir que muitos bots e pontes funcionem corretamente.</string>
+    <string name="room_settings_enable_encryption_dialog_submit">Ativar criptografia</string>
+
+    <string name="verification_request_notice">Para ficar seguro, confirme %s comparando um código único.</string>
+    <string name="verification_request_start_notice">Para sua segurança, faça isso pessoalmente ou use outra forma confiável de comunicação.</string>
+
+    <string name="verification_emoji_notice">Compare os emoji únicos, assegurando que eles apareçam na mesma ordem.</string>
+    <string name="verification_code_notice">Compare o código com o exibido na tela do outro usuário.</string>
+    <string name="verification_conclusion_ok_notice">As mensagens com este usuário estão criptografadas de ponta a ponta e não podem ser lidas por terceiros.</string>
+    <string name="verification_conclusion_ok_self_notice">Sua nova sessão agora está confirmada. Ela tem acesso às suas mensagens criptografadas, e outros usuários a verão como confirmada.</string>
+
+    <string name="encryption_information_cross_signing_state">Autoverificação</string>
+    <string name="encryption_information_dg_xsigning_complete">A autoverificação está ativada↵
+\nChaves privadas estão no aparelho.</string>
+    <string name="encryption_information_dg_xsigning_trusted">A autoverificação está ativada↵
+\nAs chaves são confiáveis.↵
+\nAs chaves privadas não são conhecidas</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">A autoverificação está ativada.↵
+\nAs chaves não são confiáveis</string>
+    <string name="encryption_information_dg_xsigning_disabled">A autoverificação não está ativada</string>
+
+    <string name="settings_hs_admin_e2e_disabled">O administrador do servidor desativou a criptografia de ponta a ponta por padrão em salas privadas e em conversas.</string>
+    <string name="settings_active_sessions_list">Sessões ativas</string>
+    <string name="settings_active_sessions_show_all">Veja todas as sessões</string>
+    <string name="settings_active_sessions_manage">Gerenciar sessões</string>
+    <string name="settings_active_sessions_signout_device">Sair desta sessão</string>
+
+    <string name="settings_failed_to_get_crypto_device_info">Não há informações criptográficas disponíveis</string>
+
+    <string name="settings_active_sessions_verified_device_desc">Esta sessão é confiável para o envio de mensagens seguras porque você a confirmou:</string>
+    <string name="settings_active_sessions_unverified_device_desc">Confirme esta sessão para conceder para ela o acesso a mensagens criptografadas. Se você não entrou nesta sessão, sua conta pode estar comprometida:</string>
+
+    <plurals name="settings_active_sessions_count">
+        <item quantity="one">%d sessão ativa</item>
+        <item quantity="other">%d sessões ativas</item>
+    </plurals>
+
+    <string name="crosssigning_verify_this_session">Confirmar este acesso</string>
+    <string name="crosssigning_other_user_not_trust">Outros usuários podem não confiar nela</string>
+    <string name="complete_security">Segurança completa</string>
+
+    <string name="verification_open_other_to_verify">Use uma sessão existente para confirmar a nova sessão, dando a ela acesso às mensagens criptografadas.</string>
+
+
+    <string name="verification_profile_verify">Confirmar</string>
+    <string name="verification_profile_verified">Confirmado</string>
+    <string name="verification_profile_warning">Atenção</string>
+
+    <string name="room_member_profile_failed_to_get_devices">Falha em obter sessões</string>
+    <string name="room_member_profile_sessions_section_title">Sessões</string>
+    <string name="trusted">Confiável</string>
+    <string name="not_trusted">Não confiável</string>
+
+    <string name="verification_profile_device_verified_because">Esta sessão está confirmada para trocar mensagens seguras porque %1$s (%2$s) a confirmou:</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) entrou usando uma nova sessão:</string>
+    <string name="verification_profile_device_untrust_info">Até que este usuário confirme esta sessão, as mensagens enviadas de e para ela são etiquetadas com avisos. Alternativamente, é possível confirmar a sessão manualmente.</string>
+
+
+    <string name="initialize_cross_signing">Ativar a autoverificação</string>
+    <string name="reset_cross_signing">Reiniciar Chaves</string>
+
+    <string name="a11y_qr_code_for_verification">Código QR</string>
+
+    <string name="qr_code_scanned_by_other_notice">Quase lá! Este escudo também aparece para %s\?</string>
+    <string name="qr_code_scanned_by_other_yes">Sim</string>
+    <string name="qr_code_scanned_by_other_no">Não</string>
+
+    <string name="no_connectivity_to_the_server_indicator">A conexão com o servidor foi perdida</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">O modo de Avião está ativo</string>
+
+    <string name="settings_dev_tools">Ferramentas do Desenvolvedor</string>
+    <string name="settings_account_data">Dados da Conta</string>
+    <plurals name="poll_info">
+        <item quantity="one">%d voto</item>
+        <item quantity="other">%d votos</item>
+    </plurals>
+    <plurals name="poll_info_final">
+        <item quantity="one">%d voto - Resultados finais</item>
+        <item quantity="other">%d votos - Resultados finais</item>
+    </plurals>
+    <string name="poll_item_selected_aria">Opção Selecionada</string>
+    <string name="command_description_poll">Cria uma pesquisa simples</string>
+    <string name="verification_cannot_access_other_session">Use a Chave ou a Frase Secreta de Recuperação</string>
+    <string name="verification_use_passphrase">Se você não pode entrar numa sessão existente</string>
+
+    <string name="new_signin">Entrar de Novo</string>
+
+    <string name="enter_secret_storage_invalid">Não é possível encontrar segredos no armazenamento</string>
+    <string name="enter_secret_storage_passphrase">Digite a frase secreta de armazenamento</string>
+    <string name="enter_secret_storage_passphrase_warning">Atenção:</string>
+    <string name="enter_secret_storage_passphrase_warning_text">Você só deveria entrar no armazenamento secreto a partir de um aparelho confiável</string>
+
+    <string name="message_action_item_redact">Excluír…</string>
+    <string name="share_confirm_room">Deseja enviar este anexo para %1$s\?</string>
+    <plurals name="send_images_with_original_size">
+        <item quantity="one">Enviar imagem do tamanho original</item>
+        <item quantity="other">Enviar imagens do tamanho original</item>
+    </plurals>
+
+    <string name="delete_event_dialog_title">Confirmar a exclusão</string>
+    <string name="delete_event_dialog_content">Tem certeza de que deseja apagar este evento\? Observe que, se você apagar a alteração do nome ou descrição de uma sala, isso reverterá a alteração.</string>
+    <string name="delete_event_dialog_reason_checkbox">Incluir o motivo</string>
+    <string name="delete_event_dialog_reason_hint">Motivo da edição</string>
+
+    <string name="event_redacted_by_user_reason_with_reason">Evento excluído pelo usuário, motivo: %1$s</string>
+    <string name="event_redacted_by_admin_reason_with_reason">Evento moderado pelo administrador da sala, motivo: %1$s</string>
+
+    <string name="keys_backup_restore_success_title_already_up_to_date">As chaves já estão atualizadas!</string>
+
+    <string name="login_default_session_public_name">Element para Android</string>
+
+    <string name="settings_key_requests">A chave pede</string>
+
+    <string name="e2e_use_keybackup">Desbloquear histórico de mensagens criptografadas</string>
+
+    <string name="refresh">Recarregar</string>
+
+    <string name="new_session">Novo login. Foi você\?</string>
+    <string name="new_session_review">Toque para revisar e confirmar</string>
+    <string name="verify_new_session_notice">Use esta sessão para confirmar a sua nova sessão, dando a ela acesso às mensagens criptografadas.</string>
+    <string name="verify_new_session_was_not_me">Não foi eu</string>
+    <string name="verify_new_session_compromized">Sua conta pode estar comprometida</string>
+
+    <string name="verify_cancel_self_verification_from_untrusted">Se você cancelar, não será capaz de ler mensagens criptografadas neste aparelho, e outros usuários não confiarão nele</string>
+    <string name="verify_cancel_self_verification_from_trusted">Se você cancelar, você não poderá ler mensagens criptografadas em seu novo aparelho, e outros usuários não confiarão nele</string>
+    <string name="verify_cancel_other">Você não confirmará %1$s (%2$s) se cancelar agora. Precisará começar novamente no perfil dele.</string>
+
+    <string name="verify_not_me_self_verification">Um dos seguintes casos pode estar comprometido:↵
+\n↵
+\n- Sua senha↵
+\n- Seu servidor doméstico↵
+\n- Este aparelho, ou o outro aparelho↵
+\n- A conexão à internet de qualquer um dos aparelhos que você está usando↵
+\n↵
+\nRecomendamos que você altere imediatamente a sua senha e a chave de recuperação em Configurações.</string>
+
+    <string name="verify_cancelled_notice">Confirme seus aparelhos em Configurações.</string>
+    <string name="verification_cancelled">Confirmação cancelada</string>
+
+    <string name="recovery_passphrase">Digite a frase secreta de recuperação</string>
+    <string name="message_key">Chave da Mensagem</string>
+    <string name="account_password">Senha da Conta</string>
+
+    <string name="set_recovery_passphrase">Definir o %s</string>
+    <string name="generate_message_key">Gerar uma Chave de Mensagem</string>
+
+    <string name="confirm_recovery_passphrase">Confirme %s</string>
+
+    <string name="enter_account_password">Digite sua %s para continuar.</string>
+
+    <string name="bootstrap_info_text">Proteja e desbloqueie mensagens criptografadas e confia com um %s.</string>
+    <string name="bootstrap_info_confirm_text">Digite novamente seu %s para confirmar.</string>
+    <string name="bootstrap_dont_reuse_pwd">Não use a senha da sua conta.</string>
+
+    <string name="bootstrap_info_text_2">Digite uma frase de segurança que só você conheça, usada para proteger os segredos em seu servidor.</string>
+
+    <string name="bootstrap_loading_text">Isto pode levar vários segundos, seja paciente.</string>
+    <string name="bootstrap_loading_title">Criação de recuperação.</string>
+    <string name="your_recovery_key">Sua chave de recuperação</string>
+    <string name="bootstrap_finish_title">Tudo pronto!</string>
+    <string name="keep_it_safe">Guarde num local seguro</string>
+    <string name="finish">Encerrar</string>
+
+    <string name="bootstrap_save_key_description">Use isto %1$s como uma rede de segurança caso você esqueça sua %2$s.</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">Publicando as chaves de identidade criadas</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Gerando uma chave segura a partir de uma frase secreta</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Definindo a chave padrão SSSS</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Sincronização da chave Geral</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Sincronização da chave do Usuário</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Sincronizando a chave de Auto-Assinatura</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Criando o Backup da Chave</string>
+
+
+    <string name="bootstrap_cross_signing_success">Suas %2$s &amp; %1$s estão agora definidas.
+\n
+\nSalva arquivos em local seguro! Você precisará deles para desbloquear mensagens criptografadas e proteger informações se perder todas as suas sessões ativas.</string>
+
+    <string name="bootstrap_crosssigning_print_it">Imprime e armazena em local seguro</string>
+    <string name="bootstrap_crosssigning_save_usb">Salva em uma chave USB ou HDD de backup</string>
+    <string name="bootstrap_crosssigning_save_cloud">Copia para sua nuvem pessoal</string>
+
+    <string name="auth_flow_not_supported">Você não pode fazer isso por celular</string>
+
+    <string name="encryption_enabled">Criptografia ativada</string>
+    <string name="encryption_not_enabled">Criptografia desativada</string>
+    <string name="qr_code_scanned_verif_waiting">Aguardando por %s…</string>
+
+    <string name="settings_notification_configuration">Configuração de notificações</string>
+    <string name="settings_troubleshoot_title">Solução de problemas</string>
+    <string name="room_message_placeholder">Mensagem…</string>
+
+    <string name="use_file">Use Arquivo</string>
+
+    <string name="enter_backup_passphrase">Digite %s</string>
+    <string name="backup_recovery_passphrase">Frase Secreta de Recuperação</string>
+    <string name="bootstrap_progress_checking_backup">Verificando a chave de backup</string>
+    <string name="bootstrap_skip_text">Criando uma Frase Secreta de Recuperação permite proteger e desbloquear mensagens criptografadas e estabelecer confiança.
+\n
+\n
+\nSe você não quiser definir uma Senha de Mensagem, crie antes uma Chave de Mensagem.</string>
+    <string name="bootstrap_skip_text_no_gen_key">Criar uma Frase Secreta de Recuperação permite proteger e desbloquear mensagens criptografadas e estabelecer confiança.</string>
+    <string name="bootstrap_cancel_text">Se você cancelar agora, poderá perder mensagens e dados criptografados para sempre se esquecer seus credenciais.
+\n
+\nTambém pode configurar o Backup Seguro e gerenciar suas chaves em Configurações.</string>
+
+    <string name="encryption_enabled_tile_description">As mensagens nesta sala estão criptografadas de ponta a ponta. Confirme os usuários em seus perfis.</string>
+    <string name="encryption_unknown_algorithm_tile_description">A criptografia usada por esta sala não é suportada</string>
+
+    <string name="room_created_summary_item">%s criou e configurou a sala.</string>
+    <string name="room_created_summary_item_by_you">Você criou e configurou a sala.</string>
+
+    <string name="qr_code_scanned_self_verif_notice">Quase lá! O outro aparelho está mostrando o mesmo escudo\?</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Quase lá! Aguardando confirmação…</string>
+    <string name="error_failed_to_import_keys">Falha na importação de chaves</string>
+
+    <string name="settings_messages_at_room">Mensagens contendo @room</string>
+    <string name="settings_messages_in_e2e_one_to_one">Mensagens criptografadas em bate-papos individuais</string>
+    <string name="settings_messages_in_e2e_group_chat">Mensagens criptografadas em conversas em grupo</string>
+    <string name="settings_when_rooms_are_upgraded">Quando as salas são atualizadas</string>
+    <string name="settings_notification_advanced_summary">Definir a importância da notificação por evento</string>
+
+    <string name="command_description_plain">Envia uma mensagem como texto simples, sem interpretá-la como markdown</string>
+
+    <string name="auth_invalid_login_param_space_in_password">Nome de usuário e/ou senha incorretos. A senha digitada começa ou termina com espaços, favor verificá-la.</string>
+    <string name="auth_invalid_login_deactivated_account">Esta conta foi desativada.</string>
+
+    <string name="upgrade_security">Atualização de criptografia disponível</string>
+    <string name="setup_cross_signing">Ativar a autoverificação</string>
+    <string name="security_prompt_text">Verifique-se e os outros para manter suas conversas seguras</string>
+
+    <string name="bootstrap_enter_recovery">Digite sua %s para continuar</string>
+    <string name="bootstrap_invalid_recovery_key">Não é uma chave de recuperação válida</string>
+    <string name="recovery_key_empty_error_message">Digite uma chave de recuperação</string>
+
+    <string name="bootstrap_progress_checking_backup_with_info">Verificando a chave de backup (%s)</string>
+    <string name="bootstrap_progress_compute_curve_key">Obtendo a chave da curva</string>
+    <string name="bootstrap_progress_generating_ssss">Gerando a chave SSSS a partir de uma frase secreta</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Gerando a chave SSSS a partir de uma frase secreta (%s)</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Gerando a chave SSSS a partir da chave de recuperação</string>
+    <string name="bootstrap_progress_storing_in_sss">Armazenando secreto de chave do backup em SSSS</string>
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+
+    <string name="bootstrap_migration_enter_backup_password">Digite sua Frase Secreta de Chave do Backup para continuar.</string>
+    <string name="bootstrap_migration_use_recovery_key">use sua chave de recuperação de Chave do Backup</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Não conheça sua Frase Secreta de Chave do Backup, você pode %s.</string>
+    <string name="bootstrap_migration_backup_recovery_key">Chave de recuperação de Chave do Backup</string>
+
+    <string name="settings_security_prevent_screenshots_title">Impedir captura da tela do aplicativo</string>
+    <string name="settings_security_prevent_screenshots_summary">Ativando esta opção acrescenta FLAG_SECURE a todas as atividades. Reinicie o aplicativo para que a alteração tenha efeito.</string>
+
+    <string name="media_file_added_to_gallery">Arquivo de mídia adicionado à Galeria</string>
+    <string name="error_adding_media_file_to_gallery">Não foi possível adicionar o arquivo de mídia à Galeria</string>
+    <string name="error_saving_media_file">Não foi possível salvar o arquivo de mídia</string>
+    <string name="change_password_summary">Definir uma nova senha da conta…</string>
+
+    <string name="use_other_session_content_description">Use o Element mais recente em seus outros aparelhos: Element Web, Element para Computador, Element para iOS, Element para Android, ou outro cliente Matrix capaz de fazer autoverificação</string>
+    <string name="app_desktop_web">Element Web↵
+\nElement para Computador</string>
+    <string name="app_ios_android">Element para iOS
+\nElement para Android</string>
+    <string name="or_other_mx_capabale_client">ou outro cliente da Matrix capaz de fazer autoverificação</string>
+    <string name="use_latest_app">Use o Element mais recente em seus outros aparelhos:</string>
+    <string name="command_description_discard_session">Força a atual sessão da comunidade em uma sala criptografada a ser descartada</string>
+    <string name="command_description_discard_session_not_handled">Só é suportado em salas criptografadas</string>
+    <string name="enter_secret_storage_passphrase_or_key">Use seu %1$s ou %2$s para continuar.</string>
+    <string name="use_recovery_key">Usar a chave de recuperação</string>
+    <string name="enter_secret_storage_input_key">Selecione sua Chave de Recuperação, ou insira manualmente digitando-a ou colando-a da sua área de transferência</string>
+    <string name="keys_backup_recovery_key_error_decrypt">O backup não pôde ser descriptografado com essa Chave de Recuperação: verifique se você digitou a Chave de Recuperação correta.</string>
+    <string name="failed_to_access_secure_storage">Falha ao acessar o armazenamento seguro</string>
+
+    <string name="unencrypted">Não criptografado</string>
+    <string name="encrypted_unverified">Criptografado por um aparelho não confirmado</string>
+    <string name="review_logins">Revisar onde você está logado</string>
+    <string name="verify_other_sessions">Verifique todas as suas sessões para garantir que sua conta e mensagens estão seguras</string>
+    <string name="verify_this_session">Verifique o novo login acessando sua conta: %1$s</string>
+
+    <string name="cross_signing_verify_by_text">Confirmação manual por texto</string>
+    <string name="crosssigning_verify_session">Confirmar o login</string>
+    <string name="cross_signing_verify_by_emoji">Confirme interativamente por emojis</string>
+    <string name="confirm_your_identity">Confirme sua identidade verificando este login a partir de uma de suas outras sessões, concedendo-lhe acesso às mensagens criptografadas.</string>
+    <string name="mark_as_verified">Marcar como Confiável</string>
+
+    <string name="error_empty_field_choose_user_name">Escolha um nome de usuário.</string>
+    <string name="error_empty_field_choose_password">Escolha uma senha.</string>
+    <string name="external_link_confirmation_title">Verificar este link</string>
+    <string name="external_link_confirmation_message">O link %1$s redirecionará você para outro site: %2$s.↵
+\n↵
+\nDeseja continuar\?</string>
+
+    <string name="create_room_dm_failure">Não foi possível criar sua DM. Por favor, verifique os usuários que você deseja convidar e tente novamente.</string>
+
+    <string name="add_members_to_room">Adicionar membros</string>
+    <string name="invite_users_to_room_action_invite">CONVITE</string>
+    <string name="inviting_users_to_room">Convidando os usuários…</string>
+    <string name="invite_users_to_room_title">Convidar Usuários</string>
+    <string name="invitation_sent_to_one_user">Convite enviado para %1$s</string>
+    <string name="invitations_sent_to_two_users">Convites enviados para %1$s e %2$s</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="one">Convites enviados para %1$s e mais um</item>
+        <item quantity="other">Convites enviados para %1$s e %2$s e mais</item>
+    </plurals>
+    <string name="invite_users_to_room_failure">Não foi possível convidar os usuários. Por favor, verifique os usuários que você deseja convidar e tente novamente.</string>
+
+    <string name="choose_locale_current_locale_title">Idioma atual</string>
+    <string name="choose_locale_other_locales_title">Outros idiomas disponíveis</string>
+    <string name="choose_locale_loading_locales">Carregando os idiomas disponíveis…</string>
+
+    <string name="open_terms_of">Abra termos de %s</string>
+    <string name="disconnect_identity_server_dialog_content">Desconectar do servidor de identidade %s\?</string>
+    <string name="identity_server_error_outdated_identity_server">Este servidor de identidade está desatualizado. Element suporta apenas API V2.</string>
+    <string name="identity_server_error_outdated_home_server">Esta operação não é possível. O servidor doméstico está desatualizado.</string>
+    <string name="identity_server_error_no_identity_server_configured">Por favor, primeiro configure um servidor de identidade.</string>
+    <string name="identity_server_error_terms_not_signed">Por favor, primeiro aceite os termos do servidor de identidade nas configurações.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Pela sua privacidade, Element apenas suporta o envio dos e-mails e números de telefone de usuários em hash.</string>
+    <string name="identity_server_error_binding_error">A associação falhou.</string>
+    <string name="identity_server_error_no_current_binding_error">Não há nenhuma associação atual com este identificador.</string>
+
+    <string name="identity_server_set_default_notice">Seu servidor doméstico (%1$s) propõe o uso de %2$s para seu servidor de identidade</string>
+    <string name="identity_server_set_default_submit">Use %1$s</string>
+    <string name="identity_server_set_alternative_notice">Como alternativa, você pode digitar o endereço de outro servidor de identidade</string>
+    <string name="identity_server_set_alternative_notice_no_default">Digite o endereço de um servidor de identidade</string>
+    <string name="identity_server_set_alternative_submit">Submeter</string>
+    <string name="power_level_edit_title">Definir o papel</string>
+    <string name="power_level_title">Papel</string>
+    <string name="a11y_open_chat">Bate-papo aberto</string>
+    <string name="a11y_mute_microphone">Silenciar o microfone</string>
+    <string name="a11y_unmute_microphone">Ativar o microfone</string>
+    <string name="a11y_stop_camera">Desligue a câmera</string>
+    <string name="a11y_start_camera">Ativar a câmera</string>
+
+    <string name="settings_setup_secure_backup">Configure um Backup Seguro</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">Backup Seguro</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Previna-se contra perda de acesso a mensagens e dados criptografados, fazendo backup das chaves de encriptação no seu servidor.</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Configure</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Use uma Chave de Segurança</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Gere uma chave de segurança para armazenar num local seguro, como um gerenciador de senhas ou um cofre.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Use uma Frase de Segurança</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Digite uma frase secreta que só você conhece, e gere uma chave para backup.</string>
+
+    <string name="bottom_sheet_save_your_recovery_key_title">Salve sua Chave de Segurança</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Armazene sua Chave de Segurança num local seguro, como um gerenciador de senhas ou um cofre.</string>
+
+    <string name="set_a_security_phrase_title">Defina uma Frase de Segurança</string>
+    <string name="set_a_security_phrase_notice">Digite uma frase de segurança que só você conheça, usada para proteger os segredos no seu servidor.</string>
+    <string name="set_a_security_phrase_hint">Frase de Segurança</string>
+    <string name="set_a_security_phrase_again_notice">Digite sua Frase de Segurança novamente para confirmá-la.</string>
+
+    <string name="save_your_security_key_title">Salve sua Chave de Segurança</string>
+    <string name="save_your_security_key_notice">Armazene sua Chave de Segurança num local seguro, como um gerenciador de senhas ou um cofre.</string>
+
+    <string name="room_settings_name_hint">Nome da sala</string>
+    <string name="room_settings_topic_hint">Descrição</string>
+    <string name="room_settings_save_success">Você alterou as configurações da sala com êxito</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">Você não pode acessar esta mensagem</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Aguardando esta mensagem. Pode demorar um pouco</string>
+    <string name="crypto_utd">Não é possível decifrar</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Devido à criptografia de ponta a ponta, pode ser necessário aguardar que as chaves de criptografia de alguém cheguem, para ler as mensagens enviadas para você.</string>
+    <string name="crypto_error_withheld_blacklisted">Você não pode acessar esta mensagem porque você foi bloqueado pelo remetente</string>
+    <string name="crypto_error_withheld_unverified">Você não pode acessar esta mensagem porque a sessão não foi definida como confiável pelo remetente</string>
+    <string name="crypto_error_withheld_generic">Você não pode acessar esta mensagem porque o remetente intencionalmente não enviou as chaves</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Aguardando o histórico de criptografia</string>
+
+    <string name="element_disclaimer_title">Riot agora é Element!</string>
+    <string name="element_disclaimer_content">Estamos felizes em anunciar que mudamos de nome! Seu aplicativo está atualizado e você está conectado à sua conta.</string>
+    <string name="element_disclaimer_negative_button">OK, ENTENDI</string>
+    <string name="element_disclaimer_positive_button">APRENDA MAIS</string>
+
+    <string name="element_login_splash_brand">Element</string>
+
+
+    <string name="save_recovery_key_chooser_hint">Salvar chave de recuperação em</string>
+
+    <string name="add_from_phone_book">Adicionar da minha lista de contatos</string>
+    <string name="empty_phone_book">Sua lista de contatos está vazia</string>
+    <string name="phone_book_title">Lista de Contatos</string>
+    <string name="search_in_my_contacts">Procure em meus contatos</string>
+    <string name="loading_contact_book">Extraindo seus contatos…</string>
+    <string name="empty_contact_book">Sua lista de contatos está vazia</string>
+    <string name="contacts_book_title">Lista de contatos</string>
+
+    <string name="three_pid_revoke_invite_dialog_title">Revogar o convite</string>
+    <string name="three_pid_revoke_invite_dialog_content">Revogar o convite para %1$s\?</string>
+
+    <string name="member_banned_by">Banido por %1$s</string>
+    <string name="failed_to_unban">Não foi possível remover o banimento do usuário</string>
+
+    <string name="alert_push_are_disabled_title">As notificações Push estão desativadas</string>
+    <string name="alert_push_are_disabled_description">Revise suas configurações para permitir notificações Push</string>
+    <string name="create_pin_title">Escolha um PIN de segurança</string>
+    <string name="create_pin_confirm_title">Confirme PIN</string>
+    <string name="create_pin_confirm_failure">Falha na validação do PIN, por favor, digite um novo.</string>
+    <string name="auth_pin_title">Digite seu PIN</string>
+    <string name="auth_pin_forgot">Esqueceu o PIN\?</string>
+    <string name="auth_pin_reset_title">Redefinir o PIN</string>
+    <string name="auth_pin_new_pin_action">Novo PIN</string>
+    <string name="auth_pin_reset_content">Para redefinir seu PIN, você precisará fazer um novo login e em seguida criar um novo PIN.</string>
+    <string name="settings_security_pin_code_title">Ativar o PIN</string>
+    <string name="settings_security_pin_code_summary">Se você quiser redefinir seu PIN, toque no Esqueci o PIN para sair e redefinir-lo.</string>
+    <string name="auth_pin_confirm_to_disable_title">Confirme o PIN para desativar o PIN</string>
+    <string name="settings_call_show_confirmation_dialog_title">Evitar chamadas acidentais</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Confirmarei a intenção de iniciar uma chamada</string>
 </resources>
diff --git a/vector/src/main/res/values-pt/strings.xml b/vector/src/main/res/values-pt/strings.xml
old mode 100755
new mode 100644
index 8508330d5b..ca5d93e702
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/vector/src/main/res/values-pt/strings.xml
@@ -195,9 +195,6 @@ A sessão foi terminada em todos os dispositivos e não receberá mais notifica
     <string name="login_error_login_email_not_yet">O link no email ainda não foi clicado</string>
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">Necessita iniciar sessão novamente para gerar as chaves de cifragem ponta-a-ponta para este dispositivo e submeter a chave pública para o seu servidor.
-Só terá que fazer isto uma vez.
-Pedimos desculpa pela inconveniência.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Ler lista de recibos de leitura</string>
@@ -659,10 +656,6 @@ Atenção: este ficheiro poderá ser apagado se a aplicação for desinstalada.<
     <string name="encryption_information_verify_device_warning2">Se é igual, clique no botão verificar, abaixo. Se não é igual, então alguém está a interceptar este dispositivo e você poderá querer colocá-lo na lista negra. No futuro, este processo de verificação irá ser mais sofisticado.</string>
     <string name="encryption_information_verify_key_match">Eu confirmo que as chaves são iguais</string>
 
-    <string name="e2e_enabling_on_app_update">O Element agora permite criptografia ponta-a-ponta mas necessita de iniciar sessão novamente para ativá-la.
-
-Pode fazê-lo agora ou mais tarde a partir das definições da aplicação.</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">A sala contém dispositivos desconhecidos</string>
     <string name="unknown_devices_alert_message">Esta sala contém dispositivos desconhecidos que não foram verificados.
@@ -715,8 +708,6 @@ Dispositivos desconhecidos:</string>
     <string name="dark_theme">Tema Escuro</string>
     <string name="black_them">Tema Preto</string>
 
-    <string name="login_mobile_device">Dispositivo Móvel</string>
-
     <string name="settings_notification_ringtone">Som de notificação</string>
     <string name="settings_12_24_timestamps">Utilizar formato de 12 horas (ex. 2:30pm)</string>
 
@@ -1105,7 +1096,7 @@ A visibilidade das mensagens no Matrix é parecida com a dos emails. O nosso esq
     <string name="auth_accept_policies">Por favor veja e aceite, apolice para este servidor</string>
 
     <string name="settings_call_category">Chamadas</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Usar toque padrão para chamadas recebidas</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Usar toque padrão para chamadas recebidas</string>
     <string name="settings_call_ringtone_title">Toque para chamadas recebidas</string>
     <string name="settings_call_ringtone_dialog_title">Selecione toque para chamadas:</string>
 
@@ -1171,4 +1162,5 @@ Por favor, verifique configurações de aplicação</string>
     <string name="settings_system_preferences_summary">Escolha cor de LED, vibração, som…</string>
 
 
+    <string name="notification_sync_init">Inicializando serviço</string>
 </resources>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 82f2accfda..72291bdb04 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -37,7 +37,7 @@
     <string name="ongoing_conference_call_voice">Голос</string>
     <string name="ongoing_conference_call_video">Видео</string>
     <string name="cannot_start_call">Не удалось осуществить вызов, попробуйте позже</string>
-    <string name="missing_permissions_warning">"Из-за отсутствия разрешений некоторые функции могут быть недоступны..</string>
+    <string name="missing_permissions_warning">Из-за отсутствия разрешений некоторые функции могут быть недоступны…</string>
     <string name="missing_permissions_to_start_conf_call">Вам нужно разрешение на приглашение для начала конференции в этой комнате</string>
     <string name="missing_permissions_title_to_start_conf_call">Не удалось осуществить вызов</string>
     <string name="device_information">Информация о сессии</string>
@@ -196,7 +196,6 @@
     <string name="login_error_login_email_not_yet">Вы не перешли по высланной в email ссылке</string>
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">Вам нужно войти в систему, чтобы сгенерировать ключи шифрования для этой сессии и отправлять публичный ключ вашему серверу. Это необходимо только один раз; извините за неудобства.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Чтение списка вступивших</string>
@@ -245,7 +244,9 @@
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Element Информация</string>
-    <string name="permissions_rationale_msg_storage">Element необходимы разрешения на доступ к вашим фото и видео для сохранения и отправки сложений.\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность отправлять файлы.</string>
+    <string name="permissions_rationale_msg_storage">Element нуждается в разрешении на доступ к вашей фото-и видеотеке для отправки и сохранения вложений.
+\n
+\nПожалуйста, разрешите доступ в следующем всплывающем окне, чтобы иметь возможность отправлять файлы с вашего устройства.</string>
     <string name="permissions_rationale_msg_camera">Element необходимы разрешения на доступ к вашей камере, чтобы делать фото и совершать видеозвонки.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность совершать звонки.</string>
     <string name="permissions_rationale_msg_record_audio">Element необходимы разрешения на доступ к микрофону, чтобы выполнять звонки.</string>
@@ -416,7 +417,7 @@
     <string name="room_sliding_menu_version">Версия</string>
     <string name="room_sliding_menu_term_and_conditions">Правила и условия</string>
     <string name="room_sliding_menu_third_party_notices">Прочие уведомления</string>
-    <string name="room_sliding_menu_copyright">Copyright</string>
+    <string name="room_sliding_menu_copyright">Авторские права</string>
     <string name="room_sliding_menu_privacy_policy">Политика конфиденциальности</string>
 
     <!-- Vector Settings -->
@@ -451,7 +452,7 @@
     <string name="settings_olm_version">Версия OLM</string>
     <string name="settings_app_term_conditions">Правила и условия</string>
     <string name="settings_third_party_notices">Прочие уведомления</string>
-    <string name="settings_copyright">Copyright</string>
+    <string name="settings_copyright">Авторские права</string>
     <string name="settings_privacy_policy">Политика конфиденциальности</string>
     <string name="settings_clear_cache">Очистить весь кэш</string>
     <!--string name="settings_room_privacy_label">Privacy</string-->
@@ -463,7 +464,7 @@
     <string name="settings_other">Другое</string>
     <string name="settings_advanced">Дополнительно</string>
     <string name="settings_cryptography">Криптография</string>
-    <string name="settings_notifications_targets">Отправлять уведомления на</string>
+    <string name="settings_notifications_targets">Устройства для уведомлений</string>
     <string name="settings_contact">Локальные контакты</string>
     <string name="settings_contacts_app_permission">Доступ к контактам</string>
     <string name="settings_contacts_phonebook_country">Страна для контактов</string>
@@ -611,7 +612,7 @@
     <string name="encryption_information_device_name">Публичное имя</string>
     <string name="encryption_information_name">Публичное имя</string>
     <string name="encryption_information_device_id">ID</string>
-    <string name="encryption_information_device_key">Ключ сеанса</string>
+    <string name="encryption_information_device_key">Ключ сессии</string>
     <string name="encryption_information_verification">Проверка</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 отпечаток</string>
 
@@ -649,10 +650,6 @@
     <string name="encryption_information_verify_device_warning2">"Если совпадает, то нажмите кнопку подтвердить ниже. Если не совпадает, возможно кто-то пытается перехватить сессию и  вы захотите добавить его в черный список. В будущем данный процесс будет улучшен."</string>
     <string name="encryption_information_verify_key_match">Я проверил, что ключи совпадают</string>
 
-    <string name="e2e_enabling_on_app_update">Element теперь поддерживает сквозное шифрование, но вам нужно снова войти в систему, чтобы включить его.
-
-Вы можете сделать это сейчас или позже из настроек приложения.</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Комната содержит неизвестные сессии</string>
     <string name="unknown_devices_alert_message">Эта комната содержит неизвестные сессии, которые не были подтверждены. 
@@ -724,7 +721,6 @@
     <string name="widget_integration_missing_user_id">В запросе отсутствует user_id.</string>
     <string name="widget_integration_room_not_visible">Комната %s невидима.</string>
     <string name="room_add_matrix_apps">Добавить приложения Matrix</string>
-    <string name="login_mobile_device">Мобильный</string>
 
     <string name="notification_sync_in_progress">Синхронизация…</string>
     <string name="notification_listening_for_events">Мониторинг событий</string>
@@ -783,7 +779,7 @@
 
     <string name="groups_list">Список групп</string>
 
-    <string name="room_participants_ban_prompt_msg">Вы уверены, что хотите забанить этого пользователя в этом чате?</string>
+    <string name="room_participants_ban_prompt_msg">Блокирующий пользователь выгонит их из этой комнаты и не позволит им снова присоединиться.</string>
 
     <string name="room_settings_all_messages_noisy">Все сообщения (громко)</string>
     <string name="room_settings_all_messages">Все сообщения</string>
@@ -1086,7 +1082,7 @@
     <string name="auth_accept_policies">Пожалуйста ознакомьтесь и подтвердите согласие с политикой этого сервера:</string>
 
     <string name="settings_call_category">Вызовы</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Использовать стандартную мелодию Element для входящих звонков</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Использовать стандартную мелодию Element для входящих звонков</string>
     <string name="settings_call_ringtone_title">Мелодия звонка</string>
     <string name="settings_call_ringtone_dialog_title">Выберите мелодию звонка:</string>
 
@@ -1116,9 +1112,6 @@
     <string name="show_info_area_messages_and_errors">Для сообщений и ошибок</string>
     <string name="show_info_area_only_errors">Только для ошибок</string>
 
-    <string name="store_whats_new">"Мы постоянно изменяем и улучшаем Element.
-Полный список изменений можно найти здесь: %1$s.
-Чтобы ничего не пропустить просто держите обновления включенными."</string>
     <string name="accept">Принимаю</string>
 
     <string name="settings_troubleshoot_diagnostic">Результаты диагностики</string>
@@ -1201,7 +1194,6 @@
     <string name="settings_show_avatar_display_name_changes_messages_summary">Включает изменения аватара и отображаемого имени.</string>
     <string name="startup_notification_fdroid_battery_optim_message">Необходимо минимизировать влияние на фоновое соединение для надёжности уведомлений.
 На следующем экране вам будет предложено разрешить Райоту всегда работать в фоновом режиме, пожалуйста, примите.</string>
-    <string name="encryption_import_room_keys_success">%1$d/%2$d ключ(и) успешно импортированы.</string>
 
     <string name="settings_labs_native_camera_summary">Использовать системную камеру вместо камеры Райот.</string>
     <string name="settings_info_area_show">Показать информацию</string>
@@ -1211,24 +1203,7 @@
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Не найден APK сервисов Google Play. Уведомления могут работать неправильно.</string>
 
-    <string name="store_title">Element — общайся по-своему</string>
-    <string name="store_short_description">Универсальное приложение для безопасного общения, полностью находящееся под вашим контролем.</string>
     <string name="settings_show_join_leave_messages_summary">Не влияет на приглашения, исключения и запреты.</string>
-    <string name="store_full_description">Приложение для чата, под вашим контролем и полностью гибкое. Element позволяет вам общаться так, как вы хотите. Сделано для [matrix] — стандарта для открытого децентрализованного общения.
-\n
-\nВы можете создать бесплатную учетную запись на matrix.org, завести собственный сервер по адресу https://modular.im или использовать другой сервер Matrix.
-\n
-\nПочему стоит выбрать Element\?
-\n
-\n• ПОЛНОЦЕННАЯ СВЯЗЬ: создавайте комнаты для команд, друзей, сообществ — как хотите! Общайтесь, обменивайтесь файлами, добавляйте виджеты и совершайте голосовые и видеозвонки — и всё это бесплатно.
-\n
-\n• МОЩНЫЕ ИНТЕГРАЦИИ: Используйте Element с инструментами, которые знаете и любите. С Element вы можете даже общаться с пользователями и группами других приложений.
-\n
-\n• ЧАСТНЫЕ И БЕЗОПАСНЫЕ: держите ваши разговоры в тайне. Современное сквозное шифрование гарантирует, что частное общение остается частным.
-\n
-\n• ОТКРЫТО, НЕ ЗАКРЫТО: Открытый исходный код, построено на Matrix. Владейте данными, используя собственный сервер или выбирайте тот, которому доверяете.
-\n
-\n• ГДЕ БЫ ВЫ НИ БЫЛИ: оставайтесь на связи где угодно, с полностью синхронизированной историей сообщений на всех ваших устройствах и в Интернете по адресу https://riot.im.</string>
 
     <string name="title_activity_keys_backup_setup">Резервное копирование ключей</string>
     <string name="title_activity_keys_backup_restore">Используйте резервную копию ключа</string>
@@ -1238,7 +1213,6 @@
     <string name="done">Готово</string>
 
     <string name="settings_notification_advanced">Расширенные настройки уведомлений</string>
-    <string name="settings_notification_advanced_summary">Установка важности уведомления по событию, Настроить звук, светодиод, вибрацию</string>
     <string name="settings_notification_by_event">Значение уведомления по событию</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Пользовательские настройки.</string>
@@ -1285,7 +1259,7 @@
     <string name="keys_backup_settings_delete_backup_error">Не удалось удалить резервную копию (%s)</string>
 
     <string name="keys_backup_settings_deleting_backup">Удаление резервной копии…</string>
-    <string name="keys_backup_settings_untrusted_backup">Для Восстановления Сообщений в этой сессии, требуется пароль или ключ восстановления.</string>
+    <string name="keys_backup_settings_untrusted_backup">Чтобы использовать резервную копию ключа в этой сессии, восстановите его с помощью своей парольной фразы или ключа восстановления.</string>
     <string name="keys_backup_settings_invalid_signature_from_verified_device">Резервная копия имеет недействительную подпись из подтвержденной сессии %s</string>
     <string name="keys_backup_settings_valid_signature_from_unverified_device">"Резервная копия имеет  действительную подпись из неподтвержденной сессии %s"</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">Резервная копия имеет действительно подпись из подтверждённой сессии %s.</string>
@@ -1299,7 +1273,7 @@
     <string name="keys_backup_settings_delete_backup_button">Удалить резервную копию</string>
 
     <string name="keys_backup_settings_restore_backup_button">Восстановить из резервной копии</string>
-    <string name="keys_backup_no_keysbackup_sdk_error">Сеанс шифрования не активирован</string>
+    <string name="keys_backup_no_keysbackup_sdk_error">Сессионное шифрование не активировано</string>
 
 
     <string name="keys_backup_recovery_code_empty_error_message">Пожалуйста, введите ключ восстановления</string>
@@ -1337,7 +1311,6 @@
         <item quantity="few">Восстановлены резервные копии с %d ключами.</item>
         <item quantity="many">Восстановлены резервные копии с %d ключами.</item>
     </plurals>
-    <string name="keys_backup_restore_success_description">Восстановлены %1$d сессионные ключи и добавлены %2$d новые ключи, которые не были известны этой сессии</string>
     <string name="keys_backup_recovery_code_error_decrypt">Невозможно расшифровать резервную копию с помощью этого ключа восстановления: убедитесь, что вы ввели правильный ключ.</string>
 
     <string name="keys_backup_passphrase_error_decrypt">Невозможно расшифровать резервную копию с помощью данного пароля: убедитесь, что вы ввели верный пароль.</string>
@@ -1404,9 +1377,9 @@
     <string name="keys_backup_banner_update_line2">Управление резервным копированием ключей</string>
 
     <string name="keys_backup_banner_update_line1">Новые ключи зашифрованных сообщений</string>
-    <string name="new_recovery_method_popup_description">Обнаружена новая резервная копия ключа безопасных сообщений.
-
-Если вы не настраивали новый метод восстановления, злоумышленник может пытаться получить доступ к вашей учетной записи. Измените пароль учетной записи и сразу же установите новый способ восстановления в настройках.</string>
+    <string name="new_recovery_method_popup_description">Обнаружена новая резервная копия ключа безопасных сообщений. 
+\n
+\nЕсли вы не настраивали новый метод восстановления, злоумышленник может пытаться получить доступ к вашей учетной записи. Измените пароль учетной записи и сразу же установите новый способ восстановления в настройках.</string>
     <string name="keys_backup_setup_step3_text_line1">Ваши ключи копируются.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Дополнительно) Настройка с ключом восстановления</string>
     <string name="settings_data_save_mode_summary">В режиме экономии траффика применяется специальный фильтр, поэтому обновление присутствия и уведомления о наборе отфильтровываются.</string>
@@ -1416,7 +1389,7 @@
     <string name="keys_backup_setup_step2_text_description">Зашифрованная копия ключей будет храниться на вашем сервере. Для безопасности защитите её парольной фразой.
 \n
 \nДля максимальной безопасности парольная фраза должна отличаться от пароля вашей учётной записи.</string>
-    <string name="keys_backup_setup_step3_text_line2">Ключ восстановления — это страховка, вы можете использовать его для восстановления доступа к вашим зашифрованным сообщениям, если забудете пароль. Храните ключ восстановления в надёжном месте, например, в диспетчере паролей (или в сейфе)</string>
+    <string name="keys_backup_setup_step3_text_line2">Ключ восстановления — это страховка, вы можете использовать его для восстановления доступа к вашим зашифрованным сообщениям, если забудете вашу парольную фразу. Храните ключ восстановления в надёжном месте, например, в диспетчере паролей (или в сейфе)</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Импортирование ключей…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Скачивание ключей…</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Вычисление ключа восстановления…</string>
@@ -1567,7 +1540,7 @@
 
     <string name="event_redacted_by_user_reason">Событие удалено пользователем</string>
     <string name="event_redacted_by_admin_reason">Мероприятие, модерируемое администратором помещения</string>
-    <string name="last_edited_info_message">Последний раз редактировалось %1$s на %2$s</string>
+    <string name="last_edited_info_message">Последнее изменение %1$s %2$s</string>
 
 
     <string name="malformed_message">Некорректное событие, не может быть отображено</string>
@@ -1593,12 +1566,6 @@
     <string name="keys_backup_unable_to_get_trust_info">Произошла ошибка при получении информации о доверии</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Произошла ошибка при получении ключей резервного копирования данных</string>
 
-    <string name="alpha_disclaimer_title">Добро пожаловать в бету!</string>
-    <string name="alpha_disclaimer_content_line_1">Пока Element находится в ранней стадии разработки, некоторые функции могут отсутствовать и вы можете столкнуться с ошибками.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">Последний список функций всегда находится в %1$s, и если вы найдете ошибку, пожалуйста, отправьте отчет в верхнее левое меню Home, и мы исправим их так быстро, как только сможем.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Описание магазина</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Если вы обнаружите ошибку, пожалуйста, отправьте сообщение в верхнее левое меню Home, и мы исправим ее так быстро, как только сможем.</string>
-
     <string name="import_e2e_keys_from_file">Импорт ключей e2e из файла \"%1$s\".</string>
 
     <string name="settings_sdk_version">Версия Matrix SDK</string>
@@ -1609,9 +1576,9 @@
 
     <string name="settings_general_title">Общее</string>
     <string name="settings_preferences">Параметры</string>
-    <string name="settings_security_and_privacy">Безопасность &amp; Конфиденциальность</string>
+    <string name="settings_security_and_privacy">Безопасность и конфиденциальность</string>
     <string name="settings_expert">Профессионал</string>
-    <string name="settings_push_rules">Пуш-Правила</string>
+    <string name="settings_push_rules">Правила push-уведомлений</string>
     <string name="push_gateway_item_app_id">app_id:</string>
     <string name="push_gateway_item_push_key">push_key:</string>
     <string name="push_gateway_item_app_display_name">app_display_name:</string>
@@ -1619,7 +1586,7 @@
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Формат:</string>
 
-    <string name="preference_voice_and_video">Голос &amp; Видио</string>
+    <string name="preference_voice_and_video">Голос и видео</string>
     <string name="preference_root_help_about">Помощь и информация</string>
 
 
@@ -1633,16 +1600,6 @@
 
     <string name="settings_labs_show_hidden_events_in_timeline">Показать скрытые события в ленте сообщений</string>
 
-    <string name="store_riotx_title">Element - Matrix клиент следующего поколения</string>
-    <string name="store_riotx_short_description">Быстрый и легкий клиент для Matrix с новейшими фреймворками Android</string>
-    <string name="store_riotx_full_description">Element - это новый клиент для протокола Matrix (Matrix.org): открытой сети для безопасного децентрализованного общения. Element - это переписанный с нуля клиент Riot для Android, основанный на полностью переписанном Matrix Android SDK.
-\n 
-\nПредупреждение: это бета-версия. В настоящее время Element находится в активной разработке и содержит ограничения и ошибки (надеемся, не слишком много). Мы будем рады любым отзывам!
-\n 
-\nElement поддерживает: • Вход в существующую учетную запись • Создание и вход в публичные комнаты • Принятие и отклонение приглашений • Просмотр списка комнат • Просмотр сведений о комнате • Отправку текстовых сообщений • Отправку файлов • Чтение и отправку сообщений в зашифрованных комнатах • Криптографию: резервное копирование ключей E2E, улучшенную проверку устройств, запрос и ответ на запрос ключей • Пуш-уведомления • Светлые, тёмные и черные темы
-\n 
-\nНе все функции Element пока реализованы в Element. Основные отсутствующие возможности (скоро появятся!): • Настройки комнаты (список участников и т.п.) • Звонки • Виджеты • …</string>
-
     <string name="room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в Element пока не поддерживается</string>
 
     <string name="bottom_action_people_x">Диалоги</string>
@@ -1656,14 +1613,11 @@
     <string name="downloading_file">Файл %1$s загружается…</string>
     <string name="downloaded_file">Файл %1$s был загружен!</string>
 
-    <string name="edited_suffix">(отредактированный)</string>
-
-    <string name="riotx_no_registration_notice">%1$s для создания учетной записи.</string>
-    <string name="riotx_no_registration_notice_colored_part">Используйте старое приложение</string>
+    <string name="edited_suffix">(изменено)</string>
 
 
     <string name="message_edits">Редактирование сообщений</string>
-    <string name="no_message_edits_found">Редактирование не найдено</string>
+    <string name="no_message_edits_found">Изменения не найдены</string>
 
     <string name="room_filtering_filter_hint">Отфильтровывать разговоры…</string>
     <string name="room_filtering_footer_title">Не можете найти то, что ищете\?</string>
@@ -1685,20 +1639,15 @@
 
     <string name="joining_room">Присоединение к комнате…</string>
 
-    <string name="message_view_edit_history">Просмотреть историю изменений</string>
+    <string name="message_view_edit_history">История изменений</string>
 
     <string name="review">Обзор</string>
     <string name="decline">Отклонить</string>
 
     <string name="widget_integration_review_terms">Для продолжения Вам необходимо принять Условия данного сервиса.</string>
 
-    <string name="security_warning_identity_server">В предыдущих версиях Element была ошибка безопасности, которая могла дать вашему серверу идентификации (%1$s) доступ к вашей учетной записи. Если вы доверяете %2$s, вы можете проигнорировать это; в противном случае, пожалуйста, выйдите из системы и войдите снова.
-\n
-\nПодробнее об этом читайте здесь:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
-    <string name="settings_push_rules_no_rules">Пуш-правила не определены</string>
-    <string name="settings_push_gateway_no_pushers">Нет зарегистрированных пуш-шлюзов</string>
+    <string name="settings_push_rules_no_rules">Правила push-уведомлений не определены</string>
+    <string name="settings_push_gateway_no_pushers">Нет зарегистрированных push-шлюзов</string>
 
     <string name="terms_of_service">Условия предоставления услуг</string>
     <string name="review_terms">Условия просмотра</string>
@@ -1717,7 +1666,7 @@
 \n
 \nКроме того, вы можете попробовать использовать публичный сервер по %2$s, но это будет не так надежно, и он предоставит ваш IP-адрес этому серверу. Вы также можете управлять этим в настройках.</string>
     <string name="call_failed_no_ice_use_alt">Попробуйте использовать %s</string>
-    <string name="call_failed_dont_ask_again">Не спрашивай меня больше</string>
+    <string name="call_failed_dont_ask_again">Больше не спрашивать</string>
 
     <string name="auth_add_email_message_2">Установите адрес электронной почты для восстановления учетной записи, и позже она может будет найдена участниками, которые вас знают.</string>
     <string name="auth_add_phone_message_2">Установите телефон, и позже его могут опционально обнаруживать люди, которые вас знают.</string>
@@ -1856,7 +1805,7 @@
 
     <string name="timeline_unread_messages">Непрочитанные сообщения</string>
 
-    <string name="login_splash_title">Освободите своё общение</string>
+    <string name="login_splash_title">Это ваш разговор. Владейте им.</string>
     <string name="login_splash_text1">Общайтесь с людьми напрямую или в группах</string>
     <string name="login_splash_submit">Начать</string>
 
@@ -1878,7 +1827,7 @@
     <string name="login_server_url_form_modular_hint">Модульный адрес</string>
     <string name="login_server_url_form_other_hint">Адрес</string>
     <string name="login_server_url_form_modular_text">Премиум-хостинг для организаций</string>
-    <string name="login_server_url_form_modular_notice">Введите адрес Modular Element или сервера, который вы хотите использовать.</string>
+    <string name="login_server_url_form_modular_notice">Введите адрес Modular Element или сервера, который вы хотите использовать</string>
     <string name="login_sso_error_message">Произошла ошибка при загрузке страницы: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Приложение не может войти на этот сервер, так как он поддерживает следующие типы входа: %1$s.
 \nВы хотите войти с помощью веб-клиента\?</string>
@@ -1895,7 +1844,7 @@
     <string name="login_reset_password_password_hint">Новый пароль</string>
 
     <string name="login_reset_password_warning_title">Внимание!</string>
-    <string name="login_reset_password_warning_content">Смена пароля приведёт к сбросу всех сквозных ключей шифрования во всех ваших сеансах, что сделает зашифрованную историю разговоров нечитаемой. Настройте резервное копирование ключей или экспортируйте ключи от комнаты из другого сеанса, прежде чем сбрасывать пароль.</string>
+    <string name="login_reset_password_warning_content">Смена пароля приведёт к сбросу всех сквозных ключей шифрования во всех ваших сессиях, что сделает зашифрованную историю разговоров нечитаемой. Настройте резервное копирование ключей или экспортируйте ключи от комнаты из другой сессии, прежде чем сбрасывать пароль.</string>
     <string name="login_reset_password_warning_submit">Продолжить</string>
 
     <string name="login_reset_password_error_not_found">Данный email не связан ни с одним аккаунтом</string>
@@ -1905,7 +1854,7 @@
     <string name="login_reset_password_mail_confirmation_notice_2">Нажмите на ссылку, чтобы подтвердить свой новый пароль. Как только вы перейдете по ссылке, которую он содержит, нажмите ниже.</string>
     <string name="login_reset_password_success_title">Успешно!</string>
     <string name="login_reset_password_success_notice">Ваш пароль был сброшен.</string>
-    <string name="login_reset_password_success_notice_2">Вы вышли из всех сеансов и больше не будете получать push-уведомления. Чтобы возобновить уведомления, войдите снова на каждом устройстве.</string>
+    <string name="login_reset_password_success_notice_2">Вы вышли из всех сессий и больше не будете получать push-уведомления. Чтобы возобновить уведомления, войдите снова на каждом устройстве.</string>
     <string name="login_reset_password_success_submit">Назад, чтобы войти в систему</string>
 
     <string name="login_reset_password_cancel_confirmation_title">Предупреждение</string>
@@ -1996,13 +1945,13 @@
     <string name="permalink_malformed">Ваша ссылка на matrix.to неверна</string>
     <string name="bug_report_error_too_short">Описание слишком короткое</string>
 
-    <string name="settings_show_devices_list">Посмотреть все мои сеансы</string>
+    <string name="settings_show_devices_list">Посмотреть все мои сессии</string>
     <string name="settings_advanced_settings">Дополнительные настройки</string>
     <string name="settings_developer_mode">Режим разработчика</string>
     <string name="settings_developer_mode_summary">Режим разработчика активирует скрытые функции, а также может сделать приложение менее стабильным. Только для разработчиков!</string>
     <string name="settings">Настройки</string>
-    <string name="devices_current_device">Текущий сеанс</string>
-    <string name="devices_other_devices">Другие сеансы</string>
+    <string name="devices_current_device">Текущая сессия</string>
+    <string name="devices_other_devices">Другие сессии</string>
 
     <string name="create_room_encryption_title">Включено шифрование</string>
     <string name="verification_conclusion_warning">Недоверенный вход</string>
@@ -2040,7 +1989,7 @@
     <string name="a11y_qr_code_for_verification">QR-код</string>
 
     <string name="no_connectivity_to_the_server_indicator">Соединение с сервером потеряно</string>
-    <string name="verification_cannot_access_other_session">Используйте парольную фразу или ключ для восстановления</string>
+    <string name="verification_cannot_access_other_session">Используйте пароль восстановления или ключ</string>
     <string name="e2e_use_keybackup">Разблокировать историю зашифрованных сообщений</string>
 
     <string name="verify_cancelled_notice">Проверьте свои устройства в разделе Настройки.</string>
@@ -2063,7 +2012,7 @@
     <string name="security_prompt_text">Проверьте себя и других для защиты ваших бесед</string>
 
     <string name="backup_recovery_passphrase">Парольная фраза для восстановления</string>
-    <string name="crosssigning_verify_session">Проверка входа</string>
+    <string name="crosssigning_verify_session">Подтвердите вход</string>
     <string name="confirm_your_identity">Подтвердите свою личность и получите доступ к зашифрованным сообщениям, подтвердив этот вход в другой сессии.</string>
     <string name="settings_category_timeline">Лента сообщений</string>
 
@@ -2072,8 +2021,8 @@
 
     <string name="bootstrap_crosssigning_print_it">Распечатайте его и храните в безопасном месте</string>
     <string name="bootstrap_skip_text">Установка парольной фразы для восстановления позволяет защитить и разблокировать зашифрованные сообщения и доверие.
-\n
-\nЕсли вы не хотите задавать пароль для сообщений, сгенерируйте вместо этого ключ сообщений.</string>
+\n 
+\nЕсли вы не хотите устанавливать пароль сообщения, создайте вместо него ключ сообщения.</string>
     <string name="bootstrap_skip_text_no_gen_key">Установка парольной фразы для восстановления позволяет защитить и разблокировать зашифрованные сообщения и доверие.</string>
 
 
@@ -2098,7 +2047,6 @@
 
     <string name="command_description_discard_session_not_handled">Поддерживается только в зашифрованных комнатах</string>
     <string name="a11y_create_direct_message">Создать новый диалог</string>
-    <string name="two_and_some_others_read">%1$s, %2$s и %3$d других прочли</string>
     <string name="three_users_read">%1$s, %2$s и %3$s прочли</string>
     <string name="two_users_read">%1$s и %2$s прочли</string>
     <string name="error_file_too_big">Файл \'%1$s\' (%2$s) слишком большой. Максимальный размер для загрузки %3$s.</string>
@@ -2130,4 +2078,590 @@
 
     <string name="no_network_indicator">Нет подключения к сети</string>
 
+    <string name="play_video">Воспроизвести</string>
+    <string name="pause_video">Приостановить</string>
+    <string name="action_copy">Копировать</string>
+    <string name="dialog_title_success">Выполнено</string>
+
+    <string name="bottom_action_notification">Уведомления</string>
+    <string name="call_failed_no_connection">Звонок не состоялся</string>
+    <string name="call_failed_no_connection_description">Не удалось установить соединение реального времени.
+\nПопросите администратора вашего сервера настроить сервер TURN, чтобы звонки работали надёжно.</string>
+
+    <string name="call_select_sound_device">Выберите звуковое устройство</string>
+    <string name="sound_device_phone">Телефон</string>
+    <string name="sound_device_speaker">Динамик</string>
+    <string name="sound_device_headset">Гарнитура</string>
+    <string name="sound_device_wireless_headset">Беспроводная гарнитура</string>
+    <string name="call_switch_camera">Переключить камеру</string>
+    <string name="call_camera_front">Передняя</string>
+    <string name="call_camera_back">Задняя</string>
+    <string name="call_format_turn_hd_off">Выключить HD</string>
+    <string name="call_format_turn_hd_on">Включить HD</string>
+
+    <string name="login_error_ssl_peer_unverified">Ошибка SSL: не удалось идентифицировать другого абонента.</string>
+    <string name="login_error_ssl_other">Ошибка SSL.</string>
+    <string name="active_call_with_duration">Активный звонок (%s)</string>
+    <string name="return_to_call">Вернуться к звонку</string>
+
+    <string name="room_participants_action_cancel_invite">Отменить приглашение</string>
+    <string name="room_participants_power_level_demote_warning_title">Снизить собственные полномочия\?</string>
+    <string name="dismiss">Отклонить</string>
+
+
+    <string name="room_participants_power_level_demote_warning_prompt">Вы не сможете отменить это изменение, поскольку вы понижаете себя в должности, а если вы последний привилегированный пользователь в комнате, то восстановить привилегии будет невозможно.</string>
+    <string name="room_participants_power_level_demote">Понизить</string>
+
+
+    <string name="room_participants_action_ignore_title">Игнорировать пользователя</string>
+    <string name="room_participants_action_ignore_prompt_msg">Игнорирование этого пользователя приведет к удалению его сообщений из общих комнат.
+\n
+\nВы можете отменить это действие в любое время в общих настройках.</string>
+    <string name="room_participants_action_unignore_title">Перестать игнорировать пользователя</string>
+    <string name="room_participants_action_unignore_prompt_msg">Если вы перестаните игнорировать этого пользователя, то все его сообщения вновь будут отображаться.</string>
+    <string name="room_participants_action_cancel_invite_title">Отменить приглашение</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Вы уверены, что хотите отменить приглашение для этого пользователя\?</string>
+    <string name="room_participants_kick_title">Выгнать пользователя</string>
+    <string name="room_participants_kick_reason">Причина гонения</string>
+    <string name="room_participants_kick_prompt_msg">Выгнанный пользователь будет удалён из этой комнаты.
+\n
+\nЧтобы предотвратить его повторное присоединение, вы должны забанить его.</string>
+    <string name="room_participants_ban_title">Заблокировать пользователя</string>
+    <string name="room_participants_ban_reason">Причина блокировки</string>
+    <string name="room_participants_unban_title">Разблокировать пользователя</string>
+    <string name="room_participants_unban_prompt_msg">Разблокирование пользователя позволит ему снова присоединиться к комнате.</string>
+
+    <string name="settings_secure_backup_section_title">Безопасное резервное копирование</string>
+    <string name="settings_secure_backup_manage">Управление</string>
+    <string name="settings_secure_backup_setup">Настройка безопасного резервного копирования</string>
+    <string name="settings_secure_backup_reset">Сброс безопасного резервного копирования</string>
+    <string name="settings_secure_backup_enter_to_setup">Настроить на этом устройстве</string>
+    <string name="settings_secure_backup_section_info">Защитите себя от потери доступа к зашифрованным сообщениям и данным, создав резервные копии ключей шифрования на вашем сервере.</string>
+    <string name="reset_secure_backup_title">Создайте новый ключ безопасности или задайте новую секретную фразу для существующей резервной копии.</string>
+    <string name="reset_secure_backup_warning">Это заменит ваш текущий ключ или фразу.</string>
+
+    <string name="disabled_integration_dialog_title">Интеграции отключены</string>
+    <string name="disabled_integration_dialog_content">Включите «Управление интеграциями» в настройках, чтобы сделать это.</string>
+
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d пользователь заблокирован</item>
+        <item quantity="few">%d пользователей заблокировано</item>
+        <item quantity="many">%d пользователей заблокировано</item>
+    </plurals>
+
+    <string name="encryption_exported_successfully">Ключи успешно экспортированы</string>
+
+    <string name="active_widget_view_action">ОБЗОР</string>
+    <string name="active_widgets_title">Активные виджеты</string>
+
+
+    <string name="recovery_key_export_saved">Ключ восстановления был сохранён.</string>
+
+    <string name="secure_backup_banner_setup_line1">Безопасное резервное копирование</string>
+    <string name="secure_backup_banner_setup_line2">Защита от потери доступа к зашифрованным сообщениям и данным</string>
+
+    <string name="secure_backup_setup">Настроить безопасное резервное копирование</string>
+
+    <string name="labs_merge_e2e_in_timeline">Слиянию не удаётся расшифровать сообщение на временной шкале</string>
+    <string name="labs_show_unread_notifications_as_tab">Добавьте специальную вкладку для непрочитанных уведомлений на главном экране.</string>
+
+    <plurals name="fallback_users_read">
+        <item quantity="one">Прочитал 1 пользователь</item>
+        <item quantity="few">Прочитано %d пользователями</item>
+        <item quantity="many">Прочитано %d пользователями</item>
+    </plurals>
+
+    <string name="room_list_quick_actions_favorite_add">Добавить в избранное</string>
+    <string name="room_list_quick_actions_favorite_remove">Убрать из избранного</string>
+    <string name="notice_member_no_changes">%1$s не внес никаких изменений</string>
+    <string name="notice_member_no_changes_by_you">Вы не внесли никаких изменений</string>
+    <string name="no_ignored_users">Вы не игнорируете никаких пользователей</string>
+
+    <string name="room_join_rules_public_by_you">Вы сделали комнату доступной для всех, у кого есть ссылка.</string>
+    <string name="room_join_rules_invite_by_you">Вы сделали комнату только по приглашению.</string>
+    <string name="login_splash_text2">Сохраняйте приватность ваших переписок с помощью шифрования</string>
+    <string name="login_splash_text3">Расширьте и персонализируйте свой опыт использования</string>
+    <string name="login_server_matrix_org_text">Присоединяйтесь к миллионам бесплатных на самом большом публичном сервере</string>
+    <string name="login_signin_to">Войти в %1$s</string>
+    <string name="login_server_url_form_other_notice">Введите адрес сервера или Element, к которому вы хотите подключиться</string>
+    <string name="login_server_url_form_common_notice">Введите адрес сервера, который вы хотите использовать</string>
+
+    <string name="login_reset_password_notice">На ваш почтовый ящик будет отправлено письмо с подтверждением установки нового пароля.</string>
+    <string name="login_reset_password_mail_confirmation_submit">Я подтвердил свою электронную почту</string>
+
+    <string name="login_set_email_notice">Установите адрес электронной почты для восстановления вашей учетной записи. Позже вы можете дополнительно разрешить людям, которых вы знаете, обнаружить вас по электронной почте.</string>
+    <string name="login_validation_code_is_not_correct">Введенный код неверен. Пожалуйста, проверьте.</string>
+    <string name="login_connect_using_matrix_id_notice">Кроме того, если у вас уже есть учетная запись и вы знаете свой идентификатор Matrix и пароль, вы можете использовать этот метод:</string>
+    <string name="login_connect_using_matrix_id_submit">Войти с помощью Matrix ID</string>
+    <string name="login_signin_matrix_id_title">Войти с помощью Matrix ID</string>
+    <string name="login_signin_matrix_id_notice">Если вы создаете учетную запись на домашнем сервере, используйте свой матричный идентификатор (например, @user:domain.com) и пароль ниже.</string>
+    <string name="login_signin_matrix_id_hint">Matrix ID</string>
+    <string name="login_signin_matrix_id_password_notice">Если вы не знаете свой пароль, вернитесь, чтобы сбросить его.</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Это недопустимый идентификатор пользователя. Ожидаемый формат: \'@user:homeserver.org\'</string>
+    <string name="autodiscover_well_known_error">Не удалось найти действительный домашний сервер. Пожалуйста, проверьте свой идентификатор</string>
+
+    <string name="notification_initial_sync">Первичная синхронизация…</string>
+
+    <string name="settings_rageshake">Rageshake</string>
+    <string name="settings_rageshake_detection_threshold">Порог обнаружения</string>
+    <string name="settings_rageshake_detection_threshold_summary">Встряхните телефон, чтобы проверить порог обнаружения</string>
+    <string name="rageshake_detected">Тряска зафиксирована!</string>
+    <string name="autocomplete_limited_results">Показываем только первые результаты, наберите больше букв…</string>
+
+    <string name="settings_developer_mode_fail_fast_title">Раннее падение</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element может падать чаще, когда происходит непредвиденная ошибка</string>
+
+    <string name="command_description_shrug">Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения</string>
+
+    <string name="create_room_encryption_description">После включения шифрования оно не может быть отключено.</string>
+
+    <string name="login_error_threepid_denied">Ваш почтовый домен не имеет права регистрироваться на этом сервере</string>
+
+    <string name="verify_user_sas_emoji_help_text">Проверьте этого пользователя, подтвердив, что следующие уникальные смайлики появляются на его экране в том же порядке.</string>
+    <string name="verify_user_sas_emoji_security_tip">Для максимальной безопасности используйте другое надежное средство связи или сделайте это лично.</string>
+    <string name="verification_green_shield">Ищите зеленый щит, чтобы убедиться, что пользователь доверенный. Доверяйте всем пользователям в комнате, чтобы обеспечить безопасность комнаты.</string>
+
+    <string name="verification_conclusion_not_secure">Не безопасно</string>
+    <string name="verification_conclusion_compromised">Одно из следующих условий может быть скомпрометировано:
+\n
+\n-- Ваш домашний сервер
+\n-- Домашний сервер, к которому подключен пользователь, которого вы проверяете
+\n-- Ваше или подключение к интернету других пользователей
+\n-- Ваше или устройство других пользователей</string>
+
+    <string name="sent_a_video">Видео.</string>
+    <string name="sent_an_image">Изображение.</string>
+    <string name="sent_an_audio_file">Аудио</string>
+    <string name="sent_a_file">Файл</string>
+    <string name="send_a_sticker">Стикер</string>
+
+    <string name="verification_request_waiting">Ожидание…</string>
+    <string name="verification_request_other_cancelled">%s отменено</string>
+    <string name="verification_request_you_cancelled">Вы отменили</string>
+    <string name="verification_request_other_accepted">%s принято</string>
+    <string name="verification_request_you_accepted">Вы приняли</string>
+    <string name="verification_sent">Подтверждениие отправлено</string>
+    <string name="verification_request">Запрос на подтверждение</string>
+    <string name="verification_verify_device">Подтвердите эту сессию</string>
+    <string name="verification_verify_device_manually">Подтверждение вручную</string>
+
+    <string name="you">Вы</string>
+
+    <string name="verification_scan_notice">Сканируйте код с помощью устройства другого пользователя, чтобы надежно проверить друг друга</string>
+    <string name="verification_scan_their_code">Сканировать их код</string>
+    <string name="verification_scan_emoji_title">Невозможно сканировать</string>
+    <string name="verification_scan_emoji_subtitle">Если вы не можете лично, сравните эмодзи в таком случае</string>
+
+    <string name="verification_no_scan_emoji_title">Подтвердить при помощи сравнения эмодзи</string>
+
+    <string name="verify_by_emoji_title">Подтверждение с помощью эмодзи</string>
+    <string name="verify_by_emoji_description">Если вы не можете отсканировать приведенный выше код, проверьте это, сравнив короткий уникальный набор эмодзи.</string>
+
+    <string name="a13n_qr_code_description">Изображение QR-кода</string>
+
+    <string name="verification_verify_user">Подтверждено %s</string>
+    <string name="verification_verified_user">Подтверждённых %s</string>
+    <string name="verification_request_waiting_for">Ожидание для %s…</string>
+    <string name="verification_request_alert_description">Для дополнительной безопасности проверьте %s, проверив одноразовый код на обоих ваших устройствах.
+\n
+\nДля максимальной безопасности сделайте это лично.</string>
+    <string name="room_profile_not_encrypted_subtitle">Сообщения в этой комнате не шифруются сквозным шифрованием.</string>
+    <string name="room_profile_encrypted_subtitle">Сообщения в этой комнате не шифруются сквозным шифрованием.
+\n
+\nВаши сообщения защищены замками, и только у вас и получателя есть уникальные ключи, чтобы разблокировать их.</string>
+    <string name="room_profile_section_admin">Действия Администратора</string>
+    <string name="room_profile_leaving_room">Покинуть комнату…</string>
+
+    <string name="room_member_power_level_custom">Пользовательский</string>
+    <string name="room_member_power_level_invites">Приглашения</string>
+    <string name="room_member_power_level_admin_in">Администратор в %1$s</string>
+    <string name="room_member_power_level_moderator_in">Модератор в %1$s</string>
+    <string name="room_member_power_level_default_in">По умолчанию в %1$s</string>
+    <string name="room_member_power_level_custom_in">Пользовательский (%1$d) в %2$s</string>
+
+    <string name="room_member_jump_to_read_receipt">Перейти к последнему прочтённому им сообщению</string>
+
+    <string name="rendering_event_error_type_of_event_not_handled">Element не обрабатывает события типа \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element не обрабатывает сообщения типа \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element столкнулся с проблемой при отображении содержимого события с идентификатором \'%1$s\'</string>
+
+    <string name="unignore">Перестать игнорировать</string>
+
+    <string name="verify_cannot_cross_sign">Эта сессия не может поделиться подтверждением с другими сессиями.
+\nПодтверждение будет сохранено локально и отправится в будущей версии приложения.</string>
+
+    <string name="command_description_rainbow">Посылает сообщение, окрашенное в цвет радуги</string>
+    <string name="command_description_rainbow_emote">Посылает данную эмоцию, окрашенную в цвет радуги</string>
+
+    <string name="settings_category_composer">Редактор сообщений</string>
+
+    <string name="room_settings_enable_encryption">Включить сквозное шифрование</string>
+    <string name="room_settings_enable_encryption_warning">После включения шифрования оно не может быть отключено.</string>
+
+    <string name="room_settings_enable_encryption_dialog_title">Активировать шифрование\?</string>
+    <string name="room_settings_enable_encryption_dialog_content">После включения шифрование для комнаты не может быть отключено. Сообщения, отправленные в зашифрованном помещении, не могут быть замечены сервером, только участниками помещения. Включение шифрования может помешать правильной работе многих ботов и мостов.</string>
+    <string name="room_settings_enable_encryption_dialog_submit">Активировать шифрование</string>
+
+    <string name="verification_request_notice">Чтобы быть в безопасности, проверьте %s, проверив одноразовый код.</string>
+    <string name="verification_request_start_notice">Чтобы обезопасить себя, сделайте это лично или используйте другой способ общения.</string>
+
+    <string name="verification_emoji_notice">Сравните уникальные эмодзи, убедившись, что они появились в том же порядке.</string>
+    <string name="verification_code_notice">Сравните код с тем, который отображается на экране другого пользователя.</string>
+    <string name="verification_conclusion_ok_notice">Сообщения с этим пользователем полностью зашифрованы и не могут быть прочитаны третьими лицами.</string>
+    <string name="verification_conclusion_ok_self_notice">Ваша новая сесия теперь подтверждена. Она имеет доступ к вашим зашифрованным сообщениям, и другие пользователи будут считать её надежной.</string>
+
+    <string name="encryption_information_cross_signing_state">Кросс-подпись</string>
+    <string name="encryption_information_dg_xsigning_complete">Кросс-подпись включена
+\nПриватные ключи хранятся на устройстве.</string>
+    <string name="encryption_information_dg_xsigning_trusted">Кросс-подпись включена
+\nКлючи являются надёжными.
+\nПриватные ключи неизвестны</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">Кросс-подпись включена.
+\nКлючи являются ненадёжными</string>
+    <string name="encryption_information_dg_xsigning_disabled">Кросс-подпись выключена</string>
+
+    <string name="settings_hs_admin_e2e_disabled">Администратор вашего сервера отключил сквозное шифрование по умолчанию в приватных комнатах и диалогах.</string>
+    <string name="settings_active_sessions_list">Активные сессии</string>
+    <string name="settings_active_sessions_show_all">Показать все сессии</string>
+    <string name="settings_active_sessions_manage">Управление сессиями</string>
+    <string name="settings_active_sessions_signout_device">Выйти из этой сессии</string>
+
+    <string name="settings_failed_to_get_crypto_device_info">Нет доступного шифрования информации</string>
+
+    <plurals name="settings_active_sessions_count">
+        <item quantity="one">%d сессия активна</item>
+        <item quantity="few">%d сессии активны</item>
+        <item quantity="many">%d сессий активно</item>
+    </plurals>
+
+    <string name="crosssigning_verify_this_session">Подтвердите эту сессию</string>
+    <string name="verification_open_other_to_verify">Используйте существующую сессию для подтверждения этой, предоставив ей доступ к зашифрованным сообщениям.</string>
+
+
+    <string name="settings_dev_tools">Инструменты для разработчиков</string>
+    <string name="settings_account_data">Данные учётной записи</string>
+    <string name="verification_use_passphrase">Если вы не можете получить доступ к существующей сессии</string>
+
+    <string name="settings_key_requests">Запросы ключей</string>
+
+    <string name="verify_new_session_notice">Используйте эту сессию для подтверждения новой сессии, предоставляя ей доступ к зашифрованным сообщениям.</string>
+    <string name="bootstrap_cross_signing_success">Ваши %2$s и %1$s установлены.
+\n
+\nДержите их в безопасности! Они понадобятся для разблокировки зашифрованных сообщений и защиты информации, если у вас не останется активных сессий.</string>
+
+    <string name="bootstrap_cancel_text">Если вы отмените сейчас, вы можете потерять зашифрованные сообщения и данные, если потеряете доступ к своим логинам.
+\n
+\nВы также можете настроить безопасное резервное копирование и управлять своими ключами в настройках.</string>
+
+    <string name="encryption_enabled_tile_description">Сообщения в этой комнате зашифрованы сквозным шифрованием. Посмотрите подробности и подтвердите пользователей в их профиле.</string>
+    <string name="settings_notification_configuration">Параметры уведомлений</string>
+    <string name="settings_messages_at_room">Сообщения, содержащие @room</string>
+    <string name="settings_troubleshoot_title">Отладка</string>
+    <string name="settings_notification_advanced_summary">Настройки важности уведомлений для событий</string>
+
+    <string name="use_other_session_content_description">Используйте последнюю версию Element на других ваших устройствах, веб-клиент Element, Element для ПК, Element для iOS, Element для Андроид или другой клиент Matrix, поддерживающий кросс-подпись</string>
+    <string name="use_latest_app">Используйте последнюю версию Element на других ваших устройствах:</string>
+    <string name="verify_this_session">Подтвердите новую сессию вашей учетной записи: %1$s</string>
+
+    <string name="settings_setup_secure_backup">Настроить безопасное резервное копирование</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">Безопасное резервное копирование</string>
+    <string name="settings_active_sessions_verified_device_desc">Эта сессия является доверенной для безопасного обмена сообщениями, потому что вы проверили её:</string>
+    <string name="settings_active_sessions_unverified_device_desc">Подтвердите эту сессию, чтобы пометить её доверенной и предоставить ей доступ к зашифрованным сообщениям. Если вы не входили в эту сессю, ваша учетная запись может быть скомпрометирована:</string>
+
+    <string name="crosssigning_other_user_not_trust">Другие пользователи могут не доверять ему</string>
+    <string name="complete_security">Завершите настройку безопасности</string>
+
+    <string name="verification_profile_verify">Верифицировать</string>
+    <string name="verification_profile_verified">Верифицировано</string>
+    <string name="verification_profile_warning">Внимание</string>
+
+    <string name="room_member_profile_failed_to_get_devices">Ошибка получения списка сессий</string>
+    <string name="room_member_profile_sessions_section_title">Сессии</string>
+    <string name="trusted">Доверенные</string>
+    <string name="not_trusted">Недоверенные</string>
+
+    <string name="verification_profile_device_verified_because">Эта сессия является доверенной для безопасного обмена сообщениями, так как %1$s (%2$s) проверил(а) его:</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) вошел(ла), используя новую сессию:</string>
+    <plurals name="poll_info">
+        <item quantity="one">%d голос</item>
+        <item quantity="few">%d голоса</item>
+        <item quantity="many">%d голосов</item>
+    </plurals>
+    <plurals name="poll_info_final">
+        <item quantity="one">%d голос - финальные результаты</item>
+        <item quantity="few">%d голоса - финальные результаты</item>
+        <item quantity="many">%d голосов - финальные результаты</item>
+    </plurals>
+    <string name="poll_item_selected_aria">Выберите вариант</string>
+    <string name="command_description_poll">Создать простой опрос</string>
+    <string name="new_signin">Новый вход</string>
+
+    <string name="verification_profile_device_untrust_info">Пока этот пользователь не доверяет этой сессии, сообщения, отправленные в обе стороны, помечаются предупреждениями. Кроме того, вы можете подтвердить сессию вручную.</string>
+
+
+    <string name="initialize_cross_signing">Инициализировать кросс-подпись</string>
+    <string name="reset_cross_signing">Сбросить ключи</string>
+
+    <string name="qr_code_scanned_by_other_notice">Почти готово! Отображает ли %s такой же щит\?</string>
+    <string name="qr_code_scanned_by_other_yes">Да</string>
+    <string name="qr_code_scanned_by_other_no">Нет</string>
+
+    <string name="no_connectivity_to_the_server_indicator_airplane">Активирован режим \"В самолёте\"</string>
+
+    <string name="enter_secret_storage_invalid">Не удалось найти данные в хранилище</string>
+    <string name="enter_secret_storage_passphrase">Введите парольную фразу для секретного хранилища</string>
+    <string name="enter_secret_storage_passphrase_warning">Предупреждение:</string>
+    <string name="enter_secret_storage_passphrase_warning_text">Вы должны получать доступ к секретному хранилищу только с доверенного устройства</string>
+
+    <string name="share_confirm_room">Вы хотите отправить это вложение в %1$s\?</string>
+    <plurals name="send_images_with_original_size">
+        <item quantity="one">Отправить изображение в оригинальном размере</item>
+        <item quantity="few">Отправить изображения в оригинальном размере</item>
+        <item quantity="many">Отправить изображения в оригинальном размере</item>
+    </plurals>
+
+    <string name="delete_event_dialog_title">Подтвердите удаление</string>
+    <string name="delete_event_dialog_content">Вы уверены, что хотите скрыть (удалить) это событие\? Обратите внимание, что если вы удалите название комнаты или измените тему, это может отменить изменение.</string>
+    <string name="delete_event_dialog_reason_checkbox">Указать причину</string>
+    <string name="delete_event_dialog_reason_hint">Причина редактирования</string>
+
+    <string name="event_redacted_by_user_reason_with_reason">Событие удалено пользователем, Причина: %1$s</string>
+    <string name="event_redacted_by_admin_reason_with_reason">Событие модерируется администратором комнаты, Причина: %1$s</string>
+
+    <string name="keys_backup_restore_success_title_already_up_to_date">Ключи успешно обновлены!</string>
+
+    <string name="login_default_session_public_name">Element для Android</string>
+
+    <string name="refresh">Обновить</string>
+
+    <string name="new_session">Новый вход в вашу учётную запись. Это были Вы\?</string>
+    <string name="new_session_review">Нажмите, чтобы просмотреть и проверить</string>
+    <string name="verify_new_session_was_not_me">Это был не я</string>
+    <string name="verify_new_session_compromized">Ваш аккаунт может оказаться под угрозой</string>
+
+    <string name="verify_cancel_self_verification_from_untrusted">Если вы прервёте процедуру, то не сможете читать зашифрованные сообщения на этом устройстве, а другие пользователи не будут доверять ему</string>
+    <string name="verify_cancel_self_verification_from_trusted">Если вы прервёте процедуру, то не сможете читать зашифрованные сообщения на своем новом устройстве, а другие пользователи не будут доверять ему</string>
+    <string name="verify_cancel_other">Если вы прервёте процедуру, пользователь %1$s (%2$s) не будет подтверждён. Начните заново в профиле этого пользователя.</string>
+
+    <string name="verify_not_me_self_verification">Что-то из этого может быть скомпрометировано:
+\n
+\n- Ваш пароль
+\n- Ваш домашний сервер
+\n- Это устройство или другое устройство
+\n- Интернет-соединение, используемое этим или другим устройством
+\n
+\nМы рекомендуем вам немедленно изменить свой пароль и ключ восстановления в настройках.</string>
+
+    <string name="verification_cancelled">Подтверждение отменено</string>
+
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Генерация ключа безопасности из парольной фразы</string>
+    <string name="bootstrap_progress_generating_ssss">Генерация ключа SSSS из парольной фразы</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Генерация ключа SSSS из парольной фразы (%s)</string>
+    <string name="bootstrap_migration_enter_backup_password">Чтобы продолжить работу, введите парольную фразу для резервного копирования ключа.</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Если вы не знаете вашу парольную фразу для резервного копирования ключей, вы можете %s.</string>
+    <string name="power_level_edit_title">Задать роль</string>
+    <string name="confirm_recovery_passphrase">Подтвердить %s</string>
+
+    <string name="bootstrap_info_confirm_text">Введите свою %s еще раз для подтверждения.</string>
+    <string name="bootstrap_info_text_2">Введите секретную фразу, известную только вам, для защиты данных на вашем сервере.</string>
+
+    <string name="bootstrap_loading_title">Настройка восстановления.</string>
+    <string name="your_recovery_key">Ваш ключ восстановления</string>
+    <string name="bootstrap_finish_title">Готово!</string>
+    <string name="keep_it_safe">Храните его в безопасности</string>
+    <string name="finish">Завершить</string>
+
+    <string name="bootstrap_save_key_description">Используйте %1$s как подстраховку на случай, если вы забудете %2$s.</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">Публикация созданных ключей идентификации</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Определение ключа SSSS по умолчанию</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Синхронизация мастер-ключа</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Синхронизация ключа пользователя</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Синхронизация ключа самоподписи</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Настройка резервного копирования ключей</string>
+
+
+    <string name="bootstrap_crosssigning_save_usb">Сохраните на USB-флешку или резервный диск</string>
+    <string name="bootstrap_crosssigning_save_cloud">Скопируйте в персональное облачное хранилище</string>
+
+    <string name="auth_flow_not_supported">Вы не можете сделать это с телефона</string>
+
+    <string name="encryption_unknown_algorithm_tile_description">Шифрование этой комнаты не поддерживается</string>
+
+    <string name="room_created_summary_item_by_you">Вы создали и настроили комнату.</string>
+
+    <string name="qr_code_scanned_self_verif_notice">Почти готово! Отображается ли такой же щит в другой вашей сессии\?</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Почти готово! Ожидание подтверждения…</string>
+    <string name="qr_code_scanned_verif_waiting">Ожидание для %s…</string>
+
+    <string name="error_failed_to_import_keys">Не удалось импортировать ключи</string>
+
+    <string name="settings_messages_in_e2e_one_to_one">Зашифрованные сообщения в персональных чатах</string>
+    <string name="settings_messages_in_e2e_group_chat">Зашифрованные сообщения в групповых чатах</string>
+    <string name="settings_when_rooms_are_upgraded">При обновлении комнат</string>
+    <string name="command_description_plain">Посылает сообщение в виде простого текста, не интерпретируя его как разметку</string>
+
+    <string name="auth_invalid_login_param_space_in_password">Неверное имя пользователя и/или пароль. Введенный пароль начинается или заканчивается пробелами, пожалуйста, проверьте.</string>
+    <string name="auth_invalid_login_deactivated_account">Эта учётная запись была деактивирована.</string>
+
+    <string name="setup_cross_signing">Активировать кросс-подпись</string>
+    <string name="bootstrap_enter_recovery">Введите %s, чтобы продолжить</string>
+    <string name="use_file">Использовать файл</string>
+
+    <string name="enter_backup_passphrase">Введите %s</string>
+    <string name="bootstrap_invalid_recovery_key">Это недействительный ключ восстановления</string>
+    <string name="recovery_key_empty_error_message">Пожалуйста, введите ключ восстановления</string>
+
+    <string name="bootstrap_progress_checking_backup">Проверка ключа резервного копирования</string>
+    <string name="bootstrap_progress_checking_backup_with_info">Проверка ключа резервного копирования (%s)</string>
+    <string name="bootstrap_progress_compute_curve_key">Получение кривой ключа</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Генерация ключа SSSS из ключа восстановления</string>
+    <string name="bootstrap_progress_storing_in_sss">Сохранение резервной копии ключа в SSSS</string>
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+
+    <string name="bootstrap_migration_use_recovery_key">используйте ваш ключ восстановления ключа резервной копии</string>
+    <string name="bootstrap_migration_backup_recovery_key">Ключ восстановления ключа резервной копии</string>
+
+    <string name="settings_security_prevent_screenshots_title">Блокировать скриншоты в приложении</string>
+    <string name="settings_security_prevent_screenshots_summary">Включение этого параметра добавляет FLAG_SECURE ко всем действиям. Перезапустите приложение, чтобы изменения вступили в силу.</string>
+
+    <string name="media_file_added_to_gallery">Медиафайл добавлен в галерею</string>
+    <string name="error_adding_media_file_to_gallery">Не удалось добавить медиафайл в галерею</string>
+    <string name="error_saving_media_file">Не удалось сохранить медиафайл</string>
+    <string name="app_desktop_web">Веб-Element
+\nElement для ПК</string>
+    <string name="app_ios_android">Element для iOS
+\nElement для Android</string>
+    <string name="or_other_mx_capabale_client">или другой, поддерживаемый кросс-подпись Matrix клиент</string>
+    <string name="command_description_discard_session">Принудительно отбрасывает текущую групповую сессию для отправки сообщений в зашифрованную комнату</string>
+    <string name="enter_secret_storage_passphrase_or_key">Чтобы продолжить, используйте ваш %1$s или используйте ваш %2$s.</string>
+    <string name="use_recovery_key">Используйте ключ восстановления</string>
+    <string name="enter_secret_storage_input_key">Выберите ключ восстановления или введите его вручную, введя или вставив из буфера обмена</string>
+    <string name="keys_backup_recovery_key_error_decrypt">Невозможно расшифровать резервную копию с помощью этого ключа восстановления: убедитесь, что вы ввели правильный ключ.</string>
+    <string name="failed_to_access_secure_storage">Не удалось получить доступ к защищенному хранилищу данных</string>
+
+    <string name="unencrypted">Не зашифровано</string>
+    <string name="encrypted_unverified">Зашифровано неподтверждённой сессией</string>
+    <string name="review_logins">Проверьте, где вы вошли</string>
+    <string name="verify_other_sessions">Подтвердите все свои сессии, чтобы убедиться в безопасности вашей учетной записи и сообщений</string>
+    <string name="cross_signing_verify_by_text">Ручная проверка с помощью текста</string>
+    <string name="mark_as_verified">Пометить как надежный</string>
+
+    <string name="external_link_confirmation_title">Перепроверьте эту ссылку</string>
+    <string name="external_link_confirmation_message">Ссылка %1$s перенаправит вас на другой сайт: %2$s.
+\n
+\nВы уверены, что хотите продолжить\?</string>
+
+    <string name="create_room_dm_failure">Мы не смогли создать эту беседу. Пожалуйста, проверьте пользователей, которых вы приглашаете, и попробуйте ещё раз.</string>
+
+    <string name="add_members_to_room">Добавить участников</string>
+    <string name="invite_users_to_room_action_invite">ПРИГЛАСИТЬ</string>
+    <string name="inviting_users_to_room">Приглашаем пользователей…</string>
+    <string name="invite_users_to_room_title">Пригласить пользователей</string>
+    <string name="invitation_sent_to_one_user">Приглашение для %1$s отправлено</string>
+    <string name="invitations_sent_to_two_users">Приглашения для %1$s и %2$s отправлены</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="one">Приглашения отправлены %1$s и еще одному пользователю</item>
+        <item quantity="few">Приглашения отправлены %1$s и еще %2$d пользователям</item>
+        <item quantity="many">Приглашения отправлены %1$s и еще %2$d пользователям</item>
+    </plurals>
+    <string name="invite_users_to_room_failure">Мы не могли пригласить этих пользователей. Пожалуйста, проверьте пользователей, которых вы хотите пригласить, и повторите попытку.</string>
+
+    <string name="choose_locale_current_locale_title">Текущий язык</string>
+    <string name="choose_locale_other_locales_title">Другие доступные языки</string>
+    <string name="choose_locale_loading_locales">Загрузка доступных языков…</string>
+
+    <string name="open_terms_of">Посмотреть условия %s</string>
+    <string name="disconnect_identity_server_dialog_content">Отключиться от сервера идентификации %s\?</string>
+    <string name="identity_server_error_outdated_identity_server">Этот сервер идентификации устарел. Element поддерживает только API V2.</string>
+    <string name="identity_server_error_outdated_home_server">Эта операция невозможна. Домашний сервер устарел.</string>
+    <string name="identity_server_error_no_identity_server_configured">Пожалуйста, настройте сначала сервер идентификации.</string>
+    <string name="identity_server_error_terms_not_signed">Пожалуйста, примите сначала условия сервера идентификации в настройках.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Для вашей приватности, Element поддерживает отправку адреса электронной почты и номера телефона только в хэшированном виде.</string>
+    <string name="identity_server_error_binding_error">Привязка не удалась.</string>
+    <string name="identity_server_error_no_current_binding_error">Текущая взаимосвязь с этим идентификатором отсутствует.</string>
+
+    <string name="identity_server_set_default_notice">Ваш домашний сервер (%1$s) предлагает использовать %2$s для вашего сервера идентификации</string>
+    <string name="identity_server_set_default_submit">Использовать %1$s</string>
+    <string name="identity_server_set_alternative_notice">Кроме того, вы можете ввести любой другой URL-адрес сервера идентификации</string>
+    <string name="identity_server_set_alternative_notice_no_default">Введите URL-адрес сервера идентификации</string>
+    <string name="identity_server_set_alternative_submit">Отправить</string>
+    <string name="power_level_title">Роль</string>
+    <string name="a11y_open_chat">Открыть чат</string>
+    <string name="a11y_mute_microphone">Заглушить микрофон</string>
+    <string name="a11y_unmute_microphone">Включить звук микрофона</string>
+    <string name="a11y_stop_camera">Отключить камеру</string>
+    <string name="a11y_start_camera">Включить камеру</string>
+
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Защитите себя от потери доступа к зашифрованным сообщениям и данным, создав резервные копии ключей шифрования на вашем сервере.</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Настроить</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Используйте ключ безопасности</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Создайте ключ безопасности для хранения в надежном месте, например в менеджере паролей или сейфе.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Использовать секретную фразу</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Введите секретную фразу, известную только вам, и создайте ключ для резервного копирования.</string>
+
+    <string name="bottom_sheet_save_your_recovery_key_title">Сохраните свой ключ безопасности</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Храните ключ безопасности в надежном месте, например в менеджере паролей или сейфе.</string>
+
+    <string name="set_a_security_phrase_title">Задайте секретную фразу</string>
+    <string name="set_a_security_phrase_notice">Введите секретную фразу, известную только вам, для защиты данных на вашем сервере.</string>
+    <string name="set_a_security_phrase_hint">Секретная фраза</string>
+    <string name="set_a_security_phrase_again_notice">Для подтверждения введите вашу секретную фразу ещё раз.</string>
+
+    <string name="save_your_security_key_title">Сохраните ваш ключ безопасности</string>
+    <string name="save_your_security_key_notice">Храните ключ безопасности в надежном месте, например в менеджере паролей или сейфе.</string>
+
+    <string name="room_settings_name_hint">Название комнаты</string>
+    <string name="room_settings_topic_hint">Тема</string>
+    <string name="room_settings_save_success">Вы успешно изменили настройки комнаты</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">У вас нет доступа к этому сообщению</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Расшифровка этого сообщения может занять некоторое время</string>
+    <string name="crypto_utd">Не удалось расшифровать</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Из-за сквозного шифрования вам, возможно, придется ждать прибытие чьего-либо сообщения, потому что ключи шифрования не были отправлены вам должным образом.</string>
+    <string name="crypto_error_withheld_blacklisted">Вы не можете получить доступ к этому сообщению, потому что вы были заблокированы отправителем</string>
+    <string name="crypto_error_withheld_unverified">Нет доступа к этому сообщению, так как отправитель не доверяет вашей сессии</string>
+    <string name="crypto_error_withheld_generic">Вы не можете получить доступ к этому сообщению, потому что отправитель намеренно не отправил ключи</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Ожидание истории шифрования</string>
+
+    <string name="element_disclaimer_title">Riot теперь Element!</string>
+    <string name="element_disclaimer_content">Мы рады сообщить, что сменили имя! Ваше приложение обновлено, и вы вошли в свою учетную запись.</string>
+    <string name="element_disclaimer_negative_button">ПОНЯТНО</string>
+    <string name="element_disclaimer_positive_button">УЗНАТЬ БОЛЬШЕ</string>
+
+    <string name="element_login_splash_brand">element</string>
+
+
+    <string name="save_recovery_key_chooser_hint">Сохранить ключ восстановления в</string>
+
+    <string name="add_from_phone_book">Добавить из моей телефонной книги</string>
+    <string name="empty_phone_book">Ваша телефонная книга пуста</string>
+    <string name="phone_book_title">Телефонная книга</string>
+    <string name="search_in_my_contacts">Поиск в моих контактах</string>
+    <string name="loading_contact_book">Получаем ваши контакты…</string>
+    <string name="empty_contact_book">Ваша контактная книга пуста</string>
+    <string name="contacts_book_title">Книга контактов</string>
+
+    <string name="three_pid_revoke_invite_dialog_title">Отозвать приглашение</string>
+    <string name="three_pid_revoke_invite_dialog_content">Отозвать приглашение для %1$s\?</string>
+
+    <string name="member_banned_by">Забанен %1$s</string>
+    <string name="failed_to_unban">Не удалось разбанить пользователя</string>
+
+    <string name="alert_push_are_disabled_title">Push-уведомления отключены</string>
+    <string name="alert_push_are_disabled_description">Просмотрите свои настройки, чтобы включить push-уведомления</string>
+    <string name="create_pin_title">Выберите PIN-код для обеспечения безопасности</string>
+    <string name="create_pin_confirm_title">Подтвердите PIN-код</string>
+    <string name="create_pin_confirm_failure">Не удалось установить PIN-код, Пожалуйста, введите новый.</string>
+    <string name="auth_pin_title">Введите ваш PIN-код</string>
+    <string name="auth_pin_forgot">Забыли PIN-код\?</string>
+    <string name="auth_pin_reset_title">Сброс PIN-кода</string>
+    <string name="auth_pin_new_pin_action">Новый PIN-код</string>
+    <string name="auth_pin_reset_content">Чтобы сбросить свой PIN-код, вам нужно будет повторно войти в аккаунт и создать новый PIN-код.</string>
+    <string name="settings_security_pin_code_title">Включить PIN-код</string>
+    <string name="settings_security_pin_code_summary">Для сброса PIN-кода нажмите Забыл(а) PIN-код, чтобы выйти из сессии и сбросить его.</string>
+    <string name="auth_pin_confirm_to_disable_title">Подтвердите PIN-код, чтобы отключить PIN-код</string>
+    <string name="settings_call_show_confirmation_dialog_title">Предотвращение случайных звонков</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Спрашивать подтверждение перед звонком</string>
 </resources>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index fd0a38e2f7..13e05110d9 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -93,8 +93,7 @@
     <plurals name="public_room_nb_users">
         <item quantity="one">1 používateľ</item>
         <item quantity="few">%d používatelia</item>
-        <item quantity="many">%d používateľov</item>
-        <item quantity="other" />
+        <item quantity="other">%d používateľov</item>
     </plurals>
 
     <string name="send_bug_report_include_logs">Odoslať záznamy</string>
@@ -185,7 +184,6 @@ Emailovú adresu si môžete k účtu pridať neskôr cez nastavenia.</string>
     <string name="login_error_unable_register">Nie je možné sa registrovať</string>
     <string name="login_error_unable_register_mail_ownership">Nie je možné sa registrovať: Zlyhalo overenie emailovej adresy</string>
     <string name="login_error_invalid_home_server">Zadajte platnú adresu URL</string>
-    <string name="login_mobile_device">Mobil</string>
 
     <string name="login_error_forbidden">Neplatné používateľské meno/heslo</string>
     <string name="login_error_unknown_token">Prepáčte, tento domovský server používa neznámy spôsob prihlasovania</string>
@@ -195,10 +193,6 @@ Emailovú adresu si môžete k účtu pridať neskôr cez nastavenia.</string>
     <string name="login_error_user_in_use">Toto používateľské meno sa už používa</string>
     <string name="login_error_login_email_not_yet">Zatiaľ ste neklikli na odkaz zaslaný emailom</string>
 
-    <string name="e2e_need_log_in_again">Mali by ste sa znovu prihlásiť, čo vygeneruje šifrovacie kľúče E2E pre túto reláciu a odošle zodpovedajúci verejný kľúč domovskému serveru.
-\nToto je potrebné urobiť len raz. 
-\nOspravedlňujeme sa za spôsobené ťažkosti.</string>
-
     <string name="read_receipts_list">Zoznam potvrdení o prečítaní</string>
 
     <string name="compression_options">Odoslať ako</string>
@@ -636,10 +630,6 @@ Pozor: tento súbor môže byť automaticky zmazaný po odinštalovaní aplikác
     <string name="encryption_information_verify_device_warning2">Ak sa kľúče zhodujú, stlačte tlačidlo Overiť nižšie. Ak sa nezhodujú, niekto ďalší odpočúva toto zariadenie a mali by ste ho pridať na čiernu listinu.</string>
     <string name="encryption_information_verify_key_match">Overil som, kľúče sa zhodujú</string>
 
-    <string name="e2e_enabling_on_app_update">Element od teraz podporuje E2E šifrovanie. Ak si ho želáte povoliť, musíte sa teraz odhlásiť a následne prihlásiť znovu.
-
-Môžete to urobiť teraz, alebo to môžete urobiť neskôr v časti Nastavenia.</string>
-
     <string name="unknown_devices_alert_title">V miestnosti sú neznáme relácie</string>
     <string name="unknown_devices_alert_message">V tejto miestnosti sa nachádzajú neznáme relácie, ktoré neboli overené.
 \nZnamená to, že príslušnosť týchto relácií k ich údajným používateľom nemôže byť garantovaná.
@@ -785,8 +775,7 @@ Môžete to urobiť teraz, alebo to môžete urobiť neskôr v časti Nastavenia
     <plurals name="membership_changes">
         <item quantity="one">1 zmena stavu</item>
         <item quantity="few">%d zmeny stavu</item>
-        <item quantity="many">%d zmien stavu</item>
-        <item quantity="other" />
+        <item quantity="other">%d zmien stavu</item>
     </plurals>
 
     <string name="list_members">Zobraziť členov</string>
@@ -795,45 +784,38 @@ Môžete to urobiť teraz, alebo to môžete urobiť neskôr v časti Nastavenia
     <plurals name="room_header_active_members_count">
         <item quantity="one">1 aktívny člen</item>
         <item quantity="few">%d aktívni členovia</item>
-        <item quantity="many">%d aktívnych členov</item>
-        <item quantity="other" />
+        <item quantity="other">%d aktívnych členov</item>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">1 člen</item>
         <item quantity="few">%d členovia</item>
-        <item quantity="many">%d členov</item>
-        <item quantity="other" />
+        <item quantity="other">%d členov</item>
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">1 nová správa</item>
         <item quantity="few">%d nové správy</item>
-        <item quantity="many">%d nových správ</item>
-        <item quantity="other" />
+        <item quantity="other">%d nových správ</item>
     </plurals>
 
     <plurals name="directory_search_rooms">
         <item quantity="one">1 miestnosť</item>
         <item quantity="few">%d miestnosti</item>
-        <item quantity="many">%d miestností</item>
-        <item quantity="other" />
+        <item quantity="other">%d miestností</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">Nájdená %1$s miestnosť pre %2$s</item>
         <item quantity="few">Nájdené %1$s miestnosti pre %2$s</item>
-        <item quantity="many">Nájdených %1$s miestností pre %2$s</item>
-        <item quantity="other" />
+        <item quantity="other">Nájdených %1$s miestností pre %2$s</item>
     </plurals>
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">1 neprečítaná správa</item>
         <item quantity="few">%d neprečítané správy</item>
-        <item quantity="many">%d neprečítaných správ</item>
-        <item quantity="other" />
+        <item quantity="other">%d neprečítaných správ</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">1 neprečítaná správa</item>
         <item quantity="few">%d neprečítané správy</item>
-        <item quantity="many">%d neprečítaných správ</item>
-        <item quantity="other" />
+        <item quantity="other">%d neprečítaných správ</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">1 miestnosť</item>
@@ -845,8 +827,7 @@ Môžete to urobiť teraz, alebo to môžete urobiť neskôr v časti Nastavenia
     <plurals name="active_widgets">
         <item quantity="one">1 aktívny widget</item>
         <item quantity="few">%d aktívne widgety</item>
-        <item quantity="many">%d aktívnych widgetov</item>
-        <item quantity="other" />
+        <item quantity="other">%d aktívnych widgetov</item>
     </plurals>
 
     <!-- Widget Integration Manager -->
@@ -957,8 +938,7 @@ Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť sp
     <plurals name="room_details_selected">
         <item quantity="one">1 vybratý</item>
         <item quantity="few">%d vybratí</item>
-        <item quantity="many">%d vybratých</item>
-        <item quantity="other" />
+        <item quantity="other">%d vybratých</item>
     </plurals>
     <string name="settings_preview_media_before_sending">Zobraziť náhľad médií pred odoslaním</string>
 
@@ -982,15 +962,13 @@ Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť sp
     <plurals name="group_members">
         <item quantity="one">1 člen</item>
         <item quantity="few">%d členovia</item>
-        <item quantity="many">%d členov</item>
-        <item quantity="other" />
+        <item quantity="other">%d členov</item>
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">1 miestnosť</item>
         <item quantity="few">%d miestnosti</item>
-        <item quantity="many">%d miestností</item>
-        <item quantity="other" />
+        <item quantity="other">%d miestností</item>
     </plurals>
     <string name="room_tombstone_versioned_description">Táto miestnosť bola nahradená inou a nie je viac aktívna</string>
     <string name="room_tombstone_continuation_link">Konverzácia pokračuje tu</string>
@@ -1046,7 +1024,7 @@ Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť sp
     <string name="auth_accept_policies">Prosím prečítajte si a odsúhlaste zmluvné podmienky tohoto domovského servera:</string>
 
     <string name="settings_call_category">Hovory</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Použiť predvolené zvonenie Element pre prichádzajúce hovory</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Použiť predvolené zvonenie Element pre prichádzajúce hovory</string>
     <string name="settings_call_ringtone_title">Zvonenie pre prichádzajúci hovor</string>
     <string name="settings_call_ringtone_dialog_title">Vyberte zvonenie pre prichádzajúce hovory:</string>
 
@@ -1148,8 +1126,6 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
     <string name="account_phone_number_error">Pri pokuse overiť vaše telefónne číslo sa vyskytla chyba.</string>
     <string name="account_additional_info">Dodatočné informácie: %s</string>
 
-    <string name="encryption_import_room_keys_success">Úspešne importovaných %1$d/%2$d kľúč(ov).</string>
-
     <string name="settings_labs_native_camera_summary">Spustiť predvolený fotoaparát v systéme namiesto zobrazenia vlastnej vstavanej obrazovky.</string>
     <string name="settings_labs_enable_send_voice_summary">Vyžaduje externú aplikáciu na nahrávanie zvuku.</string>
 
@@ -1159,27 +1135,6 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
 
     <string name="no_valid_google_play_services_apk">Nenájdená aktívna aplikácia Služby Google Play. Je možné, že nebude správne fungovať doručovanie oznámení.</string>
 
-    <string name="store_title">Element - Komunikujte, Podľa seba</string>
-    <string name="store_whats_new">"Element neustále aktualizujeme s vylepšeniami a zmenami.
-Podrobný zoznam zmien (anglicky) nájdete na adrese: %1$s.
-Aby ste nič nezmeškali, nevypínajte prosím automatické aktualizácie."</string>
-    <string name="store_short_description">Univerzálna a bezpečná aplikácia na okamžitú komunikáciu úplne pod vašou kontrolou.</string>
-    <string name="store_full_description">Četovacia aplikácia, pod vašou kontrolou a úplne flexibilná. Element vám umožňuje komunikovať presne tak, ako to vy chcete. Vytvorená pre [matrix] - štandard pre otvorenú, decentralizovanú komunikáciu.
-\n
-\nZaložte si bezplatný účet u matrix.org, založte si svoj server na https://modular.im alebo použite iný Matrix server.
-\n
-\nPrečo si vybrať Element\?
-\n
-\n• KOMPLETNÁ KOMUNIKÁCIA: Vytvárajte miestnosti pre vaše týmy, priateľov či komunity - akokoľvek chcete! Píšte si, zdieľajte súbory, pridávajte widgety a uskutočňujte hlasové hovory či video-hovory - všetko bezplatne.
-\n
-\n• INTEGRÁCIE: Používajte Element s nástrojmi, ktoré poznáte a s obľubou používate. S Element môžete taktiež komunikovať s používateľmi a skupinami na iných četovacích platformách.
-\n
-\n• SÚKROMNÝ A ZABEZPEČENÝ: Udržte si svoje konverzácie tajné. Špičkové end-to-end šifrovanie zaručí, že súkromné konverzácie ostanú súkromnými.
-\n
-\n• OTVORENÝ, NIE UZAMKNUTÝ: Open source a stavané na Matrixe. Staňte sa vlastníkom svojich dát, že si založíte vlastný server alebo si vyberiete ten, ktorému dôverujete.
-\n
-\n• VŠADE, KDE STE: Zostaňte v kontakte kdekoľvek ste s plne synchronizovanou históriou správ naprieč všetkými vašimi zariadeniami alebo online na https://riot.im.</string>
-
     <string name="notification_sync_init">Inicializácia služby</string>
     <string name="title_activity_keys_backup_setup">Zálohovanie kľúčov</string>
     <string name="title_activity_keys_backup_restore">Obnoviť kľúče zo zálohy</string>
@@ -1207,7 +1162,6 @@ Aby ste nič nezmeškali, nevypínajte prosím automatické aktualizácie."</str
     <string name="login_error_unknown_host">Na tejto adrese nie je dostupný žiadny obsah. Prosím, skontrolujte jej správnosť</string>
     <string name="login_error_ssl_handshake">Vaše zariadenie používa zastaralú verziu protokolu TLS, ktorá je náchylná na zraniteľnosti. Z dôvodu zachovania maximálnej bezpečnosti sa nebudete môcť pripojiť</string>
     <string name="settings_notification_advanced">Pokročilé nastavenia oznámení</string>
-    <string name="settings_notification_advanced_summary">Nastavenie dôležitosti oznámení pre udalosti, konfigurácia zvukových, vibračných a LED upozornení</string>
     <string name="settings_notification_by_event">Dôležitosť oznámení pre udalosti</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Vlastné nastavenia.</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index eae67a0c3e..f4b2799591 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -174,7 +174,6 @@
     <string name="login_error_registration_network_error">S’arrihet të regjistrohet: Gabim rrjeti</string>
     <string name="login_error_unable_register">S’arrihet të regjistrohet</string>
     <string name="login_error_invalid_home_server">Ju lutemi, jepni një URL të vlefshme</string>
-    <string name="login_mobile_device">Celular</string>
 
     <string name="login_error_forbidden">Emër përdoruesi/fjalëkalim i pavlefshëm</string>
     <string name="login_error_unknown_token">Token-i i hyrjeve i dhënë nuk u njoh</string>
@@ -774,10 +773,6 @@
     <string name="room_settings_addresses_e2e_encryption_warning">Aktivizo fshehtëzim 
 \n(kujdes: s’mund të çaktivizohet më!)</string>
 
-    <string name="e2e_enabling_on_app_update">Element tani mbulon fshehtëzim skaj-më-skaj, por lypset të ribëni hyrjen që ta aktivizoni.
-\n
-\nMund ta bëni tani ose më vonë, që prej rregullimeve të aplikacionit.</string>
-
     <string name="unknown_devices_alert_message">Kjo dhomë përmban sesione të panjohur që s’janë verifikuar.
 \nKjo do të thotë se nuk ka garanci se sesionet u përkasin përdoruesve që pretendojnë se u përkasin.
 \nPërpara se të vazhdoni, këshillojmë që të kaloni në proces verifikimi çdo sesion, por mund të ridërgoni mesazhin pa verifikuar gjë, nëse parapëlqeni kështu.
@@ -936,9 +931,6 @@
     <string name="resource_limit_soft_default">Ky shërbyes home ka tejkaluar një nga kufijtë mbi burimet, ndaj <b>disa përdorues s’do të jenë në gjendje të bëjnë hyrjen</b>.</string>
     <string name="resource_limit_soft_mau"> Ky shërbyes home ka tejkaluar kufirin Përdorues Aktivë Mujorë, ndaj <b>disa përdorues s’do të jenë në gjendje të bëjnë hyrjen</b>.</string>
     <string name="send_bug_report_logs_description">Që të mund të diagnostikohen probleme, regjistra prej këtij klienti do të dërgohen tok me këtë njoftim të metash. Ky njoftim të metash, përfshi regjistrat dhe foton e ekranit, nuk do të jenë të dukshëm publikisht. Nëse do të parapëlqenit të dërgohej vetëm teksti më sipër, ju lutemi, hiqjani shenjën kutizës:</string>
-    <string name="e2e_need_log_in_again">Që të prodhohen kyçe fshehtëzimi skaj-më-skaj për këtë sesion, lypset të ribëni hyrjen dhe të parashtroni kyçin publik te shërbyesi juaj Home.
-\nKjo duhet vetëm një herë.
-\nNa ndjeni për belanë.</string>
 
     <string name="ssl_cert_not_trust">Kjo mund të ishte shenjë se dikush po përgjon me dashakeqësi trafikun tuaj, ose se telefoni juaj nuk i beson dëshmisë së furnizuar nga shërbyesi i largët.</string>
     <string name="ssl_cert_new_account_expl">Nëse përgjegjësi i shërbyesit ka thënë se kjo është e pritshme, sigurohuni që shenjat e gishtave më poshtë përputhen me shenjat e gishtave të furnizuara prej tyre.</string>
@@ -990,7 +982,7 @@
     <string name="option_send_sticker">Dërgoni një ngjitës</string>
     <string name="go_on_with">vazhdoni me…</string>
     <string name="settings_call_category">Thirrje</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Për thirrje ardhëse përdor zilen parazgjedhje të Element-it</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Për thirrje ardhëse përdor zilen parazgjedhje të Element-it</string>
     <string name="settings_call_ringtone_title">Zile thirrjesh ardhëse</string>
     <string name="settings_call_ringtone_dialog_title">Përzgjidhni zile për thirrjet:</string>
 
@@ -1003,8 +995,6 @@
 
     <string name="auth_accept_policies">Ju lutemi, merrni në shqyrtim dhe pranoni rregullat e këtij shërbyesi Home:</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d kyç(e) u importuan me sukses.</string>
-
     <string name="settings_notification_troubleshoot">Diagnostikoni Njoftime</string>
     <string name="settings_troubleshoot_diagnostic">Diagnostikime</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Xhironi Teste</string>
@@ -1088,29 +1078,8 @@
 
     <string name="no_valid_google_play_services_apk">S’u gjet APK për Google Play Services. Njoftimet mund të mos punojnë saktë.</string>
 
-    <string name="store_title">Element - Komunikoni, sipas mënyrës tuaj</string>
-    <string name="store_short_description">Një aplikacion universal i sigurt bisedash, tërësisht nën kontrollin tuaj.</string>
-    <string name="store_full_description">Një aplikacion fjalosjesh, nën kontrollin tuaj dhe plotësisht i zhdërvjellët. Element-i ju lejon të komunikoni sipas mënyrës që doni. I krijuar për [matrix] - standardi për komunikime të hapura, të decentralizuara.
-\n
-\nMerrni një llogari matrix.org falas, merrni shërbyesin tuaj te https://modular.im, ose përdorni një tjetër shërbyes Matrix.
-\n
-\nPse të zgjidhet Element\?
-\n
-\n• KOMUNIKIM I PLOTË: Krijoni dhoma rreth ekipeve tuaj, shokëve tuaj, bashkësisë tuaj - ç’të doni! Llafosuni, shkëmbeni kartela, shtoni widget-e dhe bëni thirrje me zë dhe figurë - gjithçka falas.
-\n
-\n• INTEGRIME TË FUQISHME: Përdoreni Element me mjete që njihni dhe që i doni. Me Element mundeni madje edhe të bisedoni me përdorues dhe grupe nën aplikacione të tjera fjalosjesh.
-\n
-\n• PRIVAT DHE I SIGURT: Mbajini bisedat tuaja të fshehta. Fshehtëzimi skaj-më-skaj i fjalës së fundit garanton që komunikimet private të mbeten private.
-\n
-\n• I HAPUR, JO I MBYLLUR: Me burim të hapur, i ngritur mbi Matrix. Jini zot i të dhënave tuaja, përmes strehimit të shërbyesit tuaj, ose duke përzgjedhur një të cilit i zini besë.
-\n
-\n• KUDO KU TË JENI: Mbani lidhjet kudo ku të jeni, me historik mesazhesh plotësisht të njëkohësuar nëpër krejt pajisjet tuaja dhe <em>online</em> te https://riot.im.</string>
-
     <string name="video_call_in_progress">Thirrje Video Në Kryerje e Sipër…</string>
 
-    <string name="store_whats_new">"Bëjmë përherë ndryshime dhe përmirësime te Element.
-Regjistri i plotë i ndryshimeve mund të gjendet këtu: %1$s.
-Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekanizmin e përditësimeve."</string>
     <string name="title_activity_keys_backup_setup">Kopjeruajtje Kyçesh</string>
     <string name="title_activity_keys_backup_restore">Përdor Kopjeruajtje Kyçesh</string>
     <string name="keys_backup_is_not_finished_please_wait">Kopjeruajtja e kyçeve s’ka përfunduar, ju lutemi, pritni…</string>
@@ -1119,7 +1088,6 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="done">U bë</string>
 
     <string name="settings_notification_advanced">Rregullime të Mëtejshme Për Njoftimet</string>
-    <string name="settings_notification_advanced_summary">Caktoni rëndësi njoftimesh sipas aktesh, formësoni tinguj, dritëza led, dridhje</string>
     <string name="settings_notification_by_event">Rëndësi njoftimi sipas aktesh</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Rregullime Vetjake.</string>
@@ -1196,7 +1164,6 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="keys_backup_recovery_code_error_decrypt">S’u shfshehtëzua dot kopjeruajtja me këtë kyç: ju lutemi, verifikoni që dhatë kyçin e duhur të rimarrjeve.</string>
 
     <string name="keys_backup_restore_success_title">Kopjeruajtja u Rikthye %s !</string>
-    <string name="keys_backup_restore_success_description">U rikthyen %1$d kyçe sesioni, dhe u shtuan %2$d kyç(e) të rinj që nuk njiheshin nga ky sesion</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">U rikthye një kopjeruajtje me %d kyç.</item>
         <item quantity="other">U rikthye një kopjeruajtje me %d kyçe.</item>
@@ -1466,12 +1433,6 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="keys_backup_unable_to_get_trust_info">Ndodhi një gabim gjatë marrjes së të dhënave të besueshmërisë</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Ndodhi një gabim teksa merreshin të dhëna kopjeruajtjeje kyçesh</string>
 
-    <string name="alpha_disclaimer_title">Mirë se vini në beta!</string>
-    <string name="alpha_disclaimer_content_line_1">Teksa Element është në fillimet e zhvillimit, disa veçori mund të mos jenë gati dhe mund të hasni të meta.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">Lista e veçorive më të reja gjendet te %1$s, dhe nëse gjeni të meta, ju lutemi, parashtroni një njoftim te menuja majtas sipër te Home, dhe do t’i ndreqim sa më shpejt të mundemi.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Përshkrim në Play Store</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Nëse gjeni të meta, ju lutemi, parashtroni një njoftim te menuja majtas sipër te Home, dhe do t’i ndreqim sa më shpejt të mundemi.</string>
-
     <string name="import_e2e_keys_from_file">Importo kyçe e2e prej kartelës \"%1$s\".</string>
 
     <string name="settings_sdk_version">Versioni Matrix SDK</string>
@@ -1503,16 +1464,6 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="settings_labs_show_hidden_events_in_timeline">Shfaq te rrjedha kohore akte të fshehura</string>
 
-    <string name="store_riotx_title">Element - Klient Matrix i Brezit të Ardhshëm</string>
-    <string name="store_riotx_short_description">Një klient më i shpejtë dhe më i lehtë për Matrix, që përdor mekanizmat më të rinj Android</string>
-    <string name="store_riotx_full_description">Element është një klient i ri për protokollin Matrix (Matrix.org): një rrjet i hapur për komunikim të sigurt, të centralizuar. Element është një rishkrim i plotë i klientit Riot Android, bazuar në një rishkrim të plotë të Matrix Android SDK-së.
-\n
-\nKlauzolë: Ky është një version beta. Element-i është ende nën zhivillim aktiv dhe përmban kufizime dhe (shpresojmë të mos jenë shumë) të meta. Mirëpresim krejt përshtypjet dhe sugjerimet!
-\n
-\nElement-i mbulon: • Hyrje në një llogari ekzistuese • Krijim dhome dhe pjesëmarrje në dhoma publike • Pranim dhe hedhje poshtë ftesash • Njohje të dhomave të përdoruesve • Parje hollësish dhome • Dërgim mesazhesh tekst • Dërgim bashkëngjitjesh • Lexim dhe shkrim mesazhesh në dhoma të fshehtëzuara • Kriptografi: kopjeruajtje kyçesh E2E, verifikim i thelluar pajisjesh, kërkesa dhe përgjigje për ndarje kyçesh • Njoftime push • Tema të Çelëta, të Errëta dhe të Zeza
-\n
-\nNë Element s’janë sendërtuar ende krejt veçoritë e Element-it. Veçori kryesore që mungojnë (dhe që do të vijnë së shpejti!): • Rregullime dhome (shfaqje anëtarësh dhome, etj.) • Thirrje • Widget-es • …</string>
-
     <string name="settings_integration_manager">Përgjegjës Integrimesh</string>
 
     <string name="integration_manager_not_configured">Pa përgjegjës Integrimesh të formësuar.</string>
@@ -1533,9 +1484,6 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="edited_suffix">(u përpunua)</string>
 
-    <string name="riotx_no_registration_notice">%1$s që të krijohet një llogari.</string>
-    <string name="riotx_no_registration_notice_colored_part">Përdor aplikacionin e dikurshëm</string>
-
 
     <string name="message_edits">Përpunime Mesazhi</string>
     <string name="no_message_edits_found">S’u gjetën përpunime</string>
@@ -1565,11 +1513,6 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="widget_integration_review_terms">Që të vazhdohet, lypset të pranoni Kushtet e këtij shërbimi.</string>
 
-    <string name="security_warning_identity_server">Versione të dikurshëm të Element-it përmbanin një të metë sigurie, e cila mund t’i lejonte Shërbyesit tuaj të Identiteteve (%1$s) hyrje në llogarinë tuaj. Nëse i besoni %2$s, mund ta shpërfillni këtë sinjalizim; përndryshe dilni nga llogaria dhe ribëni hyrjen.
-\n
-\nLexoni më tepër hollësi këtu:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="terms_of_service">Kushte Shërbimi</string>
     <string name="review_terms">Shqyrtoni Kushtet</string>
     <string name="terms_description_for_identity_server">Jini i zbulueshëm nga të tjerët</string>
@@ -1666,7 +1609,6 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="a11y_hide_password">Fshihe fjalëkalimin</string>
     <string name="a11y_jump_to_bottom">Hidhu në fund</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s dhe %3$d të tjerë të lexuar</string>
     <string name="three_users_read">%1$s, %2$s dhe %3$s të lexuar</string>
     <string name="two_users_read">%1$s dhe %2$s të lexuar</string>
     <string name="one_user_read">%s i lexuar</string>
@@ -1944,7 +1886,6 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="settings_developer_mode_fail_fast_summary">Element mund të vithiset më shpesh, kur ndodh një gabim i papritur</string>
     <string name="settings_call_ringtone_use_default_stun">Lejoni shërbyes rrugëzgjidhje asistimi thirrjesh</string>
-    <string name="command_description_verify">Kërko të verifikohet userID-ja i dhënë</string>
     <string name="command_description_shrug">Parashtoji ¯\\_(ツ)_/¯ një mesazhi tekst të thjeshtë</string>
 
     <string name="create_room_encryption_title">Aktivizoni fshehtëzim</string>
@@ -2165,7 +2106,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Kyçet janë tashmë të përditësuar!</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="settings_key_requests">Kërkesa Kyçi</string>
 
@@ -2263,7 +2204,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="settings_messages_in_e2e_group_chat">Mesazhe të fshehtëzuar te biseda në grup</string>
     <string name="settings_when_rooms_are_upgraded">Kur dhomat përditësohen</string>
     <string name="settings_troubleshoot_title">Diagnostikoje</string>
-    <string name="settings_notification_advanced_summary_riotx">Caktoni rëndësi njoftimi sipas aktesh</string>
+    <string name="settings_notification_advanced_summary">Caktoni rëndësi njoftimi sipas aktesh</string>
 
     <string name="command_description_plain">E dërgon një mesazh si tekst të thjeshtë, pa interpretuar elementët Markdown</string>
 
@@ -2305,12 +2246,12 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="change_password_summary">Caktoni një fjalëkalim të ri llogarie…</string>
 
     <string name="use_other_session_content_description">Përdorni Element-in më të ri në pajisjet tuaja të tjera, Element Web, Element Desktop, Element iOS, Element për Android, ose ose një tjetër klient Matrix i aftë për &lt;em&gt;cross-signing&lt;/em</string>
-    <string name="riot_desktop_web">Element Web
+    <string name="app_desktop_web">Element Web
 \nElement Desktop</string>
-    <string name="riot_ios_android">Element iOS
-\nElement për Android</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
     <string name="or_other_mx_capabale_client">ose një tjetër klient Matrix i aftë për &lt;em&gt;cross-signing&lt;/em</string>
-    <string name="use_latest_riot">Përdorni Element-in më të ri në pajisjet tuaja të tjera:</string>
+    <string name="use_latest_app">Përdorni Element-in më të ri në pajisjet tuaja të tjera:</string>
     <string name="command_description_discard_session_not_handled">Mbulohet vetëm për dhoma të fshehtëzuara</string>
     <string name="enter_secret_storage_passphrase_or_key">Përdorni %1$s tuaj ose përdorni %2$s tuaj që të vazhdohet.</string>
     <string name="use_recovery_key">Përdorni Kyçin Rimarrjesh</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 481e667789..f1ffb2079a 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -99,7 +99,7 @@
     <string name="action_voice_call">Röstsamtal</string>
     <string name="action_video_call">Videosamtal</string>
     <string name="action_global_search">Global sökning</string>
-    <string name="action_mark_all_as_read">Markera alla som skickade</string>
+    <string name="action_mark_all_as_read">Markera alla som lästa</string>
     <string name="action_historical">Historisk</string>
     <string name="action_quick_reply">Snabbsvar</string>
     <string name="action_mark_room_read">Markera som läst</string>
@@ -272,7 +272,6 @@
     <string name="login_error_no_homeserver_found">Det här är inte en giltig Matrixserveradress</string>
     <string name="login_error_homeserver_not_found">Kan inte nå en hemserver på den här URLen, vänligen kolla den</string>
     <string name="login_error_ssl_handshake">Din enhet använder ett utdaterat TLS-protokoll, sårbart för anfall, så för din säkerhets skull så kommer du inte kunna ansluta</string>
-    <string name="login_mobile_device">Mobil</string>
 
     <string name="login_error_forbidden">Felaktigt användarnamn/lösenord</string>
     <string name="login_error_unknown_token">Den åtkomsttoken du specificerade kändes inte igen</string>
@@ -282,10 +281,6 @@
     <string name="login_error_user_in_use">Det här användarnamnet är upptaget</string>
     <string name="login_error_login_email_not_yet">E-postlänken har inte klickats på än</string>
 
-    <string name="e2e_need_log_in_again">Du behöver logga in igen för att generera nycklar för totalsträckskryptering för den här sessionen och skicka den publika nyckeln till hemservern. 
-\nDet här behövs bara en gång. 
-\nUrsäkta för besväret.</string>
-
     <string name="e2e_re_request_encryption_key">Efterfråga krypteringsnycklarna igen från dina andra sessioner.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Nyckelförfrågan har skickats.</string>
@@ -320,7 +315,7 @@
     <string name="room_info_room_topic">Rumsämne</string>
 
     <string name="settings_call_category">Samtal</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Använd förvald Element-ringsignal för inkommande samtal</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Använd förvald Element-ringsignal för inkommande samtal</string>
     <string name="settings_call_ringtone_use_default_stun">Tillåt reservassistansserver för samtal</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Kommer att använda %s som reserv när din hemserver inte erbjuder en (din IP-adress kommer att delas under samtalet)</string>
     <string name="settings_call_ringtone_title">Ringsignal för inkommande samtal</string>
@@ -497,24 +492,12 @@
     <string name="fab_menu_create_room">Rum</string>
     <string name="fab_menu_create_chat">Direktmeddelanden</string>
 
-    <string name="alpha_disclaimer_content_line_2_gplay">Den senaste funktionslistan finns alltid i %1$s, och om du skulle hitta buggar, vänligen skicka en rapport från menyn på toppen av Hem, så fixar vi dem så fort vi kan.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Store-beskrivningen</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">Om du skulle hitta buggar, vänligen skicka en rapport från menyn på toppen av Hem, så fixar vi dem så fort vi kan.</string>
-
     <string name="send_suggestion">Ge ett förslag</string>
     <string name="send_suggestion_content">Vänligen skriv ditt förslag nedan.</string>
     <string name="send_suggestion_report_placeholder">Beskriv ditt förslag här</string>
     <string name="send_suggestion_sent">Tack, ditt förslag har skickats framgångsrikt</string>
     <string name="send_suggestion_failed">Förslaget misslyckades att skickas (%s)</string>
 
-    <string name="store_riotx_full_description">Element är en ny klient för Matrix-protokollet (Matrix.org): ett öppet nätverk för säker, decentraliserad kommunikation. Element är en komplett omskrivning av klienten Riot för Android, baserat på en komplett omskrivning av Matrix-SDK:t för Android.
-\n
-\nVarning: Detta är en betaversion. Element är för närvarande under aktiv utveckling och innehåller begränsningar och (vi hoppas inte alltför många) buggar. All feedback är välkommen!
-\n
-\nElement stöder: • Logga in med ett existerande konto • Skapa rum och gå med i publika rum • Acceptera och neka inbjudningar • Lista användares rum • Visa rumsdetaljer • Skicka textmeddelanden • Skicka bilagor • Läsa och skriva meddelanden i krypterade rum • Krypto: säkerhetskopiering av E2E-nycklar, avancerad enhetsverifiering, nyckeldelningsförfrågan och -svar • Pushnotiser • Ljust, mörkt eller svart tema
-\n
-\nInte alla funktioner i Element är implementerade i Element än. Huvudsakligen saknade (vilka kommer snart!) funktioner: • Rumsinställningar (lista rumsmedlemmar, o.s.v.) • Röstsamtal • Widgets • …</string>
-
     <string name="bottom_action_people_x">Direktmeddelanden</string>
 
     <string name="room_filtering_filter_hint">Filtrera konversationer…</string>
@@ -578,8 +561,6 @@
 
     <string name="settings_general_title">Allmänt</string>
     <string name="settings_preferences">Alternativ</string>
-    <string name="store_riotx_title">Element - Nästa generations Matrix-klient</string>
-    <string name="store_riotx_short_description">En snabbare och lättviktigare klient för Matrix som använder de senaste Android-ramverken</string>
     <string name="room_directory_search_hint">Namn eller ID (#example:matrix.org)</string>
 
     <string name="verify_cancel_other">Du kommer inte att verifiera %1$s (%2$s) om du avbryter nu. Börja igen i hens användarprofil.</string>
@@ -616,7 +597,6 @@
     <string name="settings_app_info_link_title">Appinfo</string>
     <string name="settings_app_info_link_summary">Visa info om appen i systeminställningarna.</string>
     <string name="settings_notification_advanced">Avancerade aviseringsinställningar</string>
-    <string name="settings_notification_advanced_summary">Sätt aviseringsprioritet efter händelser, konfigurera ljud, LED, vibration</string>
     <string name="settings_notification_by_event">Aviseringsprioritet för händelser</string>
 
     <string name="settings_notification_privacy">Aviseringssekretess</string>
@@ -724,9 +704,6 @@
     <string name="device_name_warning">En sessions publika namn är synligt för personer du pratar med</string>
     <string name="encryption_message_recovery">Återställning av krypterade meddelanden</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Skicka aldrig krypterade meddelanden till overifierade sessioner från den här sessionen.</string>
-    <string name="e2e_enabling_on_app_update">Element stöder nu totalsträckskryptering men du behöver logga in igen för att aktivera det.
-\n
-\nDu kan göra det nu eller senare från appinställningarna.</string>
 
     <plurals name="notification_compat_summary_title">
         <item quantity="one">%d avisering</item>
@@ -768,10 +745,6 @@
     <string name="sas_incoming_request_description">Verifiera den här sessionen för att markera den som pålitligt. Att lita på folks sessioner ger dig extra sinnesro när du skickar totalsträckskrypterade meddelanden.</string>
     <string name="sas_verified_successful_description">Säkra meddelanden mellan dig och den här användaren är totalsträckskrypterade och kommer inte att vara läsbara för tredje parter.</string>
     <string name="identity_server_not_defined">Du använder ingen identitetsserver</string>
-    <string name="security_warning_identity_server">Tidigare versioner av Element hade en säkerhetsbugg som kunde ge din identitetsserver (%1$s) tillgång till ditt konto. Om du litar på %2$s så kan du ignorera detta; annars bör du logga ut och logga in igen.
-\n
-\nLäs mer detaljer här:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
 
     <string name="settings_sdk_version">Matrix-SDK-version</string>
     <string name="settings_security_and_privacy">Säkerhet och sekretess</string>
@@ -912,7 +885,7 @@
     <string name="encryption_not_enabled">Kryptering inte aktiverat</string>
     <string name="settings_notification_configuration">Aviseringskonfiguration</string>
     <string name="settings_messages_at_room">Meddelanden som innehåller @room</string>
-    <string name="settings_notification_advanced_summary_riotx">Sätt aviseringsprioritet för händelser</string>
+    <string name="settings_notification_advanced_summary">Sätt aviseringsprioritet för händelser</string>
 
     <string name="media_file_added_to_gallery">Mediafiler tillagda till galleriet</string>
     <string name="error_adding_media_file_to_gallery">Kunde inte lägga till mediafilen till galleriet</string>
@@ -962,4 +935,174 @@
     <string name="choose_locale_other_locales_title">Andra tillgängliga språk</string>
     <string name="choose_locale_loading_locales">Laddar tillgängliga språk…</string>
 
+    <string name="play_video">Spela</string>
+    <string name="pause_video">Pausa</string>
+    <string name="dismiss">Avfärda</string>
+
+
+    <string name="action_copy">Kopiera</string>
+    <string name="dialog_title_success">Framgång</string>
+
+    <string name="bottom_action_notification">Aviseringar</string>
+    <string name="call_switch_camera">Byt kamera</string>
+    <string name="room_participants_action_ignore_prompt_msg">Att ignorera den här användaren kommer att ta bort hens meddelanden från rum ni delar.
+\n
+\nDu kan återkalla det här när som helst i de allmänna inställningarna.</string>
+    <string name="room_message_placeholder_encrypted">Skicka ett krypterat meddelande…</string>
+    <string name="room_message_placeholder_not_encrypted">Skicka ett meddelande (okrypterat)…</string>
+    <string name="room_message_file_not_found">Filen hittades inte</string>
+    <plurals name="room_new_messages_notification">
+        <item quantity="one">1 nytt meddelande</item>
+        <item quantity="other">%d nya meddelanden</item>
+    </plurals>
+
+    <string name="ssl_expected_existing_expl">Certifikatet har ändrats från en pålitligt till en som vi inte litar på. Servern kan ha förnyat sitt certifikat. Kontakta serveradministratören för det förväntade fingeravtrycket.</string>
+    <string name="room_details_settings">Inställningar</string>
+    <string name="room_sliding_menu_settings">Inställningar</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Systeminställningar.</string>
+    <string name="open_settings">Öppna inställningar</string>
+
+    <string name="settings_troubleshoot_test_account_settings_title">Kontoinställningar.</string>
+    <string name="settings_troubleshoot_test_device_settings_title">Sessionsinställningar.</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">Anpassade inställningar.</string>
+    <string name="settings_troubleshoot_test_bing_settings_quickfix">Kolla inställningar</string>
+
+    <string name="settings_notification_privacy_normal">Normal</string>
+    <string name="settings_integrations">Integrationer</string>
+    <string name="settings_integrations_summary">Använd en integrationshanterare för att hantera bottar, bryggor, widgets och klistermärkespaket.
+\nIntegrationshanterare får konfigurationsdata, och kan ändra widgets, skicka rumsinbjudningar, och ändra användarnivåer å dina vägnar.</string>
+    <string name="settings_send_message_with_enter">Skicka meddelande med retur</string>
+    <string name="settings_send_message_with_enter_summary">Returtangenten på mjukvarutangentbordet kommer att skicka ett meddelande istället för att lägga till ett radslut</string>
+
+    <string name="settings_secure_backup_section_info">Skydda dig mot att tappa åtkomst till krypterade meddelanden och data genom att säkerhetskopiera krypteringsnycklarna på din server.</string>
+    <string name="settings_integration_allow">Tillåt integrationer</string>
+    <string name="disabled_integration_dialog_title">Integrationer är avstängda</string>
+    <string name="disabled_integration_dialog_content">Aktivera \'Tillåt integrationer\' I inställningarna för att göra detta.</string>
+
+    <string name="encryption_export_room_keys_summary">Exportera nycklarna till en lokal fil</string>
+    <string name="encryption_export_saved_as">Krypteringsnycklarna har sparats till \'%s\'.
+\n
+\nVarning: den har filen kan komma att raderas om appen avinstalleras.</string>
+    <string name="encryption_import_room_keys_summary">Importera nycklarna från en lokal fil</string>
+    <string name="unknown_devices_alert_message">Det här rummet innehåller okända sessioner som inte har verifierats.
+\nDetta betyder att det inte finns någon garanti att sessionerna tillhör användarna de påstår sig göra.
+\nVi rekommenderar att du går igenom verifieringsprocessen för varje session innan du fortsätter, men du kan skicka meddelandet utan att verifiera om du föredrar.
+\n
+\nOkända sessioner:</string>
+
+    <string name="select_room_directory">Välj en rumskatalog</string>
+    <plurals name="notification_unread_notified_messages">
+        <item quantity="one">1 oläst aviserat meddelande</item>
+        <item quantity="other">%s olästa aviserade meddelanden</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages_in_room_msgs">
+        <item quantity="one">1 oläst aviserat meddelande</item>
+        <item quantity="other">%s olästa aviserade meddelanden</item>
+    </plurals>
+    <plurals name="notification_compat_summary_line_for_room">
+        <item quantity="one">%1$s: 1 meddelande</item>
+        <item quantity="other">%1$s: %2$d meddelanden</item>
+    </plurals>
+    <string name="font_size">Teckenstorlek</string>
+    <string name="tiny">Pytteliten</string>
+    <string name="small">Liten</string>
+    <string name="normal">Normal</string>
+    <string name="large">Stor</string>
+    <string name="larger">Större</string>
+    <string name="largest">Störst</string>
+    <string name="huge">Enorm</string>
+
+    <string name="room_widget_webview_access_camera">Använd kameran</string>
+    <string name="room_add_matrix_apps">Lägg till Matrix-appar</string>
+    <string name="settings_labs_native_camera">Använd den inbyggda kameran</string>
+    <string name="settings_labs_native_camera_summary">Starta systemets kamera istället för den inbyggda kameraskärmen.</string>
+    <string name="settings_labs_keyboard_options_to_send_message">Använd returtangenten för att skicka meddelande</string>
+    <string name="encrypted_message">Krypterat meddelande</string>
+
+    <string name="resource_limit_contact_action">Kontakta administratören</string>
+
+    <string name="resource_limit_contact_admin">kontakta din tjänstadministratör</string>
+
+    <string name="keys_backup_setup_step3_save_button_title">Spara som fil</string>
+    <string name="recovery_key_export_saved_as_warning">Återställningsnyckeln har sparats till \'%s\'.
+\n
+\nVarning: den har filen kan komma att raderas om appen avinstalleras.</string>
+    <string name="keys_backup_restore_setup_recovery_key">Meddelandeåterställning</string>
+
+    <string name="keys_backup_settings_delete_confirm_message">Radera dina säkerhetskopierade krypteringsnycklar från servern\? Du kommer inte längre kunna använda din återställningsnyckel för att läsa krypterad meddelandehistorik.</string>
+
+    <string name="secure_backup_banner_setup_line2">Skydda dig mot att tappa åtkomst till krypterade meddelanden och data</string>
+
+    <string name="keys_backup_banner_update_line1">Nya säkra meddelandenycklar</string>
+    <string name="sas_error_m_unexpected_message">Den här sessionen fick ett oväntat meddelande</string>
+    <string name="sas_error_m_invalid_message">Ett ogiltigt meddelande mottogs</string>
+    <string name="room_list_people_empty_body">Dina direktmeddelandekonversationer kommer att visas här</string>
+    <string name="event_redacted">Meddelande raderat</string>
+    <string name="import_e2e_keys_from_file">Importera krypteringsnycklar från filen \"%1$s\".</string>
+
+    <string name="send_file_step_encrypting_file">Krypterar fil…</string>
+    <string name="send_file_step_sending_file">Skickar fil (%1$s / %2$s)</string>
+
+    <string name="downloading_file">Laddar ner filen %1$s…</string>
+    <string name="downloaded_file">Filen %1$s har laddats ner!</string>
+
+    <string name="message_edits">Meddelanderedigeringar</string>
+    <string name="labs_merge_e2e_in_timeline">Sammanfogaren misslyckades med att avkryptera ett meddelande i tidslinjen</string>
+    <string name="add_by_matrix_id">Lägg till med Matrix-ID</string>
+    <string name="direct_room_no_known_users">Inga resultat hittade, använd \"Lägg till med Matrix-ID\" för att söka på servern.</string>
+    <string name="terms_description_for_integration_manager">Använd bottar, bryggor, widgets och klistermärkespaket</string>
+
+    <string name="settings_text_message_sent">Ett textmeddelande har skickats till %s. Vänligen skriv in verifieringskoden det innehåller.</string>
+    <string name="error_file_too_big">Filen \'%1$s\' (%2$s) är för stor för att laddas upp. Gränsen är %3$s.</string>
+
+    <string name="attachment_type_file">Fil</string>
+    <string name="attachment_type_contact">Kontakt</string>
+    <string name="attachment_type_camera">Kamera</string>
+    <string name="attachment_type_audio">Ljud</string>
+    <string name="attachment_type_gallery">Galleri</string>
+    <string name="attachment_type_sticker">Klistermärke</string>
+    <string name="command_description_spoiler">Skickar det valda meddelandet som en spoiler</string>
+    <string name="login_server_matrix_org_text">Gå med miljontals användare gratis på den största publika servern</string>
+    <string name="command_description_shrug">Lägger till ¯\\_(ツ)_/¯ till början av ett textmeddelande</string>
+
+    <string name="sent_an_audio_file">Ljud</string>
+    <string name="sent_a_file">Fil</string>
+    <string name="send_a_sticker">Klistermärke</string>
+
+    <string name="rendering_event_error_type_of_message_not_handled">Element hanterar inte meddelanden av typen \'%1$s\'</string>
+    <string name="command_description_rainbow">Skickar det valda meddelandet I regnbågsfärger</string>
+    <string name="settings_category_composer">Meddelanderedigering</string>
+
+    <string name="message_key">Meddelandenyckel</string>
+    <string name="generate_message_key">Generera en meddelandenyckel</string>
+
+    <string name="bootstrap_cancel_text">Om du avbryter nu så kan du komma att förlora krypterade meddelanden och data om du förlorar åtkomst till dina inloggade sessioner.
+\n
+\nDu kan också sätta upp säker säkerhetskopiering och hantera dina nycklar in inställningarna.</string>
+
+    <string name="settings_messages_in_e2e_one_to_one">Krypterade meddelanden i en-till-en-chattar</string>
+    <string name="settings_messages_in_e2e_group_chat">Krypterade meddelanden i gruppchattar</string>
+    <string name="settings_troubleshoot_title">Felsökning</string>
+    <string name="command_description_plain">Skicka ett meddelande som vanlig text, utan att tolka det som Markdown</string>
+
+    <string name="room_message_placeholder">Meddelande…</string>
+
+    <string name="use_file">Använd fil</string>
+
+    <string name="error_saving_media_file">Kunde inte spara mediefil</string>
+    <string name="change_password_summary">Sätt ett nytt kontolösenord…</string>
+
+    <string name="confirm_your_identity">Bekräfta din identitet genom att verifiera den här inloggningen från en av dina andra sessioner, och ge den åtkomst till dina krypterade meddelanden.</string>
+    <string name="a11y_stop_camera">Stoppa kameran</string>
+    <string name="a11y_start_camera">Starta kameran</string>
+
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Skydda dig mot att tappa åtkomst till krypterade meddelanden och data genom att säkerhetskopiera krypteringsnycklarna på din server.</string>
+    <string name="notice_crypto_unable_to_decrypt_final">Du kan inte komma åt det här meddelandet</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Väntar på det här meddelandet, det här kan ta ett tag</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Vid totalsträckskryptering så kan du behöva vänta på att någons meddelande ska komma för att krypteringsnycklarna inte har skickats till dig.</string>
+    <string name="crypto_error_withheld_blacklisted">Du kan inte komma åt det här meddelandet för att du har blockerats av avsändaren</string>
+    <string name="crypto_error_withheld_unverified">Du kan inte komma åt det här meddelandet för att avsändaren inte litar på din session</string>
+    <string name="crypto_error_withheld_generic">Du kan inte komma åt det här meddelandet för att avsändaren avsiktligt inte skickade nycklarna</string>
+    <string name="search_in_my_contacts">Sök i mina kontakter</string>
+    <string name="empty_contact_book">Din kontaktbok är tom</string>
 </resources>
diff --git a/vector/src/main/res/values-te/strings.xml b/vector/src/main/res/values-te/strings.xml
index 9d24f73512..907bc862df 100644
--- a/vector/src/main/res/values-te/strings.xml
+++ b/vector/src/main/res/values-te/strings.xml
@@ -486,10 +486,6 @@
 
     <string name="login_error_login_email_not_yet">ఇంకా నొక్కని ఇ-తపాలా లింగక</string>
 
-    <string name="e2e_need_log_in_again">ఈ పరికరం కోసం మీరు చివరికి ముగింపు ఎన్క్రిప్షన్ కీలను ఉత్పత్తి చేయడానికి తిరిగి లాగిన్ కావాలి మరియు మీ ఇంటి యజమానికి పబ్లిక్ కీని సమర్పించండి.
-\nఇది ఒక సారి.
-\nఅసౌకర్యానికి మన్నించాలి.</string>
-
     <string name="call_error_camera_init_failed">కెమెరాను ప్రారంభించడం సాధ్యపడదు</string>
     <string name="permissions_rationale_msg_storage">అటాచ్మెంట్లు పంపడానికి మరియు సేవ్ చేయడానికి మీ ఫోటో మరియు వీడియో లైబ్రరీని ప్రాప్తి చేయడానికి కలతకు అనుమతి అవసరం.
 \n
@@ -508,9 +504,6 @@
 
     <string name="encryption_information_verify_device_warning2">ఇది సరిపోలితే, దిగువ ధృవీకరించు బటన్ను నొక్కండి. అది కాకపోతే, అప్పుడు ఎవరో ఈ పరికరాన్ని అడ్డుకుంటున్నారు మరియు మీరు బహుశా బ్లాక్ బటన్ను నొక్కాలనుకుంటున్నారు.
 \nభవిష్యత్తులో ఈ ధృవీకరణ ప్రక్రియ మరింత అధునాతనంగా ఉంటుంది.</string>
-    <string name="e2e_enabling_on_app_update">రియోట్ ఇప్పుడు ఎండ్-టు-ఎండ్ ఎన్క్రిప్షన్కు మద్దతిస్తుంది, కానీ దాన్ని ఎనేబుల్ చెయ్యడానికి మీరు మళ్లీ లాగిన్ కావాలి.
-\n
-\nఅప్లికేషన్ సెట్టింగుల నుండి మీరు ఇప్పుడు లేదా తరువాత చేయవచ్చు.</string>
 
     <string name="unknown_devices_alert_message">ఈ గది లొ ధృవీకరించబడని తెలియని పరికరాలను కలిగి ఉనాయి.
 \nపరికరములు తాము చెప్పుకుంటున్న వాడుకదారులకు చెందినవి అని హామీ లేదు.
diff --git a/vector/src/main/res/values-tlh/strings.xml b/vector/src/main/res/values-tlh/strings.xml
index 3513e31dbd..407e507396 100644
--- a/vector/src/main/res/values-tlh/strings.xml
+++ b/vector/src/main/res/values-tlh/strings.xml
@@ -143,7 +143,6 @@
     <string name="auth_reset_password_missing_password">chaw\' ngoq chu\' ghItlhnISlu\'</string>
     <string name="login_error_must_start_http">bI\'reSDaq http[s]:// ghajnIS URL</string>
     <string name="login_error_invalid_home_server">URL mub yIghItlh!</string>
-    <string name="login_mobile_device">QumwI\'</string>
 
     <string name="login_error_forbidden">mubbe\' lo\'wI\' pong, chaw\' ngoq joq</string>
     <string name="auth_send_reset_email">cherqa\'bogh emayIl ngeH</string>
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index d1edb559ea..91056b7193 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -110,8 +110,8 @@
     <string name="no_room_placeholder">Oda yok</string>
     <string name="no_public_room_placeholder">Hiç girilebilir oda yok</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">kullanıcı</item>
-        <item quantity="other">kullanıcı</item>
+        <item quantity="one">1 kullanıcı</item>
+        <item quantity="other">%d kullanıcı</item>
     </plurals>
 
     <string name="groups_invite_header">Davet</string>
@@ -278,7 +278,6 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="login_error_unable_register">Kayıt olunamadı</string>
     <string name="login_error_unable_register_mail_ownership">Kayıt olunamadı: eposta sahiplik hatası</string>
     <string name="login_error_invalid_home_server">Lütfen geçerli bir URL girin</string>
-    <string name="login_mobile_device">Mobil</string>
 
     <string name="login_error_forbidden">Geçersiz kullanıcıadı/şifre</string>
     <string name="login_error_unknown_token">Erişim belirteci belirtildi ancak tanımlanamadı</string>
@@ -288,10 +287,6 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="login_error_user_in_use">Kullanıcı adı zaten kullanımda</string>
     <string name="login_error_login_email_not_yet">Eposta bağlantısına hala tıklanmadı</string>
 
-    <string name="e2e_need_log_in_again">Bu oturuma özel uçtan uca şifreleme anahtarı oluşturup, herkese açık anahtarı anamakineye yüklemek için giriş yapmanız gerekli. 
-\nBu bir kereye mahsus. 
-\nRahatsızlık için üzgünüz.</string>
-
     <string name="e2e_re_request_encryption_key">Diğer oturumlardan <u>şifreleme anahtarlarını tekrar iste</u>.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Anahtar isteği gönderildi.</string>
@@ -326,7 +321,7 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="room_info_room_topic">Oda konusu</string>
 
     <string name="settings_call_category">Aramalar</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Gelen aramalar için varsayılan Element zil sesini kullan</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Gelen aramalar için varsayılan Element zil sesini kullan</string>
     <string name="settings_call_ringtone_title">Gelen arama zil sesi</string>
     <string name="settings_call_ringtone_dialog_title">Aramalar için zil sesi seç:</string>
 
@@ -454,7 +449,7 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="room_participants_power_level_prompt">Bu işlemin geri dönüşü yok kullanıcıyı sen ile aynı erişim seviyesine getiriyorsun.
 \nEmin misin\?</string>
 
-    <string name="room_participants_ban_prompt_msg">Kullanıcıyı bu sohbetten engellemek istediğine emin misin\?</string>
+    <string name="room_participants_ban_prompt_msg">Kullanıcıyı bu engellersen bu odadan kovulacak ve bir daha giremeyecek.</string>
     <string name="reason_hint">Neden</string>
 
     <string name="room_participants_invite_prompt_msg">%s adlı kullanıcılar(ı) bu sohbete davet etmek istediğinden emin misin\?</string>
@@ -586,7 +581,6 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
 
 
     <string name="settings_notification_advanced">Gelişmiş Bildirim Ayarları</string>
-    <string name="settings_notification_advanced_summary">Bildirim önceliğini duruma göre ses, led ve titreşim olarak ayarla</string>
     <string name="settings_notification_by_event">Duruma göre bildirim önceliği</string>
 
     <string name="settings_notification_privacy">Bildirim gizliliği</string>
@@ -944,7 +938,6 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="encryption_import_import">İçe aktar</string>
     <string name="encryption_never_send_to_unverified_devices_title">Sadece doğrulanmış oturumlara şifrele</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Asla bu cihazdan doğrulanmamış oturumlara şifrelenmiş mesaj gönderme.</string>
-    <string name="encryption_import_room_keys_success">%1$d/%2$d anahtar başarı ile içe aktarıldı.</string>
 
     <string name="encryption_information_not_verified">Doğrulanmamış</string>
     <string name="encryption_information_verified">Doğrulanmış</string>
@@ -963,10 +956,6 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="encryption_information_verify_device_warning2">Eğer uyuşursa aşağıdaki doğrulama tuşuna basın. Eğer uyuşmaz ise biri bu oturum engelliyor demektir bu durumda sen o kişi karalisteye eklemelisin. Gelecekte doğrulama işlemi daha gelişmiş olacak.</string>
     <string name="encryption_information_verify_key_match">Anahtarın uyuştuğunu doğruluyorum</string>
 
-    <string name="e2e_enabling_on_app_update">Element artık uçtan-uca şifrelemeyi destekliyor ancak etkinleştirmen için tekrar giriş yapman gerekli.
-\n 
-\nBunu şimdi ya da sonra uygulama ayarlarından yapabilirsin.</string>
-
     <string name="unknown_devices_alert_title">Oda bilinmeyen oturum barındırıyor</string>
     <string name="unknown_devices_alert_message">Bu oda doğrulanmamış bilinmeyen oturum barındırıyor. 
 \nBu oturumların kullanıcıların sahip olduğu cihaz olduklarının garantisi yok. 
@@ -1162,27 +1151,6 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Geçerli Google Play Hizmetleri APK\'sı bulunamadı. Bildirimler olması gerektiği gibi çalışmayacak.</string>
 
-    <string name="store_title">Element - İletişim, senin yolunda</string>
-    <string name="store_whats_new">"Biz her zaman Element’e geliştirmeler ve değişimler yapıyoruz.
-Tam değişiklikler listesi burada bulunabilir: %1$s.
-Bir şeyleri kaçırmamak için güncellemeleri açık tutun."</string>
-    <string name="store_short_description">Evrensel senin kontrolün altında güvenli sohbet uygulaması.</string>
-    <string name="store_full_description">"Bir sohbet uygulaması, senin kontrolün altında ve tamamen esnek. Element senin istediğin şekilde iletişim kurmanı sağlar. [matrix] için yapıldı - açık, merkezi olmayan iletişim için bir standart.
-
-Ücretsiz matrix.org hesabı al, https://modular.im adresinde kendi özel sunucunu al ya da farklı bir Matrix sunucusu kullan.
-
-Neden Element’i seçmeliyim?
-
-• TAMAMEN İLETİŞİM: Takımın, arkadaşların ve topluluğun etrafında odalar oluştur - nasıl istersen! Sohbet et, dosya paylaş, widget ekle ve sesli arama yap ya da görüntülü arama yap - tamamen ücretsiz.
-
-• GÜÇLÜ ENTEGRASYON: Element’i bildiğin ve sevdiğin araçlarla kullan. Element ile farklı sohbet uygulamalarındaki kullanıcılar, gruplarla bile konuşabilirsin.
-
-• GİZLİ VE GÜVENLİ: Tartışmalarını gizli tutar. Uçtan-uca şifreleme gizli iletişimin gizli kalmasını sağlar.
-
-• AÇIK, KAPALI DEĞİL: Açık kaynaklı, ve Matrix üzerinde kuruldu. Kendi verilerine kendi sunucunu kullanarak ya da güvendiğin bir tanesini seçerek sahip ol.
-
-• OLDUĞUN HERYERDE: Tüm cihazlarında ya da çevrimiçi https://riot.im’de tamamen senkronize mesaj geçmişi ile nerede olursan ol iletişimde kal."</string>
-
     <string name="passphrase_create_passphrase">Parola oluştur</string>
     <string name="passphrase_confirm_passphrase">Parolayı doğrula</string>
     <string name="passphrase_enter_passphrase">Parolayı gir</string>
@@ -1258,7 +1226,6 @@ Neden Element’i seçmeliyim?
     <string name="keys_backup_recovery_code_error_decrypt">Yedekleme bu kurtarma anahtarı ile çözülemez: lütfen doğru kurtarma anahtarını girdiğinizi doğrulayın.</string>
 
     <string name="keys_backup_restore_success_title">Yedekleme İşlendi %s !</string>
-    <string name="keys_backup_restore_success_description">%1$d oturum anahtarı onarıldı ve bu oturum tarafından bilinmeyen %2$d yeni anahtar eklendi</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Yedekleme %d anahtarı ile işlendi.</item>
         <item quantity="other">Yedekleme %d anahtarları ile işlendi.</item>
@@ -1341,7 +1308,7 @@ Neden Element’i seçmeliyim?
     <string name="settings_background_fdroid_sync_mode_disabled">Arka plan senkronizasyonu yok</string>
     <string name="settings_set_workmanager_delay">Tercih Edilen Senkronize Aralığı</string>
     <string name="settings_set_workmanager_delay_summary">%s
-\nSenkronizasyon kaynağın (pil) yada cihazın durumuna (uyku) bağlı olarak değişebilir.</string>
+\nSenkronizasyon kaynağın (pil) ya da cihazın durumuna (uyku) bağlı olarak değişebilir.</string>
     <string name="settings_integrations">Entegrasyonlar</string>
     <string name="settings_integrations_summary">Botları, köprüleri, widget\'ları ve etiket paketlerini yönetmek için bir entegrasyon yöneticisi kullanın.
 \nEntegrasyon yöneticileri yapılandırma verilerini alır ve widget\'ları değiştirebilir, oda davetlerini gönderebilir ve sizin adınıza yetki seviyelerini ayarlayabilir.</string>
@@ -1473,7 +1440,7 @@ Neden Element’i seçmeliyim?
     <string name="sas_error_m_user">Kullanıcı doğrulamayı iptal etti</string>
     <string name="sas_error_m_timeout">Doğrulama işlemi zaman aşımına uğradı</string>
     <string name="sas_error_m_unknown_transaction">Oturum bu işlemi bilmiyor</string>
-    <string name="sas_error_m_unknown_method">Oturum anahtar anlaşması, hash, MAC, yada SAS yöntemi üzerinde anlaşamaz</string>
+    <string name="sas_error_m_unknown_method">Oturum anahtar anlaşması, hash, MAC, ya da SAS yöntemi üzerinde anlaşamaz</string>
     <string name="sas_error_m_mismatched_commitment">Hash tahaddütü eşleşmedi</string>
     <string name="sas_error_m_mismatched_sas">SAS eşleşmedi</string>
     <string name="sas_error_m_unexpected_message">Oturum beklenmeyen bir mesaj aldı</string>
@@ -1485,11 +1452,6 @@ Neden Element’i seçmeliyim?
     <string name="identity_server_not_defined">Herhangi bir kimlik sunucusu kullanmıyorsunuz</string>
     <string name="identity_server_not_defined_for_password_reset">Hiçbir kimlik sunucusu yapılandırılmamış, bu şifrenizi değiştirebilmeniz için gerekli.</string>
 
-    <string name="security_warning_identity_server">Element\'in önceki sürümlerinde, kimlik sunucunuzun (%1$s) hesabınıza erişebilmesini sağlayan bir güvenlik hatası vardı. %2$s sunucusuna güveniyorsanız, bunu göz ardı edebilirsiniz; aksi takdirde lütfen çıkış yapın ve tekrar giriş yapın.
-\n
-\nDaha fazla ayrıntıya buradan bakabilirsiniz:
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="error_user_already_logged_in">Başka bir anasunucuya bağlanmaya çalışıyorsunuz gibi görünüyor. Çıkış yapmak ister misiniz\?</string>
 
     <string name="edit">Düzenle</string>
@@ -1546,8 +1508,6 @@ Neden Element’i seçmeliyim?
     <string name="keys_backup_unable_to_get_trust_info">Güven bilgisi alınırken hata oluştu</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Anahtar yedek verileri alınırken hata oluştu</string>
 
-    <string name="alpha_disclaimer_title">Betaya hoşgeldiniz!</string>
-    <string name="alpha_disclaimer_content_line_1">Element geliştirme sürecindeyken bazı özellikler eksik olabilir ve hatalar ile karşılaşabilirsiniz.</string>
     <string name="login_error_no_homeserver_found">Bu geçerli bir Matrix sunucu adresi değil</string>
     <string name="login_error_homeserver_not_found">Bu URL ile ev-sunucusuna erişilemiyor, lütfen kontrol edin</string>
     <string name="settings_add_3pid_flow_not_supported">Bunu Element mobil ile yapamazsınız</string>
@@ -1560,4 +1520,88 @@ Neden Element’i seçmeliyim?
     <string name="settings_background_sync_update_error">Ayarlar güncellenemedi.</string>
 
 
+    <string name="play_video">Oynat</string>
+    <string name="pause_video">Durdur</string>
+    <string name="dismiss">Kapat</string>
+
+
+    <string name="action_copy">Kopyala</string>
+    <string name="dialog_title_success">Başarılı</string>
+
+    <string name="bottom_action_notification">Bildirimler</string>
+    <string name="call_failed_no_connection">Element Araması Başarısız Oldu</string>
+    <string name="call_failed_no_connection_description">Eş zamanlı bağlantı kurulamadı.
+\nAramaların hatasız çalışması için snucunuzun yöneticisinden TURN sunucusu ayarlamasını rica edin.</string>
+
+    <string name="call_select_sound_device">Ses Cihazı Seç</string>
+    <string name="sound_device_phone">Telefon</string>
+    <string name="sound_device_speaker">Hoparlör</string>
+    <string name="sound_device_headset">Kulaklık</string>
+    <string name="sound_device_wireless_headset">Kablosuz Kulaklık</string>
+    <string name="call_switch_camera">Kamerayı Değiştir</string>
+    <string name="call_camera_front">Ön</string>
+    <string name="call_camera_back">Arka</string>
+    <string name="call_format_turn_hd_off">Yüksek çözünürlüğü kapat</string>
+    <string name="call_format_turn_hd_on">Yüksek çözünürlüğü aç</string>
+
+    <string name="login_error_ssl_peer_unverified">SSL Hatası: karşınıdaki kişinin kimliği doğrulanmadı.</string>
+    <string name="login_error_ssl_other">SSL Hatası.</string>
+    <string name="settings_call_show_confirmation_dialog_title">Kazara aramayı önle</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Arama başlatmadan önce onay iste</string>
+    <string name="active_call_with_duration">Mevcut Arama (%s)</string>
+    <string name="return_to_call">Aramaya dön</string>
+
+    <string name="room_participants_action_cancel_invite">Daveti Geri Çevir</string>
+    <string name="room_participants_power_level_demote_warning_title">Kendini alçaltmak istediğinden emin misin\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Kendi yetkinizi alçalttığınız için bunu geri alma şansınız olmayacak, eğer bu odadaki son yetkili kişiyseniz yetkileri geri alma imkânınız olmayacak.</string>
+    <string name="room_participants_power_level_demote">Alçalt</string>
+
+
+    <string name="room_participants_action_ignore_title">Kullanıcıyı yoksay</string>
+    <string name="room_participants_action_ignore_prompt_msg">Bu kullanıcıyı yoksayarsanız ortak odalarınızda mesajlarını görmeyeceksiniz.
+\n
+\nBunu istediğiniz zaman genel ayarlardan geri alabilirsiniz.</string>
+    <string name="room_participants_action_unignore_title">Kullanıcıyı yoksaymaktan vazgeç</string>
+    <string name="room_participants_action_unignore_prompt_msg">Bu kullanıcıyı yoksaymaktan vazgeçerseniz tekrar tüm mesajlarını görmeye başlayacaksınız.</string>
+    <string name="room_participants_action_cancel_invite_title">Daveti geri çevir</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Bu kullanıcıdan gelen daveti geri çevirmek istediğinizden emin misiniz\?</string>
+    <string name="room_participants_kick_title">Kullanıcıyı kov</string>
+    <string name="room_participants_kick_reason">Kovma sebebi</string>
+    <string name="room_participants_kick_prompt_msg">Kullanıcıyı kovarsanız kendisi bu odadan çıkacak.
+\n
+\nEğer tekrar katılmasını engellemek istiyorsanız kovmak yerine yasaklamalısınız.</string>
+    <string name="room_participants_ban_title">Kullanıcıyı yasakla</string>
+    <string name="room_participants_ban_reason">Yasaklama sebebi</string>
+    <string name="room_participants_unban_title">Kullanıcının yasağını kaldır</string>
+    <string name="room_participants_unban_prompt_msg">Kullanıcının yasağını kaldırırsanız odaya tekrar girebilir.</string>
+
+    <string name="settings_secure_backup_section_title">Güvenli Yedek</string>
+    <string name="settings_secure_backup_manage">Yönet</string>
+    <string name="settings_secure_backup_setup">Güvenli Yedeği Ayarla</string>
+    <string name="settings_secure_backup_reset">Güvenli Yedeği Sıfırla</string>
+    <string name="settings_secure_backup_enter_to_setup">Bu cihazda ayarla</string>
+    <string name="settings_secure_backup_section_info">Şifreli mesajlarınıza ve verilerinize erişiminizin kesilmesine karşı şifreleme anahtarlarını sunucunuzda saklayan bir teminat.</string>
+    <string name="reset_secure_backup_title">Mevcut yedeğin için yeni bir Güvenlik Anahtarı oluştur veya bir Güvenlik Sözcük Grubu belirle.</string>
+    <string name="reset_secure_backup_warning">Bu, mevcut Anahtarınızı veya Sözcük Grubunuzu değiştirecek.</string>
+
+    <string name="disabled_integration_dialog_title">Entegrasyonlar kapalı</string>
+    <string name="disabled_integration_dialog_content">Bunun için ayarlardan \'Entegrasyonlara İzin Ver\'i açın.</string>
+
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">1 yasaklanmış kullanıcı</item>
+        <item quantity="other">%d yasaklanmış kullanıcı</item>
+    </plurals>
+
+    <string name="encryption_exported_successfully">Anahtarlar başarıyla dışarı aktarıldı</string>
+
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+
+    <string name="active_widget_view_action">GÖSTER</string>
+    <string name="active_widgets_title">Etkin widget\'lar</string>
+
+
+    <string name="recovery_key_export_saved">Kurtarma anahtarın kaydedildi.</string>
+
+    <string name="secure_backup_banner_setup_line1">Güvenli Yedekleme</string>
 </resources>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
old mode 100755
new mode 100644
index 3d09a7fcec..9c27392e81
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -43,7 +43,8 @@
     <string name="rename">Перейменувати</string>
     <string name="report_content">Поскаржитись на вміст</string>
     <string name="active_call">Активний виклик</string>
-    <string name="ongoing_conference_call">Відбувається конференц-дзвінок.\nПриєднатись %1$s чи %2$s.</string>
+    <string name="ongoing_conference_call">Відбувається конференц-дзвінок.
+\nПриєднатись як %1$s чи %2$s</string>
     <string name="ongoing_conference_call_voice">голосом</string>
     <string name="ongoing_conference_call_video">відео</string>
     <string name="cannot_start_call">Не вдалося здійснити виклик, спробуйте пізніше</string>
@@ -196,7 +197,6 @@
     <string name="login_error_unable_register">Збій реєстрації</string>
     <string name="login_error_unable_register_mail_ownership">Збій реєстрації: не вдалося перевірити email</string>
     <string name="login_error_invalid_home_server">Введіть дійсний URL</string>
-    <string name="login_mobile_device">Мобільний</string>
 
     <string name="login_error_forbidden">Неправильне ім\'я користувача або пароль</string>
     <string name="login_error_unknown_token">Вказаний токен доступу не розпізнано</string>
@@ -207,7 +207,6 @@
     <string name="login_error_login_email_not_yet">Ви не перейшли за посиланням в електронному листі</string>
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">Вам треба знов ся залогувати для створення E2E-ключів для цього пристрою та надсилання їх на сервер.\nЦе одноразова дія.\nВибачте за незручності.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Перегляд списку вступників</string>
@@ -305,7 +304,7 @@
 
     <string name="room_participants_online">Online</string>
     <string name="room_participants_offline">Offline</string>
-    <string name="room_participants_idle">Idle</string>
+    <string name="room_participants_idle">Перестій</string>
 
     <string name="room_participants_header_admin_tools">АДМІНІСТРУВАННЯ</string>
     <string name="room_participants_header_call">ВИКЛИК</string>
@@ -678,8 +677,6 @@
 У майбутньому цей процес верифікації стане більш складним.</string>
     <string name="encryption_information_verify_key_match">Я підтверджую, що ключі співпадають</string>
 
-    <string name="e2e_enabling_on_app_update">Тепер Element підтримує наскрізне шифрування, але вам треба залогуватися знову, щоб його увімкнути.\n\nМожете зробити це зараз або пізніше у налаштуваннях застосунку.</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Кімната містить невідомі пристрої</string>
     <string name="unknown_devices_alert_message">Кімната містить неперевірені невідомі пристрої.\nThis means there is no guarantee that the devices belong to the users they claim to.\nWe recommend you go through the verification process for each device before continuing, but you can resend the message without verifying if you prefer.\n\nUnknown devices:</string>
@@ -1107,7 +1104,7 @@
     <string name="markdown_has_been_disabled">Markdown вимкнено.</string>
 
     <string name="settings_call_category">Виклики</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Використовувати стандартний рингтон Element для вхідних викликів</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Використовувати стандартний рингтон Element для вхідних викликів</string>
     <string name="settings_call_ringtone_title">Рингтон вхідного виклику</string>
     <string name="settings_call_ringtone_dialog_title">Оберіть рингтон для викликів:</string>
 
@@ -1115,7 +1112,5 @@
 
     <string name="auth_accept_policies">Будь ласка, ознайомтесь та прийміть правила цього серверу:</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d ключ(і/ів) успішно імпортовано.</string>
-
     <string name="action_mark_room_read">Позначити як прочитане</string>
 </resources>
diff --git a/vector/src/main/res/values-v17/styles.xml b/vector/src/main/res/values-v17/styles.xml
deleted file mode 100644
index e80438a187..0000000000
--- a/vector/src/main/res/values-v17/styles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- End and Start attribute has to be set here -->
-
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-v21/dimens.xml b/vector/src/main/res/values-v21/dimens.xml
deleted file mode 100644
index 23d45d46f2..0000000000
--- a/vector/src/main/res/values-v21/dimens.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <dimen name="floating_action_button_margin">16dp</dimen>
-
-    <!-- Improve size (+20dp) to take status bar height into account -->
-    <dimen name="navigation_view_height">196dp</dimen>
-    <dimen name="navigation_avatar_top_margin">44dp</dimen>
-
-</resources>
diff --git a/vector/src/main/res/values-v21/theme_black.xml b/vector/src/main/res/values-v21/theme_black.xml
deleted file mode 100644
index 6c6d78879e..0000000000
--- a/vector/src/main/res/values-v21/theme_black.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AppTheme.Black.v21" parent="AppTheme.Base.Black">
-        <item name="android:statusBarColor">@color/riotx_header_panel_background_black</item>
-        <item name="android:navigationBarColor">@color/riotx_header_panel_background_black</item>
-
-        <!-- enable window content transitions -->
-        <item name="android:windowContentTransitions">true</item>
-
-        <!-- specify shared element enter and exit transitions -->
-        <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
-        <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
-    </style>
-
-    <style name="AppTheme.Black" parent="AppTheme.Black.v21" />
-
-</resources>
diff --git a/vector/src/main/res/values-v21/theme_common.xml b/vector/src/main/res/values-v21/theme_common.xml
deleted file mode 100644
index 45df7c0ca2..0000000000
--- a/vector/src/main/res/values-v21/theme_common.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AppTheme.Launcher.v21" parent="AppTheme.Launcher.Base">
-        <item name="android:statusBarColor">@color/riotx_accent</item>
-        <item name="android:navigationBarColor">@color/riotx_accent</item>
-    </style>
-
-    <style name="AppTheme.Launcher" parent="AppTheme.Launcher.v21"/>
-
-    <style name="AppTheme.AttachmentsPreview" parent="AppTheme.Base.Black">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-v21/theme_dark.xml b/vector/src/main/res/values-v21/theme_dark.xml
deleted file mode 100644
index 285a3a2d25..0000000000
--- a/vector/src/main/res/values-v21/theme_dark.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AppTheme.Dark.v21" parent="AppTheme.Base.Dark">
-        <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
-        <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
-
-        <!-- enable window content transitions -->
-        <item name="android:windowContentTransitions">true</item>
-
-        <!-- specify shared element enter and exit transitions -->
-        <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
-        <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
-    </style>
-
-    <style name="AppTheme.Dark" parent="AppTheme.Dark.v21" />
-
-</resources>
diff --git a/vector/src/main/res/values-v21/theme_light.xml b/vector/src/main/res/values-v21/theme_light.xml
deleted file mode 100644
index 8f52615316..0000000000
--- a/vector/src/main/res/values-v21/theme_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AppTheme.Light.v21" parent="AppTheme.Base.Light">
-        <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
-        <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
-        <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
-        <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
-
-        <!-- enable window content transitions -->
-        <item name="android:windowContentTransitions">true</item>
-
-        <!-- specify shared element enter and exit transitions -->
-        <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
-        <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
-    </style>
-
-    <style name="AppTheme.Light" parent="AppTheme.Light.v21"/>
-
-</resources>
diff --git a/vector/src/main/res/values-v21/theme_status.xml b/vector/src/main/res/values-v21/theme_status.xml
deleted file mode 100644
index 9dcd2e1d41..0000000000
--- a/vector/src/main/res/values-v21/theme_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AppTheme.Status.v21" parent="AppTheme.Base.Status">
-        <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
-        <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
-        <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
-        <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
-
-        <!-- enable window content transitions -->
-        <item name="android:windowContentTransitions">true</item>
-
-        <!-- specify shared element enter and exit transitions -->
-        <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
-        <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
-    </style>
-
-    <style name="AppTheme.Status" parent="AppTheme.Status.v21" />
-
-</resources>
diff --git a/vector/src/main/res/values-v23/theme_black.xml b/vector/src/main/res/values-v23/theme_black.xml
index 15f1881e0e..ad6abc9fbe 100644
--- a/vector/src/main/res/values-v23/theme_black.xml
+++ b/vector/src/main/res/values-v23/theme_black.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Black.v23" parent="AppTheme.Black.v21">
+    <style name="AppTheme.Black.v23" parent="AppTheme.Base.Black">
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
diff --git a/vector/src/main/res/values-v23/theme_dark.xml b/vector/src/main/res/values-v23/theme_dark.xml
index f208f6dd61..c9fb7dab28 100644
--- a/vector/src/main/res/values-v23/theme_dark.xml
+++ b/vector/src/main/res/values-v23/theme_dark.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Dark.v23" parent="AppTheme.Dark.v21">
+    <style name="AppTheme.Dark.v23" parent="AppTheme.Base.Dark">
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
diff --git a/vector/src/main/res/values-v23/theme_light.xml b/vector/src/main/res/values-v23/theme_light.xml
index 7e27b65124..283779cd47 100644
--- a/vector/src/main/res/values-v23/theme_light.xml
+++ b/vector/src/main/res/values-v23/theme_light.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Light.v23" parent="AppTheme.Light.v21">
+    <style name="AppTheme.Light.v23" parent="AppTheme.Base.Light">
         <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
diff --git a/vector/src/main/res/values-v23/theme_status.xml b/vector/src/main/res/values-v23/theme_status.xml
index b2e12ab55d..236864d4b8 100644
--- a/vector/src/main/res/values-v23/theme_status.xml
+++ b/vector/src/main/res/values-v23/theme_status.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Status.v23" parent="AppTheme.Status.v21">
+    <style name="AppTheme.Status.v23" parent="AppTheme.Base.Status">
         <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 2ef175c90a..cac1d7bd0e 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -54,7 +54,7 @@
     <string name="room_participants_offline">离线</string>
     <string name="room_menu_search">搜索</string>
     <string name="room_one_user_is_typing">%s 正在输入…</string>
-    <string name="title_activity_home">聊天</string>
+    <string name="title_activity_home">消息</string>
     <string name="title_activity_room">聊天室</string>
     <string name="title_activity_settings">设置</string>
     <string name="title_activity_member_details">成员信息</string>
@@ -160,7 +160,7 @@
     <string name="settings_advanced">高级</string>
     <string name="settings_cryptography">加密</string>
     <string name="settings_contact">本地联系人</string>
-    <string name="settings_devices_list">设备列表</string>
+    <string name="settings_devices_list">会话</string>
     <string name="devices_details_dialog_title">设备详情</string>
     <string name="devices_details_device_name">设备名称</string>
     <string name="devices_delete_pswd">密码：</string>
@@ -177,10 +177,10 @@
     <string name="encryption_information_session_id">会话 ID</string>
     <string name="encryption_information_decryption_error">解密错误</string>
 
-    <string name="encryption_information_sender_device_information">发送者的设备信息</string>
-    <string name="encryption_information_device_name">设备名称</string>
-    <string name="encryption_information_device_id">设备 ID</string>
-    <string name="encryption_information_device_key">设备密钥</string>
+    <string name="encryption_information_sender_device_information">发送者的会话信息</string>
+    <string name="encryption_information_device_name">公开名称</string>
+    <string name="encryption_information_device_id">ID</string>
+    <string name="encryption_information_device_key">会话密钥</string>
     <string name="encryption_information_verification">验证</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 指纹</string>
 
@@ -363,24 +363,24 @@
 
     <string name="encryption_information_device_info">事件信息</string>
     <string name="encryption_information_user_id">用户 ID</string>
-    <string name="encryption_export_e2e_room_keys">导出聊天室端对端加密密钥</string>
+    <string name="encryption_export_e2e_room_keys">导出端到端聊天室密钥</string>
     <string name="encryption_export_room_keys">导出聊天室密钥</string>
     <string name="encryption_export_room_keys_summary">导出密钥到本地文件</string>
     <string name="encryption_export_export">导出</string>
     <string name="passphrase_enter_passphrase">输入密码</string>
     <string name="passphrase_confirm_passphrase">确认密码</string>
-    <string name="encryption_export_saved_as">聊天室的端对端密钥已经被保存到“%s”。
+    <string name="encryption_export_saved_as">端到端聊天室密钥已经被保存到“%s”。
+\n
+\n注意：如果应用被卸载，此文件可能将会被移除。</string>
 
-注意：如果本应用程式被卸载，此文件可能将会被移除。</string>
-
-    <string name="encryption_import_e2e_room_keys">导入聊天室端对端加密密钥</string>
+    <string name="encryption_import_e2e_room_keys">导入端到端聊天室密钥</string>
     <string name="encryption_import_room_keys">导入聊天室密钥</string>
     <string name="encryption_import_room_keys_summary">从本地文件导入密钥</string>
     <string name="encryption_never_send_to_unverified_devices_title">仅向已验证的设备发送加密消息</string>
     <string name="encryption_never_send_to_unverified_devices_summary">使用本设备时，从不向未验证的设备发送加密消息。</string>
 
     <string name="encryption_information_not_verified">未验证</string>
-    <string name="encryption_information_unknown_device">未知设备</string>
+    <string name="encryption_information_unknown_device">未知会话</string>
     <string name="encryption_information_verify">验证</string>
     <string name="encryption_information_unverify">取消验证</string>
     <string name="encryption_information_verify_device">验证设备</string>
@@ -428,12 +428,12 @@
     <string name="call_error_answered_elsewhere">其他设备已接听</string>
 
     <string name="permissions_rationale_popup_title">信息</string>
-    <string name="permissions_rationale_msg_camera_explanation">
-
-请在接下来弹出的窗口中授权允许访问。</string>
-    <string name="permissions_rationale_msg_record_audio_explanation">
-
-请在接下来弹出的窗口中授权允许访问。</string>
+    <string name="permissions_rationale_msg_camera_explanation">"
+\n
+\n请在接下来弹出的窗口中授权允许访问。"</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">"
+\n
+\n请在接下来弹出的窗口中授权允许访问。"</string>
     <string name="permissions_rationale_msg_camera_and_audio">为了进行视频通话，Element 需要访问您的相机和麦克风。
 
 请在接下来弹出的窗口中授权允许访问。</string>
@@ -489,7 +489,7 @@
 
     <string name="room_settings_room_access_warning">要链接一个聊天室，必须有一个地址。</string>
     <string name="room_settings_never_send_to_unverified_devices_title">仅向已验证的设备发送加密消息</string>
-    <string name="room_settings_addresses_disable_main_address_prompt_msg">您没有指定此房间的主地址。</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_msg">您没有指定此聊天室的主地址。</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">主地址警告</string>
 
     <string name="room_settings_set_main_address">设置为主地址</string>
@@ -505,17 +505,10 @@
     <string name="encryption_information_block">列入黑名单</string>
     <string name="encryption_information_unblock">移出黑名单</string>
 
-    <string name="e2e_enabling_on_app_update">Element 目前支持端对端加密，但是您需要重新登录以启用它。
-
-您可以现在重新登录，也可以之后再从应用程序设置中选择开启。</string>
-
     <string name="ok">确认</string>
     <string name="redact">移除</string>
     <string name="send_bug_report_alert_message">您似乎沮丧地摇了摇手机。您想打开问题反馈界面吗？</string>
     <string name="send_files_in">发送至</string>
-    <string name="e2e_need_log_in_again">您需要重新登录才能为此设备生成端对端加密密钥，并将公钥提交给您的主服务器。
-这只会发生一次。
-请谅解由此造成的不便。</string>
     <string name="read_receipts_list">已读标签清单</string>
     <string name="compression_options">发送为</string>
     <string name="permissions_rationale_msg_contacts">Element 需要访问您的通讯录，才能根据电子邮箱地址和手机号码查找其他 Matrix 用户。
@@ -551,7 +544,7 @@
     <string name="room_settings_labs_pref_title">实验室</string>
     <string name="room_settings_labs_end_to_end_is_active">端对端加密已激活</string>
     <string name="failed_to_load_timeline_position">%s 已尝试在这个聊天室的时间线上加载一个特定的时间点，但无法找到它。</string>
-    <string name="encryption_information_name">名称</string>
+    <string name="encryption_information_name">公开名称</string>
     <string name="encryption_information_verify_device_warning">为验证此设备是否可信，请通过其他方式（例如面对面交换或拨打电话）与其拥有者联系，并询问他们该设备的用户设置中的密钥是否与以下密钥匹配：</string>
     <string name="encryption_information_verify_device_warning2">如果匹配，请点击下面的验证按钮。 
 \n如果不匹配，那么这可能说明其他人正在盗用此设备，而您应当将其拉入黑名单。
@@ -655,8 +648,6 @@
     <string name="dark_theme">深色主题</string>
     <string name="black_them">黑色主题</string>
 
-    <string name="login_mobile_device">移动设备</string>
-
     <string name="settings_notification_ringtone">通知声音</string>
     <string name="settings_12_24_timestamps">使用12小时制显示时间戳</string>
 
@@ -721,7 +712,7 @@
     <string name="start_voice_call_prompt_msg">您确定要发起语音通话吗？</string>
     <string name="start_video_call_prompt_msg">您确定要发起视频通话吗？</string>
 
-    <string name="room_participants_ban_prompt_msg">您确定要在这个聊天中封禁这个用户吗？</string>
+    <string name="room_participants_ban_prompt_msg">封禁踢掉将从聊天室中踢掉他们并阻止他们再次加入。</string>
 
     <string name="room_settings_all_messages">全部消息</string>
     <string name="room_settings_mention_only">只限提及</string>
@@ -841,7 +832,7 @@
     <string name="settings_opt_in_of_analytics">发送统计分析数据</string>
     <string name="settings_opt_in_of_analytics_summary">Element 会收集匿名统计数据来帮助我们改进程序。</string>
     <string name="settings_opt_in_of_analytics_prompt">请允许资料分析以帮助我们改进 Element。</string>
-    <string name="settings_opt_in_of_analytics_ok">乐意帮忙</string>
+    <string name="settings_opt_in_of_analytics_ok">是的，我愿意帮助！</string>
 
     <string name="deactivate_account_title">停用账户</string>
     <string name="deactivate_account_content">这将使您的账户永远不再可用。您将不能登录，或使用相同的用户 ID 重新注册。您的账户将退出所有已加入的聊天室，身份服务器上的账户信息也会被删除。<b>此操作是不可逆的。</b>
@@ -971,7 +962,6 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="resource_limit_hard_contact">请 %s 以继续使用本服务。</string>
 
     <string name="resource_limit_soft_contact">请 %s 以增加此限制的额度。</string>
-    <string name="encryption_import_room_keys_success">导入了 %2$d 个密钥，其中 %1$d 个导入成功。</string>
 
     <string name="status_theme">Status.im 主题</string>
 
@@ -983,7 +973,7 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="auth_accept_policies">请审阅并接受此主服务器的政策：</string>
 
     <string name="settings_call_category">通话</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">为来电使用 Element 的默认铃声</string>
+    <string name="settings_call_ringtone_use_app_ringtone">为来电使用 Element 的默认铃声</string>
     <string name="settings_call_ringtone_title">来电铃声</string>
     <string name="settings_call_ringtone_dialog_title">请选择来电铃声：</string>
 
@@ -1023,7 +1013,7 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">修复 Play 服务</string>
 
-    <string name="settings_troubleshoot_test_fcm_title">Firebase Token</string>
+    <string name="settings_troubleshoot_test_fcm_title">Firebase 令牌</string>
     <string name="settings_troubleshoot_test_fcm_success">成功获取 FCM Token：
 %1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCM Token 获取失败：
@@ -1041,7 +1031,7 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">启动服务</string>
 
     <string name="settings_labs_native_camera_summary">调用系统相机应用而非使用 Element 内置的相机界面。</string>
-    <string name="settings_labs_enable_send_voice_summary">此选项需要第三方应用程序来录制语音消息。</string>
+    <string name="settings_labs_enable_send_voice_summary">此选项需要第三方应用录制消息。</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">开机时启动</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">启用开机时启动</string>
@@ -1074,8 +1064,6 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="plus_x">+%d</string>
     <string name="generic_label_and_value">%1$s：%2$s</string>
     <string name="generic_label">%1$s：</string>
-    <string name="store_title">Element - 沟通，由你掌控</string>
-    <string name="store_short_description">一款完全由你掌控的通用安全聊天应用。</string>
     <string name="show_info_area_always">总是</string>
     <string name="show_info_area_messages_and_errors">消息与错误</string>
     <string name="show_info_area_only_errors">仅错误</string>
@@ -1118,25 +1106,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="command_problem_with_parameters">指令 %s 需要更多参数，或者有些参数不正确。</string>
     <string name="no_valid_google_play_services_apk">没有可用的 Google Play Services APK。消息通知可能不能正常工作。</string>
 
-    <string name="store_whats_new">"我们在持续改进 Element 的体验。
-完整的 changelog 在这里：%1$s。
-为了不错过新改进，请保持更新开启。"</string>
-    <string name="store_full_description">"一个聊天应用，由你掌控且完全灵活。Element 让你以你的方式沟通。为 [matrix] - 开放、去中心化的沟通而打造。
-
-获取一个免费的 matrix.org 账号，在 https://modular.im 获取一个你自己的服务器，或者使用其他 Matrix 服务器。
-
-为什么选择 Element?
-
-• 完整的沟通：围绕你的团队、你的朋友、你的社区创建聊天室 - 随你喜欢！聊天、分享文件、添加插件和语音视频通话 - 全部免费。
-
-• 强大的集成度：通过你了解和喜欢的工具来使用 Element 。你甚至可以在 Element 上与其他聊天应用的用户和群组聊天。
-
-• 隐私和安全：保守你对话的秘密。最先进的端到端加密技术可确保私密通信保持私密性。
-
-• 开放，而非封闭：开源，基于 Matrix。通过自己开设的服务器来拥有你自己的数据，或者选择你信赖的服务器。
-
-• 随处可及：在你所有的设备和线上页面 https://riot.im 上通过完整的历史信息同步让你随处可及。"</string>
-
     <string name="title_activity_keys_backup_setup">密钥备份</string>
     <string name="title_activity_keys_backup_restore">使用备份密钥</string>
 
@@ -1158,7 +1127,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
 
     <string name="action_sign_out_confirmation_simple">您确定要登出账号吗？</string>
     <string name="settings_notification_advanced">高级通知设置</string>
-    <string name="settings_notification_advanced_summary">根据事件的通知重要程度，设置声音，指示灯，震动通知</string>
     <string name="settings_notification_by_event">事件的通知重要程度</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">自定义设置。</string>
@@ -1260,7 +1228,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="keys_backup_recovery_code_error_decrypt">无法使用此恢复密钥解密备份：请检查您输入的恢复密钥是否正确。</string>
 
     <string name="keys_backup_restore_success_title">备份已恢复 %s ！</string>
-    <string name="keys_backup_restore_success_description">恢复了 %1$d 个会话密钥，并添加了 %2$d 个此设备未知的新密钥</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="other">恢复了一个包含 %d 个密钥的备份。</item>
     </plurals>
@@ -1361,7 +1328,7 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="notification_sender_me">我</string>
     <string name="notification_inline_reply_failed">** 发送失败 - 请打开聊天室</string>
 
-    <string name="error_jitsi_not_supported_on_old_device">抱歉，旧设备 （Android 系统版本低于 5.0）不支持使用 Jitsi 创建电话会议</string>
+    <string name="error_jitsi_not_supported_on_old_device">抱歉，旧设备（Android 系统版本低于 5.0）不支持使用 Jitsi 创建电话会议</string>
 
     <string name="title_activity_verify_device">验证会话</string>
 
@@ -1435,7 +1402,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="create_room_action_create">创建</string>
     <string name="create_room_name_hint">聊天室名称</string>
     <string name="create_room_directory_title">聊天室目录</string>
-    <string name="alpha_disclaimer_title">欢迎使用 测试版！</string>
     <string name="settings_sdk_version">Matrix SDK 版本</string>
     <string name="quick_reactions">快捷响应</string>
 
@@ -1458,7 +1424,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="preference_root_help_about">帮助和关于</string>
 
 
-    <string name="store_riotx_title">Element - -下一代 Matrix 客户端</string>
     <string name="edited_suffix">（已编辑）</string>
 
     <string name="none">无</string>
@@ -1470,11 +1435,11 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="people_no_identity_server">没有设置身份服务器。</string>
 
     <string name="call_failed_no_ice_title">服务器的错误配置导致通话失败</string>
-    <string name="resources_script">Latn</string>
+    <string name="resources_script">Hans</string>
 
-    <string name="call_failed_no_ice_description">请要求您的家庭服务器（%1$s）的管理员配置TURN服务器，以使通话可靠地工作。
+    <string name="call_failed_no_ice_description">请要求您的家庭服务器 (%1$s) 的管理员配置 TURN 服务器，以使通话可靠地工作。
 \n
-\n 或者，您可以尝试使用%2$s的公共服务器，但这将不那么可靠，并且它将与该服务器共享您的IP地址。 您也可以在“设置”中进行管理。</string>
+\n或者，您可以尝试使用 %2$s 的公共服务器，但这将不那么可靠，并且它将与该服务器共享您的 IP 地址。您也可以在“设置”中进行管理。</string>
     <string name="call_failed_no_ice_use_alt">尝试使用 %s</string>
     <string name="call_failed_dont_ask_again">不要再问我</string>
 
@@ -1485,4 +1450,1086 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="login_error_no_homeserver_found">這不是有效的 Matrix 服务器位置</string>
     <string name="login_error_homeserver_not_found">无法在此 URL 找到家庭服务器，请检查</string>
     <string name="settings_call_ringtone_use_default_stun">允许后备呼叫协助服务器</string>
+    <string name="play_video">播放</string>
+    <string name="pause_video">暂停</string>
+    <string name="dismiss">忽略</string>
+
+
+    <string name="action_copy">复制</string>
+    <string name="dialog_title_success">成功</string>
+
+    <string name="bottom_action_notification">通知</string>
+    <string name="call_failed_no_connection">Element 呼叫失败</string>
+    <string name="call_failed_no_connection_description">无法建立实时连接。
+\n请要求您的家庭服务器管理员配置 TURN 服务器以使通话可靠工作。</string>
+
+    <string name="call_select_sound_device">选择声音设备</string>
+    <string name="sound_device_phone">电话</string>
+    <string name="sound_device_speaker">扬声器</string>
+    <string name="sound_device_headset">耳机</string>
+    <string name="sound_device_wireless_headset">无线耳机</string>
+    <string name="call_switch_camera">切换相机</string>
+    <string name="call_camera_front">前</string>
+    <string name="call_camera_back">后</string>
+    <string name="call_format_turn_hd_off">关闭 HD</string>
+    <string name="call_format_turn_hd_on">打开 HD</string>
+
+    <string name="login_error_ssl_peer_unverified">SSL 错误：尚未验证对等端身份。</string>
+    <string name="login_error_ssl_other">SSL 错误。</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">当您的家庭服务器未提供时将使用 %s 作为辅助（在通话时将分享您的 IP 地址）</string>
+    <string name="active_call_with_duration">活动通话 (%s)</string>
+    <string name="return_to_call">返回通话</string>
+
+    <string name="invite_no_identity_server_error">在您的设置中添加身份服务器以执行此操作。</string>
+    <string name="room_participants_action_cancel_invite">取消邀请</string>
+    <string name="room_participants_power_level_demote_warning_title">降低您自己的级别？</string>
+    <string name="room_participants_power_level_demote_warning_prompt">您家无法撤销此操作因为您正在降低您的级别，如果您是聊天室中最后一个特权用户将无法恢复特权。</string>
+    <string name="room_participants_power_level_demote">降级</string>
+
+
+    <string name="room_participants_action_ignore_title">忽略用户</string>
+    <string name="room_participants_action_ignore_prompt_msg">忽略此用户将从您共享的聊天室移除他们的消息。
+\n
+\n您随时可以在通用设置中反转此操作。</string>
+    <string name="room_participants_action_unignore_title">取消忽略用户</string>
+    <string name="room_participants_action_unignore_prompt_msg">取消忽略此用户将重新显示来自他们的全部消息。</string>
+    <string name="room_participants_action_cancel_invite_title">取消邀请</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">您确定想要取消邀请此用户吗？</string>
+    <string name="room_participants_kick_title">踢掉用户</string>
+    <string name="room_participants_kick_reason">踢掉理由</string>
+    <string name="room_participants_kick_prompt_msg">踢掉用户将从此聊天室移除他们。
+\n
+\n为防止他们再次加入，您应当封禁他们。</string>
+    <string name="room_participants_ban_title">封禁用户</string>
+    <string name="room_participants_ban_reason">封禁理由</string>
+    <string name="room_participants_unban_title">取消封禁用户</string>
+    <string name="room_participants_unban_prompt_msg">取消封禁用户将允许他们再次加入聊天室。</string>
+
+    <string name="settings_add_3pid_confirm_password_title">确认您的密码</string>
+    <string name="settings_add_3pid_flow_not_supported">您无法在 Element 移动版中这么做</string>
+    <string name="settings_add_3pid_authentication_needed">需要身份认证</string>
+
+
+    <string name="settings_background_fdroid_sync_mode">后台同步模式（实验性）</string>
+    <string name="settings_background_fdroid_sync_mode_battery">电池优化</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element 将在后台以保留设备有限资源（电池）的方式同步。
+\n取决于您的设备资源状态，同步可能被操作系统推迟。</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">实时优化</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element 将在后台定期准时同步（可配置）。
+\n这将影响网络和电池的使用，将显示一个永久通知表明 Element 正在监听事件。</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">无后台同步</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">应用在后台时您不会收到消息通知。</string>
+    <string name="settings_background_sync_update_error">更新设置失败。</string>
+
+
+    <string name="settings_set_workmanager_delay">偏好同步间隔</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\n取决于资源（电量）或设备状态（睡眠）同步可能会延迟。</string>
+    <string name="settings_integrations">集成</string>
+    <string name="settings_integrations_summary">使用集成管理器管理机器人，桥接，部件和贴纸包。
+\n集成管理器接收配置数据，可以代表您修改部件，发送聊天室邀请及设置特权等级。</string>
+    <string name="settings_secure_backup_section_title">安全备份</string>
+    <string name="settings_secure_backup_manage">管理</string>
+    <string name="settings_secure_backup_setup">设置安全备份</string>
+    <string name="settings_secure_backup_reset">重置安全备份</string>
+    <string name="settings_secure_backup_enter_to_setup">在此设备上设置</string>
+    <string name="settings_secure_backup_section_info">通过在您的服务器上备份加密密钥保障加密消息和数据的访问权。</string>
+    <string name="reset_secure_backup_title">为您已有的备份生成新的安全密钥或设置新的安全口令。</string>
+    <string name="reset_secure_backup_warning">这将替换您的当前密钥或短语。</string>
+
+    <string name="settings_discovery_category">发现</string>
+    <string name="settings_discovery_manage">管理您的发现设置。</string>
+    <string name="settings_integration_allow">允许集成</string>
+    <string name="settings_integration_manager">集成管理器</string>
+
+    <string name="disabled_integration_dialog_title">集成已禁用</string>
+    <string name="disabled_integration_dialog_content">请在设置中启用“允许集成”。</string>
+
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="other">%d 个封禁用户</item>
+    </plurals>
+
+    <string name="encryption_information_device_name_with_warning">公开名称（对通信参与者可见）</string>
+    <string name="device_name_warning">会话的公开名称对通信的参与者可见</string>
+    <string name="encryption_exported_successfully">成功导出密钥</string>
+
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+
+    <string name="active_widget_view_action">查看</string>
+    <string name="active_widgets_title">活动小部件</string>
+
+
+    <string name="room_widget_activity_title">小部件</string>
+    <string name="room_widget_permission_title">载入小部件</string>
+    <string name="room_widget_permission_added_by">此小部件添加者：</string>
+    <string name="room_widget_permission_webview_shared_info_title">使用它会设置 cookie 并与 %s 分享数据：</string>
+    <string name="room_widget_permission_shared_info_title">使用它会与 %s 分享数据：</string>
+    <string name="room_widget_failed_to_load">无法载入小部件。
+\n%s</string>
+    <string name="room_widget_reload">重载小部件</string>
+    <string name="room_widget_open_in_browser">在浏览器中打开</string>
+    <string name="room_widget_revoke_access">撤消我的访问权限</string>
+
+    <string name="room_widget_permission_display_name">您的昵称</string>
+    <string name="room_widget_permission_avatar_url">您的头像 URL</string>
+    <string name="room_widget_permission_user_id">您的用户 ID</string>
+    <string name="room_widget_permission_theme">您的主题</string>
+    <string name="room_widget_permission_widget_id">小部件 ID</string>
+    <string name="room_widget_permission_room_id">聊天室 ID</string>
+
+
+    <string name="room_widget_resource_permission_title">小部件想使用以下资源：</string>
+    <string name="room_widget_resource_grant_permission">允许</string>
+    <string name="room_widget_resource_decline_permission">阻止全部</string>
+    <string name="room_widget_webview_access_camera">使用相机</string>
+    <string name="room_widget_webview_access_microphone">使用麦克风</string>
+    <string name="room_widget_webview_read_protected_media">读取受 DRM 保护的媒体</string>
+
+    <string name="integration_manager_not_configured">未配置集成管理器。</string>
+    <string name="widget_integration_review_terms">若要继续请接受服务条款。</string>
+
+    <string name="recovery_key_export_saved">恢复密钥已保存。</string>
+
+    <string name="keys_backup_setup_override_backup_prompt_tile">您的家庭服务器上已存在备份</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">您似乎已在另一个会话中设置密钥备份。您想要将其替换为正在创建的吗？</string>
+    <string name="secure_backup_banner_setup_line1">安全备份</string>
+    <string name="secure_backup_banner_setup_line2">保护加密信息及数据的访问权</string>
+
+    <string name="secure_backup_setup">设置安全备份</string>
+
+    <string name="invalid_or_expired_credentials">由于无效或过期的凭据您已登出。</string>
+
+    <string name="sas_incoming_request_description">验证会话已将其标记为可信。当使用端到端加密消息时信任参与者的会话将给您额外的内心平静。</string>
+    <string name="sas_incoming_request_description_2">验证会话将标记其为可信，同时将您的会话对对方标记为可信。</string>
+
+    <string name="sas_emoji_description">通过确认以下表情符号出现在对方的屏幕上来验证此会话</string>
+    <string name="sas_decimal_description">通过确认屏幕上对方显示以下数字来验证此会话</string>
+
+    <string name="sas_incoming_verification_request_dialog">您收到传入验证请求。</string>
+    <string name="sas_verified_successful_description">与此用户的安全消息端到端加密，无法被第三方读取。</string>
+    <string name="sas_cancelled_by_other">对方取消了验证。
+\n%s</string>
+    <string name="sas_cancelled_by_me">验证已取消。
+\n理由：%s</string>
+
+    <string name="sas_error_m_user">用户已取消验证</string>
+    <string name="sas_error_m_timeout">验证过程超时</string>
+    <string name="sas_error_m_unknown_transaction">会话不知此事务</string>
+    <string name="sas_error_m_unknown_method">会话无法就密钥协商，哈希值，MAC，或 SAS 方法达成共识</string>
+    <string name="sas_error_m_mismatched_commitment">哈希承诺不匹配</string>
+    <string name="sas_error_m_mismatched_sas">SAS 不匹配</string>
+    <string name="sas_error_m_unexpected_message">会话收到意外消息</string>
+    <string name="sas_error_m_invalid_message">收到一条无效消息</string>
+    <string name="sas_error_m_key_mismatch">密钥不匹配</string>
+    <string name="sas_error_m_user_error">用户不匹配</string>
+    <string name="identity_server_not_defined">您未使用身份服务器</string>
+    <string name="identity_server_not_defined_for_password_reset">未配置身份服务器，需要重置您的密码。</string>
+
+    <string name="error_user_already_logged_in">您似乎正在试图连接到另一个家庭服务器。您想要登出吗？</string>
+
+    <string name="room_list_empty">加入一个聊天室开始使用应用。</string>
+    <string name="room_list_catchup_empty_title">您已经跟上了！</string>
+    <string name="room_list_catchup_empty_body">您没有未读消息</string>
+    <string name="room_list_catchup_welcome_body">从这里跟上未读消息</string>
+    <string name="room_list_people_empty_body">您的私聊消息将在此处显示</string>
+    <string name="room_list_rooms_empty_body">您的聊天室将在此显示</string>
+
+    <string name="event_redacted">消息已删除</string>
+    <string name="settings_show_redacted">显示已移除消息</string>
+    <string name="settings_show_redacted_summary">对已移除消息显示占位符</string>
+    <string name="event_redacted_by_admin_reason">聊天室管理员主持的事件</string>
+    <string name="last_edited_info_message">最后由 %1$s 编辑于 %2$s</string>
+
+
+    <string name="malformed_message">格式错误事件，无法显示</string>
+    <string name="error_no_network">无网络。请检查您的网络连接。</string>
+    <string name="change_room_directory_network">更改网络</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Element 尚不支持公开聊天室预览</string>
+
+    <string name="fab_menu_create_chat">私聊消息</string>
+
+    <string name="create_room_title">新聊天室</string>
+    <string name="create_room_public_title">公开</string>
+    <string name="create_room_public_description">任何人都可以加入此聊天室</string>
+    <string name="create_room_directory_description">将此聊天室发布到聊天室目录</string>
+
+    <string name="keys_backup_unable_to_get_trust_info">获取信任信息时发生错误</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">获取密钥备份数据时发生错误</string>
+
+    <string name="import_e2e_keys_from_file">从文件 \"%1$s\" 导入端到端密钥。</string>
+
+    <string name="settings_other_third_party_notices">其他第三方通知</string>
+    <string name="navigate_to_room_when_already_in_the_room">您已经在查看此聊天室！</string>
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">注册令牌</string>
+
+    <string name="send_suggestion">提出建议</string>
+    <string name="send_suggestion_content">请在下方写下您的建议。</string>
+    <string name="send_suggestion_report_placeholder">请在此描述您的建议</string>
+    <string name="send_suggestion_sent">谢谢，建议已成功发送</string>
+    <string name="send_suggestion_failed">建议发送失败 (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">在时间线上显示隐藏事件</string>
+
+    <string name="bottom_action_people_x">私聊消息</string>
+
+    <string name="send_file_step_idle">正在等待…</string>
+    <string name="send_file_step_encrypting_thumbnail">正在加密缩略图…</string>
+    <string name="send_file_step_sending_thumbnail">正在发送缩略图 (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">正在加密文件…</string>
+    <string name="send_file_step_sending_file">正在发送文件 (%1$s / %2$s)</string>
+
+    <string name="downloading_file">正在下载文件 %1$s…</string>
+    <string name="downloaded_file">"文件 %1$s  已下载！"</string>
+
+    <string name="message_edits">消息编辑</string>
+    <string name="no_message_edits_found">未找到编辑</string>
+
+    <string name="room_filtering_filter_hint">过滤对话…</string>
+    <string name="room_filtering_footer_title">找不到您要找的？</string>
+    <string name="room_filtering_footer_create_new_room">创建新聊天室</string>
+    <string name="room_filtering_footer_create_new_direct_message">发送新私聊消息</string>
+    <string name="room_filtering_footer_open_room_directory">查看聊天室目录</string>
+
+    <string name="room_directory_search_hint">名称或 ID (#example:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">在时间线中启用滑动回复</string>
+    <string name="labs_merge_e2e_in_timeline">在时间线中合并解密失败消息</string>
+    <string name="labs_show_unread_notifications_as_tab">在主屏幕上添加未读通知选项卡。</string>
+
+    <string name="link_copied_to_clipboard">链接已复制到剪贴板</string>
+
+    <string name="add_by_matrix_id">通过 matrix ID 添加</string>
+    <string name="creating_direct_room">正在创建聊天室…</string>
+    <string name="direct_room_no_known_users">无结果，使用通过 matrix ID 添加在服务器上搜索。</string>
+    <string name="direct_room_start_search">开始输入以获得结果</string>
+    <string name="direct_room_filter_hint">按用户名或 ID 过滤…</string>
+
+    <string name="joining_room">正在加入聊天室…</string>
+
+    <string name="message_view_edit_history">查看编辑历史</string>
+
+    <string name="terms_of_service">服务条款</string>
+    <string name="review_terms">审核条款</string>
+    <string name="terms_description_for_identity_server">可被其他人发现</string>
+    <string name="terms_description_for_integration_manager">使用机器人，小部件和贴纸包</string>
+
+    <string name="read_at">已读于</string>
+
+
+    <string name="identity_server">身份服务器</string>
+    <string name="disconnect_identity_server">断开身份服务器</string>
+    <string name="add_identity_server">配置身份服务器</string>
+    <string name="change_identity_server">更改身份服务器</string>
+    <string name="settings_discovery_identity_server_info">您正在使用 %1$s 与您知道的现有联系人相互发现。</string>
+    <string name="settings_discovery_identity_server_info_none">您当前未使用身份服务器。若要与您知道的现有联系人相互发现，请在下方配置。</string>
+    <string name="settings_discovery_emails_title">可发现电子邮件地址</string>
+    <string name="settings_discovery_no_mails">发现选项将在您添加电子邮件后出现。</string>
+    <string name="settings_discovery_no_msisdn">发现选项将在您添加电话号码后出现。</string>
+    <string name="settings_discovery_disconnect_identity_server_info">与您的身份服务器断开意味着您将无法被其它用户发现并且无法通过电子邮件和电话邀请他人。</string>
+    <string name="settings_discovery_msisdn_title">可发现电话号码</string>
+    <string name="settings_discovery_confirm_mail">我们向 %s 给您发送了确认电子邮件，检查您的电子邮件并点击确认链接</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">我们向 %s 给您发送了确认电子邮件，请先检查您的电子邮件并点击确认链接</string>
+    <string name="settings_discovery_mail_pending">正在等待</string>
+
+    <string name="settings_discovery_enter_identity_server">输入身份服务器 URL</string>
+    <string name="settings_discovery_bad_identity_server">无法连接到身份服务器</string>
+    <string name="settings_discovery_please_enter_server">请输入身份服务器 url</string>
+    <string name="settings_discovery_no_terms_title">身份服务器无服务条款</string>
+    <string name="settings_discovery_no_terms">您选择的身份服务器无任何服务条款。仅在您信任服务所有者时继续</string>
+    <string name="settings_text_message_sent">已向 %s 发送文字消息。请输入它包含的验证码。</string>
+    <string name="settings_text_message_sent_wrong_code">验证码不正确。</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">您当前在身份服务器 %1$s 上分享电子邮件地址或电话号码。您需要重连接 %2$s 已停止分享。</string>
+    <string name="settings_agree_to_terms">同意身份服务器 (%s) 服务条款使您可以通过电子邮件地址或电话号码被发现。</string>
+
+    <string name="labs_allow_extended_logging">启用详细日志。</string>
+    <string name="labs_allow_extended_logging_summary">当您发送 RageShake 时详细日志将帮助开发者提供更多日志。即使启用，应用也不会记录消息内容或任何其他私有数据。</string>
+
+
+    <string name="error_terms_not_accepted">接收您的家庭服务器条款和条件后请重试。</string>
+
+    <string name="error_network_timeout">服务器似乎响应时间太长，这可能是由于连接不良或服务器错误引起的。 请稍后再试。</string>
+
+    <string name="send_attachment">发送附件</string>
+
+    <string name="a11y_open_drawer">打开导航菜单</string>
+    <string name="a11y_create_menu_open">打开创建聊天室菜单</string>
+    <string name="a11y_create_menu_close">关闭创建聊天室菜单…</string>
+    <string name="a11y_create_direct_message">创建新的私聊对话</string>
+    <string name="a11y_create_room">创建新聊天室</string>
+    <string name="a11y_close_keys_backup_banner">关闭密钥备份横幅</string>
+    <string name="a11y_show_password">显示密码</string>
+    <string name="a11y_hide_password">隐藏密码</string>
+    <string name="a11y_jump_to_bottom">跳到底部</string>
+
+    <string name="three_users_read">%1$s，%2$s 和 %3$s 已读</string>
+    <string name="two_users_read">%1$s 和 %2$s 已读</string>
+    <string name="one_user_read">%s 已读</string>
+    <plurals name="fallback_users_read">
+        <item quantity="other">%d 个用户已读</item>
+    </plurals>
+
+    <string name="error_file_too_big">上传文件 \'%1$s\' (%2$s) 过大。限制为 %3$s。</string>
+
+    <string name="error_attachment">获取附件时出错。</string>
+    <string name="attachment_type_file">文件</string>
+    <string name="attachment_type_contact">联系人</string>
+    <string name="attachment_type_camera">相机</string>
+    <string name="attachment_type_audio">音频</string>
+    <string name="attachment_type_gallery">相册</string>
+    <string name="attachment_type_sticker">贴纸</string>
+    <string name="error_handling_incoming_share">无法处理共享数据</string>
+
+    <string name="uploads_media_title">媒体</string>
+    <string name="uploads_media_no_result">此聊天室中无媒体</string>
+    <string name="uploads_files_title">文件</string>
+    <string name="uploads_files_subtitle">%1$s 于 %2$s</string>
+    <string name="uploads_files_no_result">此聊天室中无文件</string>
+
+    <string name="report_content_spam">垃圾信息</string>
+    <string name="report_content_inappropriate">不合适的内容</string>
+    <string name="report_content_custom">自定义报告……</string>
+    <string name="report_content_custom_title">报告此内容</string>
+    <string name="report_content_custom_hint">报告此内容的理由</string>
+    <string name="report_content_custom_submit">报告</string>
+    <string name="block_user">屏蔽用户</string>
+
+    <string name="content_reported_title">内容已报告</string>
+    <string name="content_reported_content">此内容已报告。
+\n
+\n如果您不希望再看到此用户的更多内容，您可以屏蔽他以隐藏他的信息</string>
+    <string name="content_reported_as_spam_title">报告为垃圾信息</string>
+    <string name="content_reported_as_spam_content">此内容已报告为垃圾信息。
+\n
+\n如果您不希望再看到此用户的更多内容，您可以屏蔽他以隐藏他的信息</string>
+    <string name="content_reported_as_inappropriate_title">报告为不合适的内容</string>
+    <string name="content_reported_as_inappropriate_content">此内容已报告为不合适。
+\n
+\n如果您不希望再看到此用户的更多内容，您可以屏蔽他以隐藏他的信息</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Element 需要权限在磁盘上保存您的端到端密钥。
+\n
+\n请在下个弹窗中允许访问以便手动导出密钥。</string>
+
+    <string name="no_network_indicator">目前没有网络连接</string>
+
+    <string name="message_ignore_user">屏蔽用户</string>
+
+    <string name="room_list_quick_actions_notifications_all_noisy">全部消息（嘈杂）</string>
+    <string name="room_list_quick_actions_notifications_all">全部消息</string>
+    <string name="room_list_quick_actions_notifications_mentions">仅提到我的</string>
+    <string name="room_list_quick_actions_notifications_mute">静音</string>
+    <string name="room_list_quick_actions_settings">设置</string>
+    <string name="room_list_quick_actions_favorite_add">添加到收藏</string>
+    <string name="room_list_quick_actions_favorite_remove">从收藏中移除</string>
+    <string name="room_list_quick_actions_leave">离开聊天室</string>
+    <string name="notice_member_no_changes">%1$s 未做更改</string>
+    <string name="notice_member_no_changes_by_you">您未做更改</string>
+    <string name="no_ignored_users">您未忽略任何用户</string>
+
+    <string name="help_long_click_on_room_for_more_options">长按聊天室查看更多选项</string>
+
+
+    <string name="room_join_rules_public">%1$s 将聊天室设为对任何知道链接的用户公开。</string>
+    <string name="room_join_rules_public_by_you">您将聊天室设为对任何知道链接的用户公开。</string>
+    <string name="room_join_rules_invite">%1$s 将聊天室设为仅限邀请。</string>
+    <string name="room_join_rules_invite_by_you">您将聊天室设为仅限邀请。</string>
+    <string name="timeline_unread_messages">未读消息</string>
+
+    <string name="login_splash_title">这是你的对话。拥有它。</string>
+    <string name="login_splash_text1">与人们私聊或群聊</string>
+    <string name="login_splash_text2">通过加密保证对话私密</string>
+    <string name="login_splash_text3">扩展 &amp; 自定义您的体验</string>
+    <string name="login_splash_submit">开始吧</string>
+
+    <string name="login_server_title">选择服务器</string>
+    <string name="login_server_text">就像电子邮件，账户有一个家，尽管您可以与任何人聊天</string>
+    <string name="login_server_matrix_org_text">在最大的公共服务器上免费加入数百万用户</string>
+    <string name="login_server_modular_text">面向组织的高级托管</string>
+    <string name="login_server_modular_learn_more">了解更多</string>
+    <string name="login_server_other_title">其他</string>
+    <string name="login_server_other_text">自定义 &amp; 高级设置</string>
+
+    <string name="login_continue">继续</string>
+    <string name="login_connect_to">连接到 %1$s</string>
+    <string name="login_connect_to_modular">连接到 Element Matrix 服务</string>
+    <string name="login_connect_to_a_custom_server">连接到自定义服务器</string>
+    <string name="login_signin_to">登入 %1$s</string>
+    <string name="login_signup">注册</string>
+    <string name="login_signin">登入</string>
+    <string name="login_signin_sso">使用单点登录继续</string>
+
+    <string name="login_server_url_form_modular_hint">Element Matrix 服务地址</string>
+    <string name="login_server_url_form_other_hint">地址</string>
+    <string name="login_server_url_form_modular_text">面向组织的高级托管</string>
+    <string name="login_server_url_form_modular_notice">输入 Modular Element 或您想使用的服务器地址</string>
+    <string name="login_server_url_form_other_notice">输入您想要连接的服务器或 Element 的地址</string>
+    <string name="login_server_url_form_common_notice">输入您想使用的服务器的地址</string>
+
+    <string name="login_sso_error_message">载入页面时出错：%1$s (%2$d)</string>
+    <string name="login_mode_not_supported">应用无法登录到此家庭服务器。家庭服务器支持以下登录类型：%1$s。
+\n
+\n您想要通过网页客户端登录吗？</string>
+    <string name="login_registration_disabled">抱歉，此服务器不接受新账户。</string>
+    <string name="login_registration_not_supported">应用无法再次服务器上创建账户。
+\n
+\n您想要通过网页客户端注册吗？</string>
+
+    <string name="login_login_with_email_error">电子邮件未关联到任何账户。</string>
+
+    <string name="login_reset_password_on">在 %1$s 上重置密码</string>
+    <string name="login_reset_password_notice">验证邮件将发送到您的收件箱以确认设置您的新密码。</string>
+    <string name="login_reset_password_submit">下一个</string>
+    <string name="login_reset_password_email_hint">电子邮件</string>
+    <string name="login_reset_password_password_hint">新密码</string>
+
+    <string name="login_reset_password_warning_title">注意！</string>
+    <string name="login_reset_password_warning_content">更改您的密码将重置所有会话上的端到端加密密钥，从而使加密聊天记录无法读取。在重设密码之前，请设置“密钥备份”或从另一个会话中导出聊天室密钥。</string>
+    <string name="login_reset_password_warning_submit">继续</string>
+
+    <string name="login_reset_password_error_not_found">电子邮件未链接到任何账户</string>
+
+    <string name="login_reset_password_mail_confirmation_title">检查您的收件箱</string>
+    <string name="login_reset_password_mail_confirmation_notice">验证电子邮件已发送到 %1$s。</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">点击链接以确认您的新密码。跟随包含的链接验证后，请点击下方。</string>
+    <string name="login_reset_password_mail_confirmation_submit">我已验证我的电子邮件地址</string>
+
+    <string name="login_reset_password_success_title">成功！</string>
+    <string name="login_reset_password_success_notice">您的密码已重置。</string>
+    <string name="login_reset_password_success_notice_2">您已登出全部会话，不会再接收到推送通知。若要重新启用通知，请在每个设备上再次登录。</string>
+    <string name="login_reset_password_success_submit">返回登录</string>
+
+    <string name="login_reset_password_cancel_confirmation_title">注意</string>
+    <string name="login_reset_password_cancel_confirmation_content">您的密码尚未更改。
+\n
+\n是否中止密码更改过程？</string>
+
+    <string name="login_set_email_title">设置电子邮件地址</string>
+    <string name="login_set_email_notice">设置电子邮件用于恢复您的帐户。之后，您可以选择允许您认识的人通过电子邮件发现您。</string>
+    <string name="login_set_email_mandatory_hint">电子邮件</string>
+    <string name="login_set_email_optional_hint">电子邮件（可选）</string>
+    <string name="login_set_email_submit">下一个</string>
+
+    <string name="login_set_msisdn_title">设置电话号码</string>
+    <string name="login_set_msisdn_notice">设置电话号码，以选择允许您认识的人发现您。</string>
+    <string name="login_set_msisdn_notice2">请使用国际格式。</string>
+    <string name="login_set_msisdn_mandatory_hint">电话号码</string>
+    <string name="login_set_msisdn_optional_hint">电话号码（可选）</string>
+    <string name="login_set_msisdn_submit">下一个</string>
+
+    <string name="login_msisdn_confirm_title">确认电话号码</string>
+    <string name="login_msisdn_confirm_notice">我们向 %1$s 发送了验证码。在下方输入它以验证您的身份。</string>
+    <string name="login_msisdn_confirm_hint">输入验证码</string>
+    <string name="login_msisdn_confirm_send_again">重新发送</string>
+    <string name="login_msisdn_confirm_submit">下一个</string>
+
+    <string name="login_msisdn_error_not_international">国际电话号码必须以 ‘+’ 开头</string>
+    <string name="login_msisdn_error_other">电话号码似乎无效。请检查</string>
+
+    <string name="login_signup_to">在 %1$s 上注册</string>
+    <string name="login_signin_username_hint">用户名或电子邮件</string>
+    <string name="login_signup_username_hint">用户名</string>
+    <string name="login_signup_password_hint">密码</string>
+    <string name="login_signup_submit">下一个</string>
+    <string name="login_signup_error_user_in_use">用户名已占用</string>
+    <string name="login_signup_cancel_confirmation_title">注意</string>
+    <string name="login_signup_cancel_confirmation_content">您的帐户尚未创建。
+\n
+\n是否中止注册过程？</string>
+
+    <string name="login_a11y_choose_matrix_org">选择 matrix.org</string>
+    <string name="login_a11y_choose_modular">选择 Element Matrix Services</string>
+    <string name="login_a11y_choose_other">选择自定义家庭服务器</string>
+    <string name="login_a11y_captcha_container">请进行人机验证</string>
+    <string name="login_terms_title">接受条款以继续</string>
+
+    <string name="login_wait_for_email_title">请检查您的电子邮件</string>
+    <string name="login_wait_for_email_notice">我们向 %1$s 发送了电子邮件。
+\n请点击其中包含的链接继续账户创建。</string>
+    <string name="login_validation_code_is_not_correct">输入的验证码不正确。请检查。</string>
+    <string name="login_error_outdated_homeserver_title">过时的家庭服务器</string>
+    <string name="login_error_outdated_homeserver_content">此家庭服务器运行的版本过旧以至于无法连接。要求您的家庭服务器管理员升级。</string>
+
+    <plurals name="login_error_limit_exceeded_retry_after">
+        <item quantity="other">发送了太多请求。您可以在 %1$d 秒后重试…</item>
+    </plurals>
+
+    <string name="login_connect_using_matrix_id_notice">或者，如果您已经拥有账户并知道您的 Matrix 标识符和密码，您可以使用这种方式：</string>
+    <string name="login_connect_using_matrix_id_submit">使用 Matrix ID 登录</string>
+    <string name="login_signin_matrix_id_title">使用 Matrix ID 登录</string>
+    <string name="login_signin_matrix_id_notice">如果您在家庭服务器上设置了账户，在下方使用您的 Matrix ID（例 @user:domain.com）和密码。</string>
+    <string name="login_signin_matrix_id_hint">Matrix ID</string>
+    <string name="login_signin_matrix_id_password_notice">如果您不知道您的密码，返回并重置。</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">这不是一个有效的用户标识符。期望的格式：\'@user:homeserver.org\'</string>
+    <string name="autodiscover_well_known_error">无法找到有效的家庭服务器。请检查您的标识符</string>
+
+    <string name="signed_out_title">您已登出</string>
+    <string name="signed_out_notice">这可能由于多种原因：
+\n
+\n• 您已在其他会话中更改了您的密码。
+\n
+\n• 您已从其他会话删除了此会话。
+\n
+\n• 您的服务器管理员出于安全原因已取消您的访问权限。</string>
+    <string name="signed_out_submit">重新登入</string>
+
+    <string name="soft_logout_title">您已登出</string>
+    <string name="soft_logout_signin_title">登入</string>
+    <string name="soft_logout_signin_notice">您的家庭服务器 (%1$s) 管理员将您从您的账户 %2$s (%3$s) 登出。</string>
+    <string name="soft_logout_signin_e2e_warning_notice">登录以恢复仅存储在此设备上的加密密钥。 您需要使用它们在任何设备上阅读所有安全消息。</string>
+    <string name="soft_logout_signin_submit">登入</string>
+    <string name="soft_logout_signin_password_hint">密码</string>
+    <string name="soft_logout_clear_data_title">清除个人数据</string>
+    <string name="soft_logout_clear_data_notice">注意：您的个人数据（包括加密密钥）仍存储在此设备上。
+\n
+\n如果您不再使用此设备，或想登入另一个帐户，请清除它。</string>
+    <string name="soft_logout_clear_data_submit">清除全部数据</string>
+
+    <string name="soft_logout_clear_data_dialog_title">清除数据</string>
+    <string name="soft_logout_clear_data_dialog_content">是否清除当前存储在此设备上的全部数据？
+\n再次登入以访问您的帐户数据和消息。</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">除非您登入以恢复加密密钥，否则您将无法访问安全消息。</string>
+    <string name="soft_logout_clear_data_dialog_submit">清除数据</string>
+    <string name="soft_logout_sso_not_same_user_error">当前会话用于用户 %1$s 而您提供了用户 %2$s 的凭证。Element 不支持此功能。
+\n请先清除数据，然后重新登入另一个账户。</string>
+
+    <string name="permalink_malformed">您的 matrix.to 链接更是不正确</string>
+    <string name="bug_report_error_too_short">描述太短</string>
+
+    <string name="notification_initial_sync">初始同步…</string>
+
+    <string name="settings_show_devices_list">查看我的全部会话</string>
+    <string name="settings_advanced_settings">高级设置</string>
+    <string name="settings_developer_mode">开发者模式</string>
+    <string name="settings_developer_mode_summary">开发者模式激活隐藏的功能，也可能使应用不稳定。仅供开发者使用！</string>
+    <string name="settings_rageshake">摇一摇</string>
+    <string name="settings_rageshake_detection_threshold">检测阈值</string>
+    <string name="settings_rageshake_detection_threshold_summary">摇动手机以测试检测阈值</string>
+    <string name="rageshake_detected">检测到摇动！</string>
+    <string name="settings">设置</string>
+    <string name="devices_current_device">当前会话</string>
+    <string name="devices_other_devices">其他会话</string>
+
+    <string name="autocomplete_limited_results">仅显示第一个结果，请输入更多字符…</string>
+
+    <string name="settings_developer_mode_fail_fast_title">快速失败</string>
+    <string name="settings_developer_mode_fail_fast_summary">发生意外错误时，Element 可能更经常崩溃</string>
+
+    <string name="command_description_shrug">在明文消息前添加 ¯\\_(ツ)_/¯</string>
+
+    <string name="create_room_encryption_title">启用加密</string>
+    <string name="create_room_encryption_description">一旦启用，加密无法禁用。</string>
+
+    <string name="login_error_threepid_denied">您的电子邮件域无权注册此服务器</string>
+
+    <string name="verification_conclusion_warning">不可信登入</string>
+    <string name="verification_sas_match">匹配</string>
+    <string name="verification_sas_do_not_match">不匹配</string>
+    <string name="verify_user_sas_emoji_help_text">确认下方独特表情以相同顺序出现在他们的屏幕上，以验证此用户。</string>
+    <string name="verify_user_sas_emoji_security_tip">为了获得最高的安全性，请使用其他可信通信方式或亲自确认。</string>
+    <string name="verification_green_shield">寻找绿色盾牌以确保用户可信。信任聊天室中的所有用户以确保聊天室的安全。</string>
+
+    <string name="verification_conclusion_not_secure">不安全</string>
+    <string name="verification_conclusion_compromised">以下其中一项可能会受到威胁：
+\n
+\n - 您的家庭服务器
+\n - 您验证的用户连接到的家庭服务器
+\n - 您或其它用户的网络连接
+\n - 您或其他用户的设备</string>
+
+    <string name="sent_a_video">视频。</string>
+    <string name="sent_an_image">图片。</string>
+    <string name="sent_an_audio_file">音频</string>
+    <string name="sent_a_file">文件</string>
+    <string name="send_a_sticker">贴纸</string>
+
+    <string name="verification_request_waiting">正在等待…</string>
+    <string name="verification_request_other_cancelled">%s 已取消</string>
+    <string name="verification_request_you_cancelled">您已取消</string>
+    <string name="verification_request_other_accepted">%s 已接受</string>
+    <string name="verification_request_you_accepted">您已接受</string>
+    <string name="verification_sent">验证已发送</string>
+    <string name="verification_request">验证请求</string>
+    <string name="verification_verify_device">验证此会话</string>
+    <string name="verification_verify_device_manually">手动验证</string>
+
+    <string name="you">您</string>
+
+    <string name="verification_scan_notice">使用其他用户的设备扫描此码以安全地相互验证</string>
+    <string name="verification_scan_their_code">扫描他们的码</string>
+    <string name="verification_scan_emoji_title">无法扫描</string>
+    <string name="verification_scan_emoji_subtitle">如果您不在现场，请比较表情符号</string>
+
+    <string name="verification_no_scan_emoji_title">通过比较表情符号验证</string>
+
+    <string name="verify_by_emoji_title">通过表情验证</string>
+    <string name="verify_by_emoji_description">如果您无法扫描上方的码，通过比较简短独特的表情序列验证。</string>
+
+    <string name="a13n_qr_code_description">二维码图片</string>
+
+    <string name="verification_verify_user">验证 %s</string>
+    <string name="verification_verified_user">已验证 %s</string>
+    <string name="verification_request_waiting_for">正在等待 %s…</string>
+    <string name="verification_request_alert_description">为了提高安全性，请通过检查两个设备上的一次性代码来验证 %s。
+\n
+\n为了获得最大的安全性，请亲自进行。</string>
+    <string name="room_profile_not_encrypted_subtitle">此聊天室的消息不是端到端加密。</string>
+    <string name="room_profile_encrypted_subtitle">该聊天室的消息端到端加密。
+\n
+\n您的消息使用锁进行保护，只有您和接收者才能使用唯一的密钥解锁。</string>
+    <string name="room_profile_section_security">安全</string>
+    <string name="room_profile_section_security_learn_more">了解更多</string>
+    <string name="room_profile_section_more">更多</string>
+    <string name="room_profile_section_admin">管理员操作</string>
+    <string name="room_profile_section_more_settings">聊天室设置</string>
+    <string name="room_profile_section_more_notifications">通知</string>
+    <plurals name="room_profile_section_more_member_list">
+        <item quantity="other">%1$d 人</item>
+    </plurals>
+    <string name="room_profile_section_more_uploads">上传</string>
+    <string name="room_profile_section_more_leave">离开聊天室</string>
+    <string name="room_profile_leaving_room">正在离开聊天室…</string>
+
+    <string name="room_member_power_level_admins">管理员</string>
+    <string name="room_member_power_level_moderators">审查员</string>
+    <string name="room_member_power_level_custom">自定义</string>
+    <string name="room_member_power_level_invites">邀请</string>
+    <string name="room_member_power_level_users">用户</string>
+
+    <string name="room_member_power_level_admin_in">%1$s 管理员</string>
+    <string name="room_member_power_level_moderator_in">%1$s 审查员</string>
+    <string name="room_member_power_level_default_in">%1$s 默认权限</string>
+    <string name="room_member_power_level_custom_in">%2$s 自定义权限 (%1$d)</string>
+
+    <string name="rendering_event_error_type_of_event_not_handled">Element 无法处理 \'%1$s\' 类型事件</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element 无法处理 \'%1$s\' 类型消息</string>
+    <string name="rendering_event_error_exception">Element 在渲染 id 为 \'%1$s\' 的事件内容时遇到了一个问题</string>
+
+    <string name="unignore">取消忽略</string>
+
+    <string name="verify_cannot_cross_sign">该会话无法与您的其他会话共享此验证。
+\n验证将保存在本地，并在此应用的未来版本中共享。</string>
+
+    <string name="room_list_sharing_header_recent_rooms">最近使用的聊天室</string>
+    <string name="room_list_sharing_header_other_rooms">其他聊天室</string>
+
+    <string name="command_description_rainbow">发送彩虹色给定消息</string>
+    <string name="command_description_rainbow_emote">发送彩虹色给定表情</string>
+
+    <string name="settings_category_timeline">时间线</string>
+
+    <string name="settings_category_composer">消息编辑器</string>
+
+    <string name="room_settings_enable_encryption">启用端到端加密</string>
+    <string name="room_settings_enable_encryption_warning">一旦启用，加密无法禁用。</string>
+
+    <string name="room_settings_enable_encryption_dialog_title">是否启用加密？</string>
+    <string name="room_settings_enable_encryption_dialog_content">启用后，将无法禁用聊天室加密。服务器无法看到加密聊天室中发送的消息，只有聊天室的参与者才能看到。启用加密可能会阻止许多机器人和桥接正常工作。</string>
+    <string name="room_settings_enable_encryption_dialog_submit">启用加密</string>
+
+    <string name="verification_request_notice">为保证安全，通过检查一次性代码验证 %s。</string>
+    <string name="verification_request_start_notice">为保证安全，亲自或使用其他通信方式验证。</string>
+
+    <string name="verification_emoji_notice">比较独特表情，确保它们以相同顺序出现。</string>
+    <string name="verification_code_notice">与其他用户设备上显示的代码比较。</string>
+    <string name="verification_conclusion_ok_notice">与此用户的消息端到端加密，无法被第三方读取。</string>
+    <string name="verification_conclusion_ok_self_notice">您的新会话已验证。它可以访问您的加密消息，其他用户会将其视为可信。</string>
+
+    <string name="encryption_information_cross_signing_state">交叉签名</string>
+    <string name="encryption_information_dg_xsigning_complete">交叉签名已启用
+\n设备上的私钥。</string>
+    <string name="encryption_information_dg_xsigning_trusted">交叉签名已启用
+\n密钥可信。
+\n私钥未知</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">交叉签名已启用。
+\n密钥不可信</string>
+    <string name="encryption_information_dg_xsigning_disabled">交叉签名未启用</string>
+
+    <string name="settings_hs_admin_e2e_disabled">您的服务器管理员已默认禁用私有聊天室和私聊消息端到端加密。</string>
+    <string name="settings_active_sessions_list">激活会话</string>
+    <string name="settings_active_sessions_show_all">显示全部会话</string>
+    <string name="settings_active_sessions_manage">管理会话</string>
+    <string name="settings_active_sessions_signout_device">登出此会话</string>
+
+    <string name="settings_failed_to_get_crypto_device_info">加密信息不可用</string>
+
+    <string name="settings_active_sessions_verified_device_desc">此会话对安全消息可信因为您已验证它：</string>
+    <string name="settings_active_sessions_unverified_device_desc">验证此会话以将其标记为可信，并授予其访问加密消息的权限。如果您未登录此会话，则您的帐户可能已被盗：</string>
+
+    <plurals name="settings_active_sessions_count">
+        <item quantity="other">%d 个活动会话</item>
+    </plurals>
+
+    <string name="crosssigning_verify_this_session">验证此登录</string>
+    <string name="crosssigning_other_user_not_trust">其他用户可能不信任它</string>
+    <string name="complete_security">完善安全</string>
+
+    <string name="verification_open_other_to_verify">使用现有会话来验证此会话，并授予其访问加密消息的权限。</string>
+
+
+    <string name="verification_profile_verify">验证</string>
+    <string name="verification_profile_verified">已验证</string>
+    <string name="verification_profile_warning">注意</string>
+
+    <string name="room_member_profile_failed_to_get_devices">无法获取会话</string>
+    <string name="room_member_profile_sessions_section_title">会话</string>
+    <string name="trusted">可信</string>
+    <string name="not_trusted">不可信</string>
+
+    <string name="verification_profile_device_verified_because">此会话对加密消息可信，%1$s (%2$s) 已验证它：</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) 使用新会话登入：</string>
+    <string name="verification_profile_device_untrust_info">在此用户信任此会话之前，发送到该会话和从该会话发送的消息均标有警告。或者，您可以手动进行验证。</string>
+
+
+    <string name="initialize_cross_signing">初始化交叉签名</string>
+    <string name="reset_cross_signing">重置密钥</string>
+
+    <string name="a11y_qr_code_for_verification">二维码</string>
+
+    <string name="qr_code_scanned_by_other_notice">快要完成了！%s 显示相同的盾牌了吗？</string>
+    <string name="qr_code_scanned_by_other_yes">使</string>
+    <string name="qr_code_scanned_by_other_no">否</string>
+
+    <string name="no_connectivity_to_the_server_indicator">到服务器的连接已丢失</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">飞行模式已打开</string>
+
+    <string name="settings_dev_tools">开发工具</string>
+    <string name="settings_account_data">账户数据</string>
+    <plurals name="poll_info">
+        <item quantity="other">%d 票</item>
+    </plurals>
+    <plurals name="poll_info_final">
+        <item quantity="other">%d 票 - 最终结果</item>
+    </plurals>
+    <string name="poll_item_selected_aria">已选选项</string>
+    <string name="command_description_poll">创建简单调查</string>
+    <string name="verification_cannot_access_other_session">使用恢复短语或密钥</string>
+    <string name="verification_use_passphrase">如果您无法访问已有会话</string>
+
+    <string name="new_signin">新登入</string>
+
+    <string name="enter_secret_storage_invalid">无法在存储中找到秘密</string>
+    <string name="enter_secret_storage_passphrase">输入秘密存储密码</string>
+    <string name="enter_secret_storage_passphrase_warning">注意：</string>
+    <string name="enter_secret_storage_passphrase_warning_text">您应仅在可信设备上访问秘密存储</string>
+
+    <string name="message_action_item_redact">移除…</string>
+    <string name="share_confirm_room">您想要发送此附件到 %1$s 吗？</string>
+    <plurals name="send_images_with_original_size">
+        <item quantity="other">发送原始尺寸图片</item>
+    </plurals>
+
+    <string name="delete_event_dialog_title">确认移除</string>
+    <string name="delete_event_dialog_content">您确实想要移除（删除）此事件吗？注意如果您删除聊天室名或话题更改，可以撤销更改。</string>
+    <string name="delete_event_dialog_reason_checkbox">附加理由</string>
+    <string name="delete_event_dialog_reason_hint">编辑理由</string>
+
+    <string name="event_redacted_by_user_reason_with_reason">事件被用户删除，理由：%1$s</string>
+    <string name="login_default_session_public_name">Element Android</string>
+
+    <string name="settings_key_requests">密钥请求</string>
+
+    <string name="e2e_use_keybackup">解锁加密消息历史</string>
+
+    <string name="refresh">刷新</string>
+
+    <string name="new_session">新登录。是您吗？</string>
+    <string name="new_session_review">轻按以审核和验证</string>
+    <string name="verify_new_session_notice">使用此会话验证新的会话，授权访问加密消息。</string>
+    <string name="verify_new_session_was_not_me">这不是我</string>
+    <string name="verify_new_session_compromized">您的账户可能已被盗用</string>
+
+    <string name="verify_cancel_self_verification_from_untrusted">如果您取消，您将无法在此设备上读取加密消息，其他用户不会信任它</string>
+    <string name="verify_cancel_self_verification_from_trusted">如果您取消，您将无法在新设备上读取加密消息，其他用户不会信任它</string>
+    <string name="verify_cancel_other">如果您现在取消将不会验证 %1$s (%2$s)。在他们的用户个人档案中重新开始。</string>
+
+    <string name="verify_not_me_self_verification">以下其中一项可能有风险：
+\n
+\n- 您的密码
+\n- 您的家庭服务器
+\n- 此设备或其它设备
+\n- 设备使用的网络连接
+\n
+\n我们推荐您在设置中立即更换您的密码和恢复密钥。</string>
+
+    <string name="verify_cancelled_notice">通过设置验证您的设备。</string>
+    <string name="verification_cancelled">验证已取消</string>
+
+    <string name="recovery_passphrase">恢复密码</string>
+    <string name="message_key">消息密钥</string>
+    <string name="account_password">账户密码</string>
+
+    <string name="set_recovery_passphrase">设置一个 %s</string>
+    <string name="generate_message_key">生成消息密钥</string>
+
+    <string name="confirm_recovery_passphrase">确认 %s</string>
+
+    <string name="enter_account_password">输入您的 %s 以继续。</string>
+
+    <string name="bootstrap_info_confirm_text">再次输入您的 %s 确认。</string>
+    <string name="bootstrap_dont_reuse_pwd">不要使用您的账户密码。</string>
+
+    <string name="bootstrap_info_text_2">输入只有你知道的安全口令，用于保护服务器上的秘密。</string>
+
+    <string name="bootstrap_loading_text">这可能会花费数秒，请耐心等待。</string>
+    <string name="bootstrap_loading_title">设置恢复。</string>
+    <string name="your_recovery_key">您的恢复密钥</string>
+    <string name="bootstrap_finish_title">完成了！</string>
+    <string name="keep_it_safe">保持安全</string>
+    <string name="finish">完成</string>
+
+    <string name="bootstrap_save_key_description">使用此 %1$s 作为安全网以防您忘记您的 %2$s。</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">发布创建的身份密钥</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">从密码生成安全密钥</string>
+    <string name="bootstrap_crosssigning_progress_default_key">正在定义 SSSS 默认密钥</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">正在同步主密钥</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">正在同步用户密钥</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">正在同步自签名密钥</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">正在设置密钥备份</string>
+
+
+    <string name="bootstrap_cross_signing_success">您的 %2$s 和 %1$s 已设置。
+\n
+\n请安全地保管它。如果您丢失了全部活动会话您将需要使用它们解锁加密消息和安全信息。</string>
+
+    <string name="bootstrap_crosssigning_print_it">将它打印出来并存放在安全的地方</string>
+    <string name="command_description_spoiler">发送爆雷信息</string>
+    <string name="spoiler">爆雷</string>
+    <string name="reaction_search_type_hint">输入关键字以查找表情。</string>
+
+    <string name="seen_by">已阅</string>
+
+    <string name="room_member_jump_to_read_receipt">跳至已读回执</string>
+
+    <string name="event_redacted_by_admin_reason_with_reason">事件被聊天室管理员调整，理由：%1$s</string>
+
+    <string name="keys_backup_restore_success_title_already_up_to_date">密钥已是最新！</string>
+
+    <string name="bootstrap_info_text">保护与解锁已加密信息并信任%s。</string>
+    <string name="bootstrap_crosssigning_save_usb">保存到优盘或者备份盘</string>
+    <string name="bootstrap_crosssigning_save_cloud">复制到您的个人云存储</string>
+
+    <string name="auth_flow_not_supported">您无法在移动设备上执行此操作</string>
+
+    <string name="bootstrap_skip_text">设置恢复密码让您能够保护和解锁加密信息并信任设备。
+\n
+\n如果您不希望设置文本密码，那么生成密钥亦可。</string>
+    <string name="bootstrap_skip_text_no_gen_key">设置恢复密码让您能够保护和解锁加密信息并信任设备。</string>
+    <string name="bootstrap_cancel_text">如果您现在取消，那么当您失去登录权限时也会丢失加密的信息和数据。
+\n
+\n您也可以通过设置菜单来建立保护备份以及管理您的密钥。</string>
+
+    <string name="encryption_enabled">加密开启</string>
+    <string name="encryption_enabled_tile_description">本聊天室信息已经端对端加密。验证成员时，请查看其个人档案以了解更多信息。</string>
+    <string name="encryption_not_enabled">加密未开启</string>
+    <string name="encryption_unknown_algorithm_tile_description">不支持本聊天室使用的加密方式</string>
+
+    <string name="room_created_summary_item">%s 创建并配置了聊天室。</string>
+    <string name="room_created_summary_item_by_you">您创建并配置了聊天室。</string>
+
+    <string name="qr_code_scanned_self_verif_notice">接近完成！另外的设备是否正显示相同的盾牌图标？</string>
+    <string name="qr_code_scanned_verif_waiting_notice">接近完成！等候确认……</string>
+    <string name="qr_code_scanned_verif_waiting">正在等候 %s…</string>
+
+    <string name="error_failed_to_import_keys">导入密钥失败</string>
+
+    <string name="settings_notification_configuration">通知配置</string>
+    <string name="settings_messages_in_e2e_one_to_one">一对一聊天的加密信息</string>
+    <string name="settings_messages_in_e2e_group_chat">群聊的加密信息</string>
+    <string name="settings_messages_at_room">消息包含 @room</string>
+    <string name="settings_when_rooms_are_upgraded">当聊天室升级</string>
+    <string name="settings_troubleshoot_title">故障诊断</string>
+    <string name="settings_notification_advanced_summary">按事件设置通知重要性</string>
+
+    <string name="command_description_plain">以纯文本形式发送消息，而不将其解释为 markdown</string>
+
+    <string name="auth_invalid_login_param_space_in_password">用户名和/或密码不正确。输入的密码以空格开头或结尾，请检查。</string>
+    <string name="auth_invalid_login_deactivated_account">此帐户已停用。</string>
+
+    <string name="room_message_placeholder">消息…</string>
+
+    <string name="upgrade_security">加密升级可用</string>
+    <string name="setup_cross_signing">启用交叉签名</string>
+    <string name="security_prompt_text">验证您自己和其他人以保证您的聊天安全</string>
+
+    <string name="bootstrap_enter_recovery">输入您的 %s 以继续</string>
+    <string name="use_file">使用文件</string>
+
+    <string name="enter_backup_passphrase">输入 %s</string>
+    <string name="backup_recovery_passphrase">恢复密码</string>
+    <string name="bootstrap_invalid_recovery_key">无效的恢复密钥</string>
+    <string name="recovery_key_empty_error_message">请输入恢复密钥</string>
+
+    <string name="bootstrap_progress_checking_backup">检查备份密钥</string>
+    <string name="bootstrap_progress_checking_backup_with_info">检查备份密钥 (%s)</string>
+    <string name="bootstrap_progress_compute_curve_key">获取曲线密钥</string>
+    <string name="bootstrap_progress_generating_ssss">从密码生成 SSSS 密钥</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">从密码生成 SSSS 密钥 (%s)</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">从恢复密钥生成 SSSS 密钥</string>
+    <string name="bootstrap_progress_storing_in_sss">正在在 SSSS 中保存密钥备份秘密</string>
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+
+    <string name="bootstrap_migration_enter_backup_password">输入您的密钥备份密码以继续。</string>
+    <string name="bootstrap_migration_use_recovery_key">使用您的密钥备份恢复密钥</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">不知道您的密钥备份密码，您可以 %s。</string>
+    <string name="bootstrap_migration_backup_recovery_key">密钥备份恢复密钥</string>
+
+    <string name="settings_security_prevent_screenshots_title">阻止应用内屏幕截图</string>
+    <string name="settings_security_prevent_screenshots_summary">启用此设置添加 FLAG_SECURE 到所有活动。重启应用使更改生效。</string>
+
+    <string name="media_file_added_to_gallery">媒体文件已添加到相册</string>
+    <string name="error_adding_media_file_to_gallery">无法添加媒体文件到相册</string>
+    <string name="error_saving_media_file">无法保存媒体文件</string>
+    <string name="change_password_summary">选择新的账户密码…</string>
+
+    <string name="use_other_session_content_description">在您的其他设备上使用最新的 Element，Element Web，Element Desktop，Element iOS，Element for Android，或其他能够交叉签名的 Matrix 客户端</string>
+    <string name="app_desktop_web">Element Web
+\nElement Desktop</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
+    <string name="or_other_mx_capabale_client">或其他能够交叉签名的 Matrix 客户端</string>
+    <string name="use_latest_app">在您的其他设备上使用最新的 Element：</string>
+    <string name="command_description_discard_session">强制丢弃加密聊天室中的当前出站群组会话</string>
+    <string name="command_description_discard_session_not_handled">仅在加密聊天室中支持</string>
+    <string name="enter_secret_storage_passphrase_or_key">使用您的 %1$s 或使用您的 %2$s 继续。</string>
+    <string name="use_recovery_key">使用恢复密钥</string>
+    <string name="enter_secret_storage_input_key">选择您的恢复密钥，或手动输入或从剪贴板粘贴</string>
+    <string name="keys_backup_recovery_key_error_decrypt">无法使用此恢复密钥解密备份：请确认您输入了正确的恢复密钥。</string>
+    <string name="failed_to_access_secure_storage">访问安全存储失败</string>
+
+    <string name="unencrypted">未加密</string>
+    <string name="encrypted_unverified">由未验证设备加密</string>
+    <string name="review_logins">查看您的登入位置</string>
+    <string name="verify_other_sessions">验证您的全部会话确保您的账户和消息安全</string>
+    <string name="verify_this_session">验证访问您的账户的新登录：%1$s</string>
+
+    <string name="cross_signing_verify_by_text">使用文本手动验证</string>
+    <string name="crosssigning_verify_session">验证登录</string>
+    <string name="cross_signing_verify_by_emoji">使用表情交互式验证</string>
+    <string name="confirm_your_identity">通过从您的其他会话验证此登录确认您的身份，授权它访问您的加密消息。</string>
+    <string name="mark_as_verified">标记为可信</string>
+
+    <string name="error_empty_field_choose_user_name">请选择用户名。</string>
+    <string name="error_empty_field_choose_password">请选择密码。</string>
+    <string name="external_link_confirmation_title">仔细检查此链接</string>
+    <string name="external_link_confirmation_message">链接 %1$s 正在将您带到另一个站点：%2$s。
+\n
+\n您确定想要继续吗？</string>
+
+    <string name="create_room_dm_failure">我们无法创建您的私聊消息。请检查您要邀请的用户并重试。</string>
+
+    <string name="add_members_to_room">添加成员</string>
+    <string name="invite_users_to_room_action_invite">邀请</string>
+    <string name="inviting_users_to_room">正在邀请用户…</string>
+    <string name="invite_users_to_room_title">邀请用户</string>
+    <string name="invitation_sent_to_one_user">邀请已发送到 %1$s</string>
+    <string name="invitations_sent_to_two_users">邀请已发送到 %1$s 和 %2$s</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="other">邀请已发送到 %1$s 和 %2$s 等</item>
+    </plurals>
+    <string name="invite_users_to_room_failure">我们无法邀请用户，请检查您想要邀请的用户并重试。</string>
+
+    <string name="choose_locale_current_locale_title">当前语言</string>
+    <string name="choose_locale_other_locales_title">其他可用语言</string>
+    <string name="choose_locale_loading_locales">正在载入可用语言…</string>
+
+    <string name="open_terms_of">打开 %s 条款</string>
+    <string name="disconnect_identity_server_dialog_content">是否从身份服务器 %s 断开？</string>
+    <string name="identity_server_error_outdated_identity_server">身份服务器已过期。Element 仅支持 API V2。</string>
+    <string name="identity_server_error_outdated_home_server">无法执行此操作。家庭服务器已过期。</string>
+    <string name="identity_server_error_no_identity_server_configured">请先配置身份服务器。</string>
+    <string name="identity_server_error_terms_not_signed">请先在设置中接受身份服务器的条款。</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">为了您的隐私，Element 仅支持发送用户电子邮件和电话号码的哈希值。</string>
+    <string name="identity_server_error_binding_error">关联失败。</string>
+    <string name="identity_server_error_no_current_binding_error">此标识符无当前关联。</string>
+
+    <string name="identity_server_set_default_notice">您的家庭服务器 (%1$s) 建议使用 %2$s 作为您的身份服务器</string>
+    <string name="identity_server_set_default_submit">使用 %1$s</string>
+    <string name="identity_server_set_alternative_notice">或者，您可以输入任何其他身份服务器 URL</string>
+    <string name="identity_server_set_alternative_notice_no_default">输入身份服务器 URL</string>
+    <string name="identity_server_set_alternative_submit">提交</string>
+    <string name="power_level_edit_title">设置角色</string>
+    <string name="power_level_title">角色</string>
+    <string name="a11y_open_chat">打开聊天</string>
+    <string name="a11y_mute_microphone">静音麦克风</string>
+    <string name="a11y_unmute_microphone">取消静音麦克风</string>
+    <string name="a11y_stop_camera">停止相机</string>
+    <string name="a11y_start_camera">启动相机</string>
+
+    <string name="settings_setup_secure_backup">设置安全备份</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">安全备份</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">通过在您的服务器上备份加密密钥防止丢失对加密消息和数据的访问。</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">设置</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">使用安全密钥</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">生成安全密钥存储在安全的地方如密码管理器或保险箱。</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">使用安全口令</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">输入仅有您知道的安全口令，生成备份用的密钥。</string>
+
+    <string name="bottom_sheet_save_your_recovery_key_title">保存您的安全密钥</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">将您的安全密钥存储在安全的地方如密码管理器或保险箱。</string>
+
+    <string name="set_a_security_phrase_title">设置安全口令</string>
+    <string name="set_a_security_phrase_notice">输入只有您知道的安全口令，用于保护您的服务器上的秘密。</string>
+    <string name="set_a_security_phrase_hint">安全口令</string>
+    <string name="set_a_security_phrase_again_notice">再次输入您的安全口令以确认。</string>
+
+    <string name="save_your_security_key_title">保存您的安全密钥</string>
+    <string name="save_your_security_key_notice">将您的安全密钥存储在安全的地方如密码管理器或保险箱。</string>
+
+    <string name="room_settings_name_hint">聊天室名称</string>
+    <string name="room_settings_topic_hint">主题</string>
+    <string name="room_settings_save_success">您已成功更改聊天室设置</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">您无法访问此消息</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">正在等待此消息，可能会花费一些时间</string>
+    <string name="crypto_utd">无法解密</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">由于端到端加密，您可能需要等待某人的消息到达因为加密密钥未正确发送给您。</string>
+    <string name="crypto_error_withheld_blacklisted">您无法访问此消息因为您已屏蔽此发送者</string>
+    <string name="crypto_error_withheld_unverified">您无法访问此消息因为您的会话不被发送者信任</string>
+    <string name="crypto_error_withheld_generic">您无法访问此消息因为发送者有意不发送密钥</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">正在等待加密历史</string>
+
+    <string name="element_disclaimer_title">Riot 现在是 Element！</string>
+    <string name="element_disclaimer_content">我们兴奋地宣布我们改名了！您的应用已经是最新的并且您已登入您的帐户。</string>
+    <string name="element_disclaimer_negative_button">明白了</string>
+    <string name="element_disclaimer_positive_button">了解更多</string>
+
+    <string name="element_login_splash_brand">element</string>
+
+
+    <string name="save_recovery_key_chooser_hint">将恢复密钥保存到</string>
+
+    <string name="add_from_phone_book">从我的电话簿添加</string>
+    <string name="empty_phone_book">您的电话簿是空的</string>
+    <string name="phone_book_title">电话簿</string>
+    <string name="search_in_my_contacts">搜索我的联系人</string>
+    <string name="loading_contact_book">正在获取您的联系人…</string>
+    <string name="empty_contact_book">您的通讯录是空的</string>
+    <string name="contacts_book_title">通讯录</string>
+
+    <string name="three_pid_revoke_invite_dialog_title">撤销邀请</string>
+    <string name="three_pid_revoke_invite_dialog_content">是否撤销对 %1$s 的邀请？</string>
+
+    <string name="member_banned_by">被 %1$s 封禁</string>
+    <string name="failed_to_unban">解封用户失败</string>
+
+    <string name="alert_push_are_disabled_title">推送通知已禁用</string>
+    <string name="alert_push_are_disabled_description">查看您的设置以启用推送通知</string>
+    <string name="create_pin_title">选择 PIN 以确保安全</string>
+    <string name="create_pin_confirm_title">确认 PIN</string>
+    <string name="create_pin_confirm_failure">验证 pin 失败，请输入新的。</string>
+    <string name="auth_pin_title">输入您的 PIN</string>
+    <string name="auth_pin_forgot">忘记 PIN？</string>
+    <string name="auth_pin_reset_title">重置 pin</string>
+    <string name="auth_pin_new_pin_action">新 pin</string>
+    <string name="auth_pin_reset_content">为重置您的 PIN，您将需要重新登录并创建新的。</string>
+    <string name="settings_security_pin_code_title">启用 PIN</string>
+    <string name="settings_security_pin_code_summary">如果您想要重置您的 PIN，点按忘记 PIN 登出并重置。</string>
+    <string name="auth_pin_confirm_to_disable_title">确认 PIN 并禁用 PIN</string>
+    <string name="settings_call_show_confirmation_dialog_title">防止意外通话</string>
+    <string name="settings_call_show_confirmation_dialog_summary">发起通话之前要求确认</string>
 </resources>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index b91b332007..fbf26817b8 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -202,7 +202,6 @@
     <string name="login_error_unable_register">無法註冊</string>
     <string name="login_error_unable_register_mail_ownership">無法註冊：電子郵件的擁有權失敗</string>
     <string name="login_error_invalid_home_server">請輸入有效的網址</string>
-    <string name="login_mobile_device">行動</string>
 
     <string name="login_error_forbidden">無效的使用者名稱/密碼</string>
     <string name="login_error_unknown_token">指定的存取權杖無法被認可</string>
@@ -212,8 +211,6 @@
     <string name="login_error_user_in_use">此使用者名稱已被使用</string>
     <string name="login_error_login_email_not_yet">此電子郵件連結已經被點擊過</string>
 
-    <string name="e2e_need_log_in_again">你需要重新登入來產生此工作階段的端對端加密金鑰，及送出公開金鑰到家伺服器。 這會斷線一次。 抱歉造成困擾。</string>
-
     <string name="read_receipts_list">讀取接收者清單</string>
 
     <string name="groups_list">群組清單</string>
@@ -335,7 +332,7 @@
     <string name="room_participants_action_mention">提及</string>
     <string name="room_participants_action_devices_list">顯示工作階段清單</string>
     <string name="room_participants_invite_prompt_msg">您確定想要邀請 %s 到聊天室？</string>
-    <string name="room_participants_ban_prompt_msg">您確定想要封鎖此聊天室的使用者？</string>
+    <string name="room_participants_ban_prompt_msg">封鎖使用者將會把他們從此聊天室中踢除，並避免他們再次加入。</string>
 
     <string name="people_search_invite_by_id"><u>透過 ID 邀請</u></string>
     <string name="people_search_local_contacts">裝置上的聯絡人（%d）</string>
@@ -395,7 +392,7 @@
 
 要新增一些貼圖嗎？</string>
 
-    <string name="go_on_with">使用…打開</string>
+    <string name="go_on_with">開啟以……</string>
     <string name="error_no_external_application_found">對不起，沒有應用程式可以完成此操作。</string>
 
     <string name="e2e_re_request_encryption_key">從其他工作階段重新請求金鑰。<u>重新請求金鑰</u>。</string>
@@ -740,10 +737,6 @@
     <string name="encryption_information_verify_device_warning2">如果不符合的話，您的通訊安全可能正受到威脅。</string>
     <string name="encryption_information_verify_key_match">我驗證金鑰相符</string>
 
-    <string name="e2e_enabling_on_app_update">Element 目前支援端到端加密，但您需要重新登入以啟用。
-\n
-\n您可以現在重新登入或稍後在應用程式設定中進行。</string>
-
     <string name="unknown_devices_alert_title">聊天室包含未知工作階段</string>
     <string name="unknown_devices_alert_message">此聊天室包含未經驗證的工作階段。
 \n無法保證這些工作階段屬於他們聲稱的使用者。
@@ -991,7 +984,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="x_plus">%d+</string>
 
     <string name="settings_call_category">通話</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">為來電使用預設的 Element 鈴聲</string>
+    <string name="settings_call_ringtone_use_app_ringtone">為來電使用預設的 Element 鈴聲</string>
     <string name="settings_call_ringtone_title">來電鈴聲</string>
     <string name="settings_call_ringtone_dialog_title">選取通話鈴聲：</string>
 
@@ -999,8 +992,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="auth_accept_policies">請審閱並接受此家伺服器的政策：</string>
 
-    <string name="encryption_import_room_keys_success">%1$d/%2$d 個金鑰匯入成功。</string>
-
     <string name="settings_notification_troubleshoot">疑難排解通知</string>
     <string name="settings_troubleshoot_diagnostic">疑難排解診斷</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">執行測試</string>
@@ -1033,7 +1024,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">修復 Play 服務</string>
 
-    <string name="settings_troubleshoot_test_fcm_title">Firebase Token</string>
+    <string name="settings_troubleshoot_test_fcm_title">Firebase 權杖</string>
     <string name="settings_troubleshoot_test_fcm_success">成功擷取 FCM token：
 %1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">擷取 FCM token 失敗：
@@ -1084,29 +1075,8 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="no_valid_google_play_services_apk">找不到有效的 Google Play 服務 APK。通知可能無法正常運作。</string>
 
-    <string name="store_title">Element - 以您的方式溝通</string>
-    <string name="store_short_description">一個完全由您控制的安全聊天應用程式。</string>
-    <string name="store_full_description">"完全由您控制且極具彈性的聊天應用程式。Element 讓您以您想要的方式溝通。為 [matrix] 而生，其為開放、去中心化的通訊標準。
-
-取得免費的 matrix.org 帳號，在 https://modular.im 取得您自己的伺服器，或是使用其他的 Matrix 伺服器。
-
-為什麼選擇 Element？
-
-• 完整的溝通：與您的團隊、朋友、社群一同建構聊天室，不管您喜歡什麼都可以！聊天、分享檔案、新增小工具與進行語音和視訊通話，全都是免費的。
-
-• 強大的整合：與您知道且所愛的工具一同使用 Element。使用 Element，您甚至可以與其他聊天應用程式的使用者與群組聊天。
-
-• 隱密且安全：讓您的對話保持隱密。最先進的端到端加密確保隱密的溝通會繼續保持隱密。
-
-• 開放，並不封閉：開放原始碼，建基於 Matrix。透過建構您自己的伺服器來擁有自己的資料，或選取您信任的。
-
-• 無論您身在何處：透過 https://riot.im 來保持聯繫並在您所有的裝置上完全同步訊息歷史。"</string>
-
     <string name="video_call_in_progress">視訊通話進行中……</string>
 
-    <string name="store_whats_new">"我們會不斷為 Element 做出變更與改善。
-完整的變更紀錄可以在此找到：%1$s。
-為了確保您不會錯過任何事情，只要把更新打開就行了。"</string>
     <string name="title_activity_keys_backup_setup">金鑰備份</string>
     <string name="title_activity_keys_backup_restore">使用金鑰備份</string>
     <string name="keys_backup_is_not_finished_please_wait">金鑰備份尚未完成，請稍候……</string>
@@ -1115,7 +1085,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="done">完成</string>
 
     <string name="settings_notification_advanced">進階通知設定</string>
-    <string name="settings_notification_advanced_summary">透過活動、音效、LED 與震動設定通知重要程度</string>
     <string name="settings_notification_by_event">活動通知重要程度</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">自訂設定。</string>
@@ -1192,7 +1161,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="keys_backup_recovery_code_error_decrypt">備份可能無法使用此復原金鑰解密：請驗證您是否輸入正確的復原金鑰。</string>
 
     <string name="keys_backup_restore_success_title">備份已復原 %s！</string>
-    <string name="keys_backup_restore_success_description">已復原 %1$d 工作階段金鑰，並已加入未被此工作階段知道的 %2$d 新的金鑰</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="other">使用 %d 金鑰復原備份。</item>
     </plurals>
@@ -1459,12 +1427,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="keys_backup_unable_to_get_trust_info">取得信任資訊時發生錯誤</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">取得金鑰備份資料時發生錯誤</string>
 
-    <string name="alpha_disclaimer_title">歡迎使用測試版！</string>
-    <string name="alpha_disclaimer_content_line_1">Element 還在早期開發階段，可能會缺少某些功能，您可能會遇到臭蟲。</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">最新的功能清單一直都會在 %1$s，如果您發現臭蟲，請在首頁左上角的選單中遞交回報，我們將會盡快修復。</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play 商店描述</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">如果您發現臭蟲，請在首頁左上角的選單中遞交回報，我們將會盡快修復。</string>
-
     <string name="import_e2e_keys_from_file">從檔案「%1$s」匯入 e2e 金鑰。</string>
 
     <string name="settings_sdk_version">Matrix SDK 版本</string>
@@ -1502,16 +1464,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="settings_labs_show_hidden_events_in_timeline">在時間軸中顯示隱藏的活動</string>
 
-    <string name="store_riotx_title">Element - 下一代的 Matrix 客戶端</string>
-    <string name="store_riotx_short_description">使用最新 Android 框架的 Matrix 較快且輕量的客戶端</string>
-    <string name="store_riotx_full_description">Element 是 Matrix 協定 (Matrix.org) 的新客戶端：安全、去中心化通訊的開放網路。Element 是 Riot Android 客戶端的完全重寫，以 Matrix Android SDK 的完全重寫為基礎。
-\n
-\n免責聲明：這是測試版。Element 目前仍在積極開發中，包含限制與（我們希望不多的）臭蟲。所有的回饋都很歡迎！
-\n
-\nElement 支援：• 登入到既有的帳號 • 建立聊天室與加入公開聊天室 • 接受與回絕邀請 • 列出使用者聊天室 • 檢視聊天室詳細資訊 • 傳送文字訊息 • 傳送附件 • 讀取與編寫已加密的聊天室 • 加密：E2E 金鑰備份、進階裝置驗證、金鑰分享請求與回應 • 推送通知 • 亮、暗與黑色主題
-\n
-\n不是所有 Element 的功能都已在 Element 中實作。主要缺少（會在稍後到來！）的功能 • 聊天室設定（列出聊天室成員等） • 通話 • 小工具 • …</string>
-
     <string name="bottom_action_people_x">直接訊息</string>
 
     <string name="send_file_step_idle">正在等待……</string>
@@ -1525,9 +1477,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="edited_suffix">（已編輯）</string>
 
-    <string name="riotx_no_registration_notice">%1$s 以建立帳號。</string>
-    <string name="riotx_no_registration_notice_colored_part">使用舊的應用程式</string>
-
 
     <string name="message_edits">訊息編輯</string>
     <string name="no_message_edits_found">找不到編輯</string>
@@ -1562,11 +1511,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="widget_integration_review_terms">要繼續，您必須接受此服務的條款。</string>
 
-    <string name="security_warning_identity_server">先前版本的 Element 有一個安全性問題，讓您的身份識別伺服器 (%1$s) 存取您的帳號。如果您信任 %2$s，您可以忽略這個；否則請登出再登入。
-\n
-\n在此閱讀更多詳細資訊：
-\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
-
     <string name="terms_of_service">服務條款</string>
     <string name="review_terms">審閱條款</string>
     <string name="terms_description_for_identity_server">可被其他人探索</string>
@@ -1662,7 +1606,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="a11y_hide_password">隱藏密碼</string>
     <string name="a11y_jump_to_bottom">跳到底部</string>
 
-    <string name="two_and_some_others_read">%1$s、%2$s 與 %3$d 個其他人已閱讀</string>
     <string name="three_users_read">%1$s、%2$s 與 %3$s 已閱讀</string>
     <string name="two_users_read">%1$s 與 %2$s 已閱讀</string>
     <string name="one_user_read">%s 已閱讀</string>
@@ -1768,7 +1711,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="room_join_rules_invite">%1$s 將聊天室設為僅邀請可進入。</string>
     <string name="timeline_unread_messages">未讀訊息</string>
 
-    <string name="login_splash_title">讓您的通訊自由</string>
+    <string name="login_splash_title">這是您的通訊。您才是所有者。</string>
     <string name="login_splash_text1">直接或在群組中與夥伴們聊天</string>
     <string name="login_splash_text2">透過加密讓對話保持隱密</string>
     <string name="login_splash_text3">擴展並自訂您的體驗</string>
@@ -1937,7 +1880,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="settings_developer_mode_fail_fast_title">快速失敗</string>
     <string name="settings_developer_mode_fail_fast_summary">在發生非預期的錯誤時，Element 可能更常當機</string>
-    <string name="command_description_verify">請求驗證給定的 userID</string>
     <string name="command_description_shrug">"將  ¯\\_(ツ)_/¯ 附加到純文字訊息中"</string>
 
     <string name="create_room_encryption_title">啟用加密</string>
@@ -2153,7 +2095,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="keys_backup_restore_success_title_already_up_to_date">金鑰已為最新！</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="settings_key_requests">金鑰請求</string>
 
@@ -2252,7 +2194,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_messages_in_e2e_group_chat">群組聊天中的已加密訊息</string>
     <string name="settings_when_rooms_are_upgraded">當聊天室升級時</string>
     <string name="settings_troubleshoot_title">疑難排解</string>
-    <string name="settings_notification_advanced_summary_riotx">按事件設定通知重要性</string>
+    <string name="settings_notification_advanced_summary">按事件設定通知重要性</string>
 
     <string name="command_description_plain">傳送純文字訊息，不將它們解譯為 markdown</string>
 
@@ -2293,12 +2235,12 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="change_password_summary">設定新的帳號密碼……</string>
 
     <string name="use_other_session_content_description">在您的其他裝置上使用最新的 Element、Element Web、Element 桌面版、Element iOS、Element for Android 或其他有交叉簽章功能的 Matrix 客戶端</string>
-    <string name="riot_desktop_web">Element Web
+    <string name="app_desktop_web">Element Web
 \nElement 桌面版</string>
-    <string name="riot_ios_android">Element iOS
-\nElement for Android</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
     <string name="or_other_mx_capabale_client">或其他有交叉簽章功能的 Matrix 客戶端</string>
-    <string name="use_latest_riot">在您的其他裝置上使用最新的 Element：</string>
+    <string name="use_latest_app">在您的其他裝置上使用最新的 Element：</string>
     <string name="command_description_discard_session">強制丟棄目前在加密聊天室中的外發群組工作階段</string>
     <string name="command_description_discard_session_not_handled">僅在加密聊天室中支援</string>
     <string name="enter_secret_storage_passphrase_or_key">使用您的 %1$s 或使用您的 %2$s 以繼續。</string>
@@ -2356,7 +2298,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="login_connect_using_matrix_id_notice">或者如果您已有帳號，而且您也知道您 Matrix 的識別符與密碼，您可以使用此方式：</string>
     <string name="login_connect_using_matrix_id_submit">使用我的 Matrix 識別符登入</string>
     <string name="login_signin_matrix_id_title">登入</string>
-    <string name="login_signin_matrix_id_notice">輸入您的識別符與您的密碼</string>
+    <string name="login_signin_matrix_id_notice">如果您在家伺服器上建立了帳號，使用您的 Matrix ID（例如 @user:domain.com）與下方的密碼。</string>
     <string name="login_signin_matrix_id_hint">使用者識別符</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">這不是有效的使用者識別符。預期中的格式：\'@user:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">找不到有效的家伺服器。請檢查您的識別符</string>
@@ -2383,4 +2325,195 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="identity_server_set_alternative_notice_no_default">輸入身份識別伺服器 URL</string>
     <string name="identity_server_set_alternative_submit">遞交</string>
 
+    <string name="play_video">播放</string>
+    <string name="pause_video">暫停</string>
+    <string name="dismiss">忽略</string>
+
+
+    <string name="action_copy">複製</string>
+    <string name="dialog_title_success">成功</string>
+
+    <string name="bottom_action_notification">通知</string>
+    <string name="call_failed_no_connection">Element 呼叫失敗</string>
+    <string name="call_failed_no_connection_description">建立即時連線失敗。
+\n請要求您家伺服器的管理員設定 TURN 伺服器以讓通話的運作更可靠。</string>
+
+    <string name="call_select_sound_device">選取音效裝置</string>
+    <string name="sound_device_phone">電話</string>
+    <string name="sound_device_speaker">喇叭</string>
+    <string name="sound_device_headset">耳機</string>
+    <string name="sound_device_wireless_headset">無線耳機</string>
+    <string name="call_switch_camera">切換相機</string>
+    <string name="call_camera_front">前</string>
+    <string name="call_camera_back">後</string>
+    <string name="call_format_turn_hd_off">關閉 HD</string>
+    <string name="call_format_turn_hd_on">開啟 HD</string>
+
+    <string name="login_error_ssl_peer_unverified">SSL 錯誤：對方的身份未驗證。</string>
+    <string name="login_error_ssl_other">SSL 錯誤。</string>
+    <string name="active_call_with_duration">有效通話 (%s)</string>
+    <string name="return_to_call">回到通話</string>
+
+    <string name="room_participants_action_cancel_invite">取消邀請</string>
+    <string name="room_participants_power_level_demote_warning_title">將您自己降級？</string>
+    <string name="room_participants_power_level_demote_warning_prompt">您將無法復原此變更，因為您要把自己降級，如果您是聊天室中最後一個有此權限的使用者，那將無法重新取得權限。</string>
+    <string name="room_participants_power_level_demote">降級</string>
+
+
+    <string name="room_participants_action_ignore_title">忽略使用者</string>
+    <string name="room_participants_action_ignore_prompt_msg">忽略此使用者將會從您分享的聊天室移除他們的訊息。
+\n
+\n您隨時都可以在一般設定中撤銷此動作。</string>
+    <string name="room_participants_action_unignore_title">取消忽略使用者</string>
+    <string name="room_participants_action_unignore_prompt_msg">取消忽略此使用者將再次顯示從他們而來的所有訊息。</string>
+    <string name="room_participants_action_cancel_invite_title">取消邀請</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">您確定您想要取消對此使用者的邀請嗎？</string>
+    <string name="room_participants_kick_title">踢除使用者</string>
+    <string name="room_participants_kick_reason">踢除的理由</string>
+    <string name="room_participants_kick_prompt_msg">踢除使用者將會將他們從此聊天室中移除。
+\n
+\n要避免他們再次加入，您應改為封鎖他們。</string>
+    <string name="room_participants_ban_title">封鎖使用者</string>
+    <string name="room_participants_ban_reason">封鎖的理由</string>
+    <string name="room_participants_unban_title">取消封鎖使用者</string>
+    <string name="room_participants_unban_prompt_msg">取消封鎖使用者將會再次允許他們加入聊天室。</string>
+
+    <string name="settings_secure_backup_section_title">安全備份</string>
+    <string name="settings_secure_backup_manage">管理</string>
+    <string name="settings_secure_backup_setup">設定安全備份</string>
+    <string name="settings_secure_backup_reset">重設安全備份</string>
+    <string name="settings_secure_backup_enter_to_setup">在此裝置上設定</string>
+    <string name="settings_secure_backup_section_info">透過備份加密金鑰到您的伺服器上以防止遺失對加密訊息與資料的存取權。</string>
+    <string name="reset_secure_backup_title">為您現有的備份生成新的安全金鑰或設定新的安全密語。</string>
+    <string name="reset_secure_backup_warning">這將會取代您目前的金鑰或密語。</string>
+
+    <string name="disabled_integration_dialog_title">整合被停用</string>
+    <string name="disabled_integration_dialog_content">在設定中啟用「允許整合」以執行此動作。</string>
+
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="other">%d 封鎖了使用者</item>
+    </plurals>
+
+    <string name="encryption_exported_successfully">金鑰已成功匯出</string>
+
+    <string name="active_widget_view_action">檢視</string>
+    <string name="active_widgets_title">作用中的小工具</string>
+
+
+    <string name="recovery_key_export_saved">復原金鑰已儲存。</string>
+
+    <string name="secure_backup_banner_setup_line1">安全備份</string>
+    <string name="secure_backup_banner_setup_line2">防止遺失對加密訊息與資料的存取權</string>
+
+    <string name="secure_backup_setup">設定安全備份</string>
+
+    <string name="labs_merge_e2e_in_timeline">合併未能在時間軸中解密訊息</string>
+    <string name="labs_show_unread_notifications_as_tab">在主畫面上新增專用的未讀通知分頁。</string>
+
+    <string name="room_list_quick_actions_favorite_add">新增到最愛</string>
+    <string name="room_list_quick_actions_favorite_remove">從最愛移除</string>
+    <string name="notice_member_no_changes_by_you">您未做出變更</string>
+    <string name="room_join_rules_public_by_you">您讓聊天室對所有知道連結的人公開。</string>
+    <string name="room_join_rules_invite_by_you">您讓聊天室變為僅邀請可加入。</string>
+    <string name="login_server_url_form_common_notice">輸入您想要使用的伺服器地址</string>
+
+    <string name="login_signin_matrix_id_password_notice">如果您不知道您的密碼，請返回並重設。</string>
+    <string name="send_a_sticker">貼圖</string>
+
+    <string name="room_profile_section_admin">管理動作</string>
+    <string name="room_member_power_level_default_in">在 %1$s 中的預設</string>
+    <string name="settings_hs_admin_e2e_disabled">您的伺服器管理員已在私人聊天室與直接訊息中預設停用端到端加密。</string>
+    <string name="bootstrap_info_text_2">輸入只有您知道的安全密語，用於保護您伺服器上的安全祕密。</string>
+
+    <string name="bootstrap_cancel_text">如果您現在取消，您可能會失去對加密訊息與資料的存取權，如果您失去對您登入的存取權的話。
+\n
+\n您也可以在設定中設定安全備份與管理您的金鑰。</string>
+
+    <string name="room_created_summary_item_by_you">您建立並設定了聊天室。</string>
+
+    <string name="auth_invalid_login_deactivated_account">此帳號已被停用。</string>
+
+    <string name="setup_cross_signing">啟用交叉簽章</string>
+    <string name="error_saving_media_file">無法儲存媒體檔案</string>
+    <string name="power_level_edit_title">設定角色</string>
+    <string name="power_level_title">角色</string>
+    <string name="a11y_open_chat">開啟聊天</string>
+    <string name="a11y_mute_microphone">讓麥克風靜音</string>
+    <string name="a11y_unmute_microphone">取消麥克風靜音</string>
+    <string name="a11y_stop_camera">停止相機</string>
+    <string name="a11y_start_camera">開啟相機</string>
+
+    <string name="settings_setup_secure_backup">設定安全備份</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">安全備份</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">透過備份加密金鑰到您的伺服器上以防止遺失對加密訊息與資料的存取權。</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">設定</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">使用安全金鑰</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">生成安全金鑰並儲存在安全的地方，如密碼管理員或保險櫃。</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">使用安全密語</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">輸入只有您知道的密語，並生成金鑰備份。</string>
+
+    <string name="bottom_sheet_save_your_recovery_key_title">儲存您的安全金鑰</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">將您的安全金鑰儲存在安全的地方，如密碼管理員或保險櫃。</string>
+
+    <string name="set_a_security_phrase_title">設定安全密語</string>
+    <string name="set_a_security_phrase_notice">輸入僅有您知道的安全密語，用於保護在您伺服器上的安全祕密。</string>
+    <string name="set_a_security_phrase_hint">安全密語</string>
+    <string name="set_a_security_phrase_again_notice">再次輸入您的安全密語以確認。</string>
+
+    <string name="save_your_security_key_title">儲存您的安全金鑰</string>
+    <string name="save_your_security_key_notice">將您的安全金鑰儲存在安全的地方，如密碼管理員或保險櫃。</string>
+
+    <string name="room_settings_name_hint">聊天室設定</string>
+    <string name="room_settings_topic_hint">主題</string>
+    <string name="room_settings_save_success">您成功變更了聊天室設定</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">您無法存取此訊息</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">正在等待此訊息，可能需要花一點時間</string>
+    <string name="crypto_utd">無法解密</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">由於端到端加密，您可能要等待某人的訊息抵達，因為加密金鑰未正確地傳送給您。</string>
+    <string name="crypto_error_withheld_blacklisted">您無法存取此訊息，因為您被傳送者封鎖</string>
+    <string name="crypto_error_withheld_unverified">您無法存取此訊息，因為您的工作階段未被傳送者所信任</string>
+    <string name="crypto_error_withheld_generic">您無法存取此訊息，因為傳送者刻意未傳送金鑰</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">正在等待加密歷史</string>
+
+    <string name="element_disclaimer_title">Riot 現在是 Element 了！</string>
+    <string name="element_disclaimer_content">我們很高興地我們已變更名稱！您的應用程式是最新的，而您也登入了您的帳號。</string>
+    <string name="element_disclaimer_negative_button">知道了</string>
+    <string name="element_disclaimer_positive_button">取得更多資訊</string>
+
+    <string name="element_login_splash_brand">element</string>
+
+
+    <string name="save_recovery_key_chooser_hint">儲存復原金鑰於</string>
+
+    <string name="add_from_phone_book">從我的電話簿新增</string>
+    <string name="empty_phone_book">您的電話簿是空的</string>
+    <string name="phone_book_title">電話簿</string>
+    <string name="search_in_my_contacts">在我們聯絡人中搜尋</string>
+    <string name="loading_contact_book">正在擷取您的聯絡人……</string>
+    <string name="empty_contact_book">您的通訊錄為空</string>
+    <string name="contacts_book_title">通訊錄</string>
+
+    <string name="three_pid_revoke_invite_dialog_title">撤銷邀請</string>
+    <string name="three_pid_revoke_invite_dialog_content">撤銷對 %1$s 的邀請？</string>
+
+    <string name="member_banned_by">被 %1$s 封鎖</string>
+    <string name="failed_to_unban">取消封鎖使用者失敗</string>
+
+    <string name="alert_push_are_disabled_title">推送通知已停用</string>
+    <string name="alert_push_are_disabled_description">審閱您的設定以啟用推送通知</string>
+    <string name="create_pin_title">選擇 PIN 碼以確保安全</string>
+    <string name="create_pin_confirm_title">確認 PIN 碼</string>
+    <string name="create_pin_confirm_failure">驗證 PIN 碼失敗，請點擊新的。</string>
+    <string name="auth_pin_title">輸入您的 PIN 碼</string>
+    <string name="auth_pin_forgot">忘記 PIN 碼？</string>
+    <string name="auth_pin_reset_title">重設 PIN 碼</string>
+    <string name="auth_pin_new_pin_action">新 PIN 碼</string>
+    <string name="auth_pin_reset_content">要重設您的 PIN 碼，您將需要重新登入並建立新的。</string>
+    <string name="settings_security_pin_code_title">啟用 PIN 碼</string>
+    <string name="settings_security_pin_code_summary">如果您想要重設您的 PIN 碼，點擊忘記 PIN 碼以登出並重設。</string>
+    <string name="auth_pin_confirm_to_disable_title">確認 PIN 碼以停用 PIN 碼</string>
+    <string name="settings_call_show_confirmation_dialog_title">避免意外的通話</string>
+    <string name="settings_call_show_confirmation_dialog_summary">開始通話前要求確認</string>
 </resources>
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index dd2fbfce7a..8c71fb26b2 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -8,32 +8,21 @@
         <attr name="vctr_toolbar_secondary_text_color" format="color" />
         <attr name="vctr_toolbar_link_text_color" format="color" />
 
-        <!-- application bar text hint color -->
-        <attr name="vctr_primary_hint_text_color" format="color" />
-
         <!-- default text colors -->
         <attr name="vctr_default_text_hint_color" format="color" />
 
         <!-- room message colors -->
-        <attr name="vctr_unread_room_indent_color" format="color" />
         <attr name="vctr_unsent_message_text_color" format="color" />
         <attr name="vctr_message_text_color" format="color" />
         <attr name="vctr_notice_text_color" format="color" />
         <attr name="vctr_notice_secondary" format="color" />
         <attr name="vctr_encrypting_message_text_color" format="color" />
         <attr name="vctr_sending_message_text_color" format="color" />
-        <attr name="vctr_highlighted_message_text_color" format="color" />
-        <attr name="vctr_highlighted_searched_message_text_color" format="color" />
-        <attr name="vctr_search_mode_room_name_text_color" format="color" />
-        <attr name="vctr_unread_marker_line_color" format="color" />
         <attr name="vctr_markdown_block_background_color" format="color" />
-        <attr name="vctr_room_activity_divider_color" format="color" />
         <attr name="vctr_spoiler_background_color" format="color" />
 
         <!-- tab bar colors -->
         <attr name="vctr_tab_bar_inverted_background_color" format="color" />
-        <attr name="vctr_tab_bar_selected_background_color" format="color" />
-        <attr name="vctr_tab_bar_unselected_background_color" format="color" />
 
         <!-- list colors -->
         <attr name="vctr_list_header_background_color" format="color" />
@@ -42,53 +31,16 @@
 
         <attr name="vctr_list_divider_color" format="color" />
 
-        <attr name="vctr_redacted_message_color" format="color" />
-
-        <!-- gradient on the bottom of some activities -->
-        <attr name="vctr_activity_bottom_gradient_color" format="color" />
-
         <!-- outgoing call background color -->
         <attr name="vctr_pending_outgoing_view_background_color" format="color" />
 
-        <!-- multi selection member background color -->
-        <attr name="vctr_multi_selection_background_color" format="color" />
-
-        <!-- sliding menu icon colors -->
-        <attr name="vctr_home_navigation_icon_color" format="color" />
-
         <!-- room notification text color (typing, unsent...) -->
         <attr name="vctr_room_notification_text_color" format="color" />
 
         <!-- icon colors -->
         <attr name="vctr_icon_tint_on_light_action_bar_color" format="color" />
-        <attr name="vctr_icon_tint_on_dark_action_bar_color" format="color" />
         <attr name="vctr_settings_icon_tint_color" format="color" />
 
-        <!-- Tab home colors -->
-        <attr name="vctr_tab_home" format="color" />
-        <attr name="vctr_tab_home_secondary" format="color" />
-
-        <!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
-        <!-- dedicated drawables are created for each theme -->
-        <attr name="vctr_line_divider" format="reference" />
-        <attr name="vctr_shadow_bottom" format="reference" />
-        <attr name="vctr_shadow_top" format="reference" />
-        <attr name="vctr_tabbar_selected_background" format="reference" />
-        <attr name="vctr_tabbar_unselected_background" format="reference" />
-        <attr name="vctr_tabbar_background" format="reference" />
-        <attr name="vctr_direct_chat_circle" format="reference" />
-
-        <attr name="vctr_pill_background_user_id" format="reference" />
-        <attr name="vctr_pill_background_room_alias" format="reference" />
-        <attr name="vctr_pill_text_color_user_id" format="reference" />
-        <attr name="vctr_pill_text_color_room_alias" format="reference" />
-        <attr name="vctr_pill_receipt" format="reference" />
-
-        <!-- Widget banner background -->
-        <attr name="vctr_widget_banner_background" format="color" />
-
-        <attr name="riotx_highlighted_message_background" format="reference" />
-
     </declare-styleable>
 
     <declare-styleable name="PollResultLineView">
diff --git a/vector/src/main/res/values/colors_riot.xml b/vector/src/main/res/values/colors_riot.xml
index faecfb66d3..5b85b71dd5 100644
--- a/vector/src/main/res/values/colors_riot.xml
+++ b/vector/src/main/res/values/colors_riot.xml
@@ -12,23 +12,6 @@
     <color name="vector_silver_color">#FFC7C7C7</color>
     <color name="vector_dark_grey_color">#FF999999</color>
 
-    <!-- home activity tab bar color -->
-    <color name="tab_favourites">#BD79CC</color>
-    <color name="tab_favourites_secondary">#744C7F</color>
-    <color name="tab_people">#F8A15F</color>
-    <color name="tab_people_secondary">#D97051</color>
-    <color name="tab_rooms">@color/accent_color_light</color>
-    <color name="tab_rooms_secondary">#5EA584</color>
-    <color name="tab_groups">#a6d0e5</color>
-
-    <color name="tab_groups_secondary">#81bddb</color>
-
-    <!-- color of the direct chat avatar ring (it's 50% of color accent) -->
-    <color name="direct_chat_ring_color_light">#7F03b381</color>
-    <color name="direct_chat_ring_color_dark">#7F03b381</color>
-    <color name="direct_chat_ring_color_black">#7F03b381</color>
-    <color name="direct_chat_ring_color_status">#7F586C7B</color>
-
     <!-- theses colours are requested a background cannot be set by an ?attr on android < 5 -->
     <!-- dedicated drawables are created for each theme -->
     <!-- Default/Background-->
@@ -63,19 +46,22 @@
     <color name="accent_color_status">#FF586C7B</color>
 
     <!--Default/Line break mobile-->
+    <attr name="list_divider_color" format="color" />
     <color name="list_divider_color_light">#EEEFEF</color>
     <!--Dark/Line break mobile-->
     <color name="list_divider_color_dark">#FF61708B</color>
     <!--Black/Line break mobile-->
     <color name="list_divider_color_black">#FF22262E</color>
 
-    <color name="tab_bar_selected_background_color_light">@color/primary_color_light</color>
-    <color name="tab_bar_selected_background_color_dark">@color/primary_color_dark</color>
-    <color name="tab_bar_selected_background_color_status">@color/primary_color_status</color>
+    <attr name="tab_bar_selected_background_color" format="color" />
+    <color name="tab_bar_selected_background_color_light">@color/riotx_android_secondary_light</color>
+    <color name="tab_bar_selected_background_color_dark">@color/riotx_android_secondary_dark</color>
+    <color name="tab_bar_selected_background_color_status">@color/riotx_android_secondary_black</color>
 
-    <color name="tab_bar_unselected_background_color_light">@color/primary_color_light</color>
-    <color name="tab_bar_unselected_background_color_dark">@color/primary_color_dark</color>
-    <color name="tab_bar_unselected_background_color_status">@color/primary_color_status</color>
+    <attr name="tab_bar_unselected_background_color" format="color" />
+    <color name="tab_bar_unselected_background_color_light">@color/riotx_background_light</color>
+    <color name="tab_bar_unselected_background_color_dark">@color/riotx_background_dark</color>
+    <color name="tab_bar_unselected_background_color_status">@color/riotx_background_black</color>
 
     <!-- Hint Colors -->
     <color name="primary_hint_text_color_light">#FFFFFF</color>
@@ -85,6 +71,9 @@
     <color name="default_text_hint_color_dark">#CCDDDDDD</color>
 
     <!-- Text Colors -->
+    <attr name="riot_primary_text_color" format="color" />
+    <attr name="riot_primary_text_color_disabled" format="color" />
+
     <!--Default/Text Primary-->
     <color name="riot_primary_text_color_light">#FF2E2F32</color>
     <color name="riot_primary_text_color_disabled_light">#FF9E9E9E</color>
@@ -106,10 +95,6 @@
     <color name="riot_secondary_text_color_status">#7F70808D</color>
     <color name="riot_tertiary_text_color_status">@color/riot_primary_text_color_status</color>
 
-    <!-- Quote Colors -->
-    <color name="quote_strip_color">#FFDDDDDD</color>
-    <color name="quote_background_color">@android:color/transparent</color>
-
     <!-- Notification view colors -->
     <color name="soft_resource_limit_exceeded">#2f9edb</color>
     <color name="hard_resource_limit_exceeded">@color/vector_fuchsia_color</color>
diff --git a/vector/src/main/res/values/colors_riotx.xml b/vector/src/main/res/values/colors_riotx.xml
index 4116e76f5d..cfcc8a8b1d 100644
--- a/vector/src/main/res/values/colors_riotx.xml
+++ b/vector/src/main/res/values/colors_riotx.xml
@@ -60,7 +60,7 @@
     <attr name="riotx_bottom_sheet_background" format="color" />
     <color name="riotx_bottom_sheet_background_light">#FFFFFFFF</color>
     <color name="riotx_bottom_sheet_background_dark">#FF282C35</color>
-    <color name="riotx_bottom_sheet_background_black">#FF000000</color>
+    <color name="riotx_bottom_sheet_background_black">#FF282C35</color>
 
     <attr name="riotx_base_text_icon_primary" format="color" />
     <color name="riotx_base_text_icon_primary_light">#FFFFFFFF</color>
@@ -163,6 +163,11 @@
     <color name="riotx_fab_label_bg_dark">#FF181B21</color>
     <color name="riotx_fab_label_bg_black">#FF181B21</color>
 
+    <attr name="riotx_fab_label_stroke" format="color" />
+    <color name="riotx_fab_label_stroke_light">#1EFFFFFF</color>
+    <color name="riotx_fab_label_stroke_dark">@color/black</color>
+    <color name="riotx_fab_label_stroke_black">@color/black</color>
+
     <attr name="riotx_fab_label_color" format="color" />
     <color name="riotx_fab_label_color_light">#FF2E2F32</color>
     <color name="riotx_fab_label_color_dark">#FFA1B2D1</color>
@@ -220,8 +225,8 @@
     <color name="riotx_disabled_view_color_dark">#61708B</color>
 
     <attr name="riotx_list_bottom_sheet_divider_color" format="color" />
-    <color name="riotx_list_bottom_sheet_divider_color_light">#EEEFEF</color>
-    <color name="riotx_list_bottom_sheet_divider_color_dark">#FF61708B</color>
+    <color name="riotx_list_bottom_sheet_divider_color_light">#E3E8F0</color>
+    <color name="riotx_list_bottom_sheet_divider_color_dark">#7F61708B</color>
     <color name="riotx_list_bottom_sheet_divider_color_black">#FF22262E</color>
 
     <!-- (color from RiotWeb) -->
diff --git a/vector/src/main/res/values/config.xml b/vector/src/main/res/values/config.xml
index 764dea6786..2b22b1c49b 100755
--- a/vector/src/main/res/values/config.xml
+++ b/vector/src/main/res/values/config.xml
@@ -18,6 +18,9 @@
     <!-- Note: pusher_app_id cannot exceed 64 chars -->
     <string name="pusher_app_id" translatable="false">im.vector.app.android</string>
 
+    <!-- preferred jitsi domain -->
+    <string name="preferred_jitsi_domain" translatable="false">jitsi.riot.im</string>
+
     <string-array name="room_directory_servers" translatable="false">
         <item>matrix.org</item>
     </string-array>
diff --git a/vector/src/main/res/values/dimens.xml b/vector/src/main/res/values/dimens.xml
index 665d1819f7..ccb7ae7726 100644
--- a/vector/src/main/res/values/dimens.xml
+++ b/vector/src/main/res/values/dimens.xml
@@ -9,9 +9,9 @@
     <dimen name="layout_vertical_margin_big">32dp</dimen>
 
     <dimen name="profile_avatar_size">50dp</dimen>
-    <dimen name="floating_action_button_margin">0dp</dimen>
-    <dimen name="navigation_view_height">172dp</dimen>
-    <dimen name="navigation_avatar_top_margin">20dp</dimen>
+    <dimen name="floating_action_button_margin">16dp</dimen>
+    <dimen name="navigation_view_height">196dp</dimen>
+    <dimen name="navigation_avatar_top_margin">44dp</dimen>
     <dimen name="item_decoration_left_margin">72dp</dimen>
 
     <dimen name="chat_avatar_size">40dp</dimen>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 6dc4faab27..0b9cbab57a 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -89,8 +89,17 @@
     <string name="missing_permissions_warning">"Due to missing permissions, some features may be missing…</string>
     <string name="missing_permissions_error">"Due to missing permissions, this action is not possible.</string>
     <string name="missing_permissions_to_start_conf_call">You need permission to invite to start a conference in this room</string>
+    <string name="no_permissions_to_start_conf_call">You do not have permission to start a conference call in this room</string>
+    <string name="conference_call_in_progress">A conference is already in progress!</string>
+    <string name="video_meeting">Start video meeting</string>
+    <string name="audio_meeting">Start audio meeting</string>
+    <string name="audio_video_meeting_description">Meetings use Jitsi security and permission policies. All people currently in the room will see an invite to join while your meeting is happening.</string>
     <string name="missing_permissions_title_to_start_conf_call">Cannot start call</string>
+    <string name="cannot_call_yourself">You cannot place a call with yourself</string>
+    <string name="cannot_call_yourself_with_invite">You cannot place a call with yourself, wait for participants to accept invitation</string>
     <string name="device_information">Session information</string>
+    <string name="failed_to_add_widget">Failed to add widget</string>
+    <string name="failed_to_remove_widget">Failed to remove widget</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Conference calls are not supported in encrypted rooms</string>
     <string name="call_anyway">Call Anyway</string>
     <string name="send_anyway">Send Anyway</string>
@@ -308,7 +317,6 @@
     <string name="login_error_ssl_peer_unverified">"SSL Error: the peer's identity has not been verified."</string>
     <string name="login_error_ssl_other">"SSL Error."</string>
     <string name="login_error_ssl_handshake">Your device is using an outdated TLS security protocol, vulnerable to attack, for your security you will not be able to connect</string>
-    <string name="login_mobile_device">Mobile</string>
 
     <string name="login_error_forbidden">Invalid username/password</string>
     <string name="login_error_unknown_token">The access token specified was not recognised</string>
@@ -318,9 +326,6 @@
     <string name="login_error_user_in_use">This user name is already used</string>
     <string name="login_error_login_email_not_yet">The email link which has not been clicked yet</string>
 
-    <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">You need to log back in to generate end-to-end encryption keys for this session and submit the public key to your homeserver.\nThis is a once off.\nSorry for the inconvenience.</string>
-
     <!-- request again e2e key -->
     <string name="e2e_re_request_encryption_key">Re-request encryption keys from your other sessions.</string>
 
@@ -366,7 +371,9 @@
 
     <!-- Call settings screen -->
     <string name="settings_call_category">Calls</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Use default Element ringtone for incoming calls</string>
+    <string name="settings_call_show_confirmation_dialog_title">Prevent accidental call</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Ask for confirmation before starting a call</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Use default Element ringtone for incoming calls</string>
     <string name="settings_call_ringtone_use_default_stun">Allow fallback call assist server</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Will use "%s" as assist when your home server does not offer one (your IP address will be shared during a call)</string>
     <string name="settings_call_ringtone_title">Incoming call ringtone</string>
@@ -677,7 +684,6 @@
 
 
     <string name="settings_notification_advanced">Advanced Notification Settings</string>
-    <string name="settings_notification_advanced_summary">Set notification importance by event, Configure sound, led, vibration</string>
     <string name="settings_notification_by_event">Notification importance by event</string>
 
     <string name="settings_notification_privacy">Notification privacy</string>
@@ -1057,7 +1063,7 @@
     <string name="encryption_information_device_name_with_warning">Public name (visible to people you communicate with)</string>
     <string name="device_name_warning">"A session's public name is visible to people you communicate with"</string>
     <string name="encryption_information_name">Public name</string>
-    <string name="encryption_information_device_id">ID</string>
+    <string name="encryption_information_device_id">Session ID</string>
     <string name="encryption_information_device_key">Session key</string>
     <string name="encryption_information_verification">Verification</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 fingerprint</string>
@@ -1079,7 +1085,10 @@
     <string name="encryption_import_import">Import</string>
     <string name="encryption_never_send_to_unverified_devices_title">Encrypt to verified sessions only</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Never send encrypted messages to unverified sessions from this session.</string>
-    <string name="encryption_import_room_keys_success">%1$d/%2$d key(s) imported with success.</string>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d/%2$d key imported with success.</item>
+        <item quantity="other">%1$d/%2$d keys imported with success.</item>
+    </plurals>
 
     <string name="encryption_information_not_verified">Not Verified</string>
     <string name="encryption_information_verified">Verified</string>
@@ -1099,8 +1108,6 @@
     <string name="encryption_information_verify_device_warning2">"If they don't match, the security of your communication may be compromised."</string>
     <string name="encryption_information_verify_key_match">I verify that the keys match</string>
 
-    <string name="e2e_enabling_on_app_update">Element now supports end-to-end encryption but you need to log in again to enable it.\n\nYou can do it now or later from the application settings.</string>
-
     <!-- unknown sessions management -->
     <string name="unknown_devices_alert_title">Room contains unknown sessions</string>
     <string name="unknown_devices_alert_message">This room contains unknown sessions which have not been verified.\nThis means there is no guarantee that the sessions belong to the users they claim to.\nWe recommend you go through the verification process for each session before continuing, but you can resend the message without verifying if you prefer.\n\nUnknown sessions:</string>
@@ -1215,6 +1222,8 @@
     <string name="widget_integration_invalid_parameter">A parameter is not valid.</string>
     <string name="integration_manager_not_configured">No integration manager configured.</string>
     <string name="room_add_matrix_apps">Add Matrix apps</string>
+    <string name="room_manage_integrations">Manage Integrations</string>
+    <string name="room_no_active_widgets">No active widgets</string>
     <string name="settings_labs_native_camera">Use native camera</string>
     <string name="settings_labs_native_camera_summary">Start the system camera instead of the custom camera screen.</string>
     <string name="settings_labs_keyboard_options_to_send_message">Use keyboard enter key to send message</string>
@@ -1372,28 +1381,6 @@
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">No valid Google Play Services APK found. Notifications may not work properly.</string>
 
-    <!-- String for Play Store -->
-    <string name="store_title">Element - Communicate, your way</string>
-    <string name="store_whats_new">"We’re always making changes and improvements to Element.
-The complete changelog can be found here: %1$s.
-To make sure you don’t miss a thing, just keep your updates turned on."</string>
-    <string name="store_short_description">A universal secure chat app entirely under your control.</string>
-    <string name="store_full_description">"A chat app, under your control and entirely flexible. Element lets you communicate the way you want. Made for [matrix] - the standard for open, decentralised communication.
-
-Get a free matrix.org account, get your own server at https://modular.im, or use another Matrix server.
-
-Why choose Element?
-
-• COMPLETE COMMUNICATION: Build rooms around your teams, your friends, your community - however you like! Chat, share files, add widgets and make voice and video calls - all free of charge.
-
-• POWERFUL INTEGRATIONS: Use Element with the tools you know and love. With Element you can even chat with users and groups on other chat apps.
-
-• PRIVATE AND SECURE: Keep your conversations secret. State of the art end-to-end encryption ensures that private communication stays private.
-
-• OPEN, NOT CLOSED: Open source, and built on Matrix. Own your own data by hosting your own server, or selecting one you trust.
-
-• EVERYWHERE YOU ARE: Stay in touch wherever you are with fully synchronised message history across all your devices and online at https://riot.im."</string>
-
     <!-- Passphrase -->
     <string name="passphrase_create_passphrase">Create passphrase</string>
     <string name="passphrase_confirm_passphrase">Confirm passphrase</string>
@@ -1474,7 +1461,6 @@ Why choose Element?
 
     <!-- %s will be replaced by an emoji -->
     <string name="keys_backup_restore_success_title">Backup Restored %s !</string>
-    <string name="keys_backup_restore_success_description">Restored %1$d session keys, and added %2$d new key(s) that was not known by this session</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Restored a backup with %d key.</item>
         <item quantity="other">Restored a backup with %d keys.</item>
@@ -1600,8 +1586,6 @@ Why choose Element?
     <string name="identity_server_not_defined">You are not using any Identity Server</string>
     <string name="identity_server_not_defined_for_password_reset">No identity server is configured, it is required to reset your password.</string>
 
-    <string name="security_warning_identity_server">"Previous versions of Element had a security bug which could give your Identity Server (%1$s) access to your account. If you trust %2$s, you can ignore this; otherwise please logout and login again.\n\nRead more details here:\nhttps://medium.com/@RiotChat/36b4792ea0d6"</string>
-
     <string name="error_user_already_logged_in">It looks like you’re trying to connect to another homeserver. Do you want to sign out?</string>
 
     <string name="edit">Edit</string>
@@ -1658,17 +1642,11 @@ Why choose Element?
     <string name="create_room_public_description">"Anyone will be able to join this room"</string>
     <string name="create_room_directory_title">"Room Directory"</string>
     <string name="create_room_directory_description">"Publish this room in the room directory"</string>
+    <string name="create_room_federation_error">"The room has been created, but some invitations have not been sent for the following reason:\n\n%s"</string>
 
     <string name="keys_backup_unable_to_get_trust_info">"An error occurred getting trust info"</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">"An error occurred getting keys backup data"</string>
 
-    <string name="alpha_disclaimer_title">Welcome to the beta!</string>
-    <string name="alpha_disclaimer_content_line_1">"While Element is in early development, some features may be missing and you may experience bugs."</string>
-    <!-- The parameter will be replaced by the value of string alpha_disclaimer_content_line_2_gplay_colored_part -->
-    <string name="alpha_disclaimer_content_line_2_gplay">"The latest feature list is always in the %1$s, and if you find bugs please submit a report in the top left menu of Home, and we’ll fix them as quickly as we can."</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">"Play Store description"</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">"If you find bugs please submit a report in the top left menu of Home, and we’ll fix them as quickly as we can."</string>
-
     <string name="import_e2e_keys_from_file">"Import e2e keys from file \"%1$s\"."</string>
 
     <string name="settings_sdk_version">Matrix SDK Version</string>
@@ -1707,31 +1685,6 @@ Why choose Element?
 
     <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>
 
-    <string name="store_riotx_title">Element - Next Generation Matrix Client</string>
-    <string name="store_riotx_short_description">A faster and lighter client for Matrix using the latest Android frameworks</string>
-    <string name="store_riotx_full_description">"Element is a new client for the Matrix protocol (Matrix.org): an open network for secure, decentralised communication. Element is a full rewrite of the Riot Android client, based on a full rewrite of the Matrix Android SDK.
-
-Disclaimer: This is a beta version. Element is currently in active development and contains limitations and (we hope not too many) bugs. All feedback is welcome!
-
-Element supports:
-• Login to an existing account
-• Create room and join public rooms
-• Accept and reject invitations
-• List users rooms
-• View room details
-• Send text messages
-• Send attachment
-• Read and write messages in encrypted rooms
-• Crypto: E2E keys backup, advance device verification, key share request and answer
-• Push notification
-• Light, Dark and Black themes
-
-Not all features in Riot are implemented in Element yet. Main missing (and coming soon!) features:
-• Room settings (list room members, etc.)
-• Calls
-• Widgets
-• …"</string>
-
     <string name="bottom_action_people_x">Direct Messages</string>
 
     <string name="send_file_step_idle">Waiting…</string>
@@ -1745,11 +1698,6 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
 
     <string name="edited_suffix">"(edited)"</string>
 
-    <!-- param will be replaced by the value of riotx_no_registration_notice_colored_part -->
-    <string name="riotx_no_registration_notice">%1$s to create an account.</string>
-    <string name="riotx_no_registration_notice_colored_part">Use the old app</string>
-
-
     <string name="message_edits">Message Edits</string>
     <string name="no_message_edits_found">No edits found</string>
 
@@ -1834,7 +1782,10 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
     <string name="a11y_jump_to_bottom">Jump to bottom</string>
 
     <!-- Read receipts list a11y -->
-    <string name="two_and_some_others_read">%1$s, %2$s and %3$d others read</string>
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s and %3$d other read</item>
+        <item quantity="other">%1$s, %2$s and %3$d others read</item>
+    </plurals>
     <string name="three_users_read">%1$s, %2$s and %3$s read</string>
     <string name="two_users_read">%1$s and %2$s read</string>
     <string name="one_user_read">%s read</string>
@@ -1867,7 +1818,7 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
     <string name="report_content_custom_title">"Report this content"</string>
     <string name="report_content_custom_hint">"Reason for reporting this content"</string>
     <string name="report_content_custom_submit">"REPORT"</string>
-    <string name="block_user">"BLOCK USER"</string>
+    <string name="block_user">"IGNORE USER"</string>
 
     <string name="content_reported_title">"Content reported"</string>
     <string name="content_reported_content">"This content was reported.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
@@ -1880,7 +1831,7 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
 
     <string name="no_network_indicator">There is no network connection right now</string>
 
-    <string name="message_ignore_user">Block user</string>
+    <string name="message_ignore_user">Ignore user</string>
 
     <string name="room_list_quick_actions_notifications_all_noisy">"All messages (noisy)"</string>
     <string name="room_list_quick_actions_notifications_all">"All messages"</string>
@@ -2077,7 +2028,6 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
     <string name="settings_developer_mode_fail_fast_title">Fail-fast</string>
     <string name="settings_developer_mode_fail_fast_summary">Element may crash more often when an unexpected error occurs</string>
 
-    <string name="command_description_verify">Request to verify the given userID</string>
     <string name="command_description_shrug">Prepends ¯\\_(ツ)_/¯ to a plain-text message</string>
 
     <string name="create_room_encryption_title">"Enable encryption"</string>
@@ -2290,7 +2240,7 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Keys are already up to date!</string>
 
-    <string name="login_mobile_device_riotx">Element Android</string>
+    <string name="login_default_session_public_name">Element Android</string>
 
     <string name="settings_key_requests">Key Requests</string>
 
@@ -2390,7 +2340,7 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
     <string name="settings_messages_in_e2e_group_chat">Encrypted messages in group chats</string>
     <string name="settings_when_rooms_are_upgraded">When rooms are upgraded</string>
     <string name="settings_troubleshoot_title">Troubleshoot</string>
-    <string name="settings_notification_advanced_summary_riotx">Set notification importance by event</string>
+    <string name="settings_notification_advanced_summary">Set notification importance by event</string>
 
     <string name="command_description_plain">Sends a message as plain text, without interpreting it as markdown</string>
 
@@ -2439,10 +2389,10 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
     <string name="change_password_summary">Set a new account password…</string>
 
     <string name="use_other_session_content_description">Use the latest Element on your other devices, Element Web, Element Desktop, Element iOS, Element for Android, or another cross-signing capable Matrix client</string>
-    <string name="riot_desktop_web">Element Web\nElement Desktop</string>
-    <string name="riot_ios_android">Element iOS\nElement for Android</string>
+    <string name="app_desktop_web">Element Web\nElement Desktop</string>
+    <string name="app_ios_android">Element iOS\nElement Android</string>
     <string name="or_other_mx_capabale_client">or another cross-signing capable Matrix client</string>
-    <string name="use_latest_riot">Use the latest Element on your other devices:</string>
+    <string name="use_latest_app">Use the latest Element on your other devices:</string>
     <string name="command_description_discard_session">Forces the current outbound group session in an encrypted room to be discarded</string>
     <string name="command_description_discard_session_not_handled">Only supported in encrypted rooms</string>
     <!-- first will be replaced by recovery_passphrase, second will be replaced by recovery_key-->
@@ -2456,7 +2406,7 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
     <string name="encrypted_unverified">Encrypted by an unverified device</string>
     <string name="review_logins">Review where you’re logged in</string>
     <string name="verify_other_sessions">Verify all your sessions to ensure your account &amp; messages are safe</string>
-    <!-- Argument will be replaced by the other session name (e.g, Riot Desktop, mobile) -->
+    <!-- Argument will be replaced by the other session name (e.g, Desktop, mobile) -->
     <string name="verify_this_session">Verify the new login accessing your account: %1$s</string>
 
     <string name="cross_signing_verify_by_text">Manually Verify by Text</string>
@@ -2572,4 +2522,21 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
 
     <string name="alert_push_are_disabled_title">Push notifications are disabled</string>
     <string name="alert_push_are_disabled_description">Review your settings to enable push notifications</string>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Wrong code, %d remaining attempt</item>
+        <item quantity="other">Wrong code, %d remaining attempts</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">Warning! Last remaining attempt before logout!</string>
+    <string name="too_many_pin_failures">Too many errors, you\'ve been logged out</string>
+    <string name="create_pin_title">Choose a PIN for security</string>
+    <string name="create_pin_confirm_title">Confirm PIN</string>
+    <string name="create_pin_confirm_failure">Failed to validate pin, please tap a new one.</string>
+    <string name="auth_pin_title">Enter your PIN</string>
+    <string name="auth_pin_forgot">Forgot PIN?</string>
+    <string name="auth_pin_reset_title">Reset pin</string>
+    <string name="auth_pin_new_pin_action">New pin</string>
+    <string name="auth_pin_reset_content">To reset your PIN, you\'ll need to re-login and create a new one.</string>
+    <string name="settings_security_pin_code_title">Enable PIN</string>
+    <string name="settings_security_pin_code_summary">If you want to reset your PIN, tap Forgot PIN to logout and reset.</string>
+    <string name="auth_pin_confirm_to_disable_title">Confirm PIN to disable PIN</string>
 </resources>
diff --git a/vector/src/main/res/values-v21/styles.xml b/vector/src/main/res/values/styles.xml
similarity index 57%
rename from vector/src/main/res/values-v21/styles.xml
rename to vector/src/main/res/values/styles.xml
index 79c4b4a9aa..09f17a77b4 100644
--- a/vector/src/main/res/values-v21/styles.xml
+++ b/vector/src/main/res/values/styles.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- On post Lollipop use default background drawable instead of color -->
     <style name="Vector.PopupMenu" parent="Vector.PopupMenuBase" />
 
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_pin_code.xml b/vector/src/main/res/values/styles_pin_code.xml
new file mode 100644
index 0000000000..ecf217bf03
--- /dev/null
+++ b/vector/src/main/res/values/styles_pin_code.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="PinCodeScreenStyle" >
+        <item name="android:background">?riotx_background</item>
+    </style>
+
+    <style name="PinCodeKeyButtonStyle">
+        <item name="android:textColor">?riotx_text_primary</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:background">@drawable/bg_pin_key</item>
+    </style>
+
+    <style name="PinCodeDotsViewStyle">
+        <item name="android:button">@drawable/pin_code_dots</item>
+    </style>
+
+    <style name="PinCodeNextButtonStyle" parent="VectorButtonStylePositive">
+        <item name="android:textSize">18sp</item>
+        <item name="android:backgroundTint">@android:color/transparent</item>
+        <item name="android:layout_marginBottom">24dp</item>
+    </style>
+
+    <style name="PinCodeDeleteButtonStyle">
+        <item name="android:src">@drawable/delete_lockscreen_pf</item>
+        <item name="android:tint">?riotx_text_primary</item>
+        <item name="background">@drawable/bg_pin_key</item>
+    </style>
+
+    <style name="PinCodeFingerprintButtonStyle">
+        <item name="android:src">@drawable/fingerprint_lockscreen_pf</item>
+        <item name="android:tint">?riotx_text_primary</item>
+        <item name="background">@drawable/bg_pin_key</item>
+    </style>
+
+    <style name="PinCodeTitleStyle">
+        <item name="android:textColor">?riotx_text_primary</item>
+    </style>
+
+    <style name="PinCodeHintStyle">
+        <item name="android:textColor">?riotx_text_primary</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index 72801f02c4..68fda72cc6 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -15,11 +15,6 @@
         <item name="contentInsetStartWithNavigation">0dp</item>
     </style>
 
-    <style name="VectorToolbarStyle.Group">
-        <item name="android:background">@color/tab_groups</item>
-        <item name="background">@color/tab_groups</item>
-    </style>
-
     <style name="Vector.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
         <item name="android:textSize">20sp</item>
         <item name="android:fontFamily">"sans-serif-medium"</item>
@@ -68,14 +63,6 @@
         <item name="android:dropDownVerticalOffset">0dp</item>
     </style>
 
-    <style name="Vector.PopupMenu" parent="Vector.PopupMenuBase">
-        <!--
-            Before Lollipop the popup background is white on dark theme, so force color here.
-            (v21 will revert back to default drawable)
-        -->
-        <item name="android:popupBackground">?colorBackgroundFloating</item>
-    </style>
-
     <!-- actionbar icons color -->
     <style name="Vector.ActionBarTheme" parent="ThemeOverlay.MaterialComponents.ActionBar">
         <item name="colorControlNormal">@android:color/white</item>
@@ -270,24 +257,6 @@
         <item name="android:textSize">14sp</item>
     </style>
 
-    <!--style name="Floating_Action_Button">
-        <item name="fab_labelsPosition">left</item>
-    </style-->
-
-    <style name="Floating_Actions_Menu">
-        <item name="android:background">@drawable/vector_background_fab_label</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="Floating_Actions_Menu.Light">
-        <item name="android:background">@drawable/vector_background_fab_label_light</item>
-    </style>
-
-    <style name="Vector.TabView.Group" parent="Widget.AppCompat.ActionBar.TabView">
-        <item name="android:background">@drawable/vector_tabbar_background_group_light</item>
-        <item name="background">@drawable/vector_tabbar_background_group_light</item>
-    </style>
-
     <!-- Linear Layout orientation, depending on screen size. Vertical by default -->
     <style name="VectorLinearLayout">
         <item name="android:gravity">end</item>
@@ -340,8 +309,7 @@
         <item name="android:paddingBottom">4dp</item>
         <item name="android:textSize">15sp</item>
         <item name="android:textColor">?riotx_fab_label_color</item>
-        <!-- Note bg will be updated in the code -->
-        <item name="android:background">@drawable/vector_label_background_light</item>
+        <item name="android:background">@drawable/vector_label_background</item>
     </style>
 
     <style name="BottomSheetItemTextMain">
@@ -355,6 +323,17 @@
         <item name="android:textSize">16sp</item>
     </style>
 
+    <style name="BottomSheetItemTextSecondary">
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:textColor">?riotx_text_secondary</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
     <style name="BottomSheetItemTime">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -395,4 +374,9 @@
         <item name="android:textColor">?vctr_message_text_color</item>
     </style>
 
+    <style name="Vector.TabView" parent="Widget.AppCompat.ActionBar.TabView">
+        <item name="android:background">@drawable/vector_tabbar_background</item>
+        <item name="background">@drawable/vector_tabbar_background</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 0c78469c3d..5a9a1b35c6 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -29,6 +29,7 @@
         <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_black</item>
         <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_black</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_black</item>
+        <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_black</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_black</item>
         <item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_black</item>
         <item name="riotx_attachment_selector_background">@color/riotx_attachment_selector_background_black</item>
@@ -38,9 +39,6 @@
 
         <item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_black</item>
 
-        <!-- Drawables -->
-        <item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_black</item>
-
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/riotx_accent</item>
         <!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
@@ -63,7 +61,6 @@
 
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
-        <item name="alertDialogTheme">@style/VectorAlertDialogStyleDark</item>
 
         <item name="android:textColorLink">@color/riotx_links</item>
 
@@ -73,26 +70,26 @@
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">#FF090A0C</item>
-        <!--Header/Panel Text Primary-->
-        <item name="vctr_tab_home">@color/primary_color_black</item>
-        <!--Header/Panel Text Secondary-->
-        <item name="vctr_tab_home_secondary">@color/primary_color_dark_black</item>
 
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_black</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_black</item>
 
-        <item name="vctr_redacted_message_color">@color/list_divider_color_black</item>
-
         <item name="vctr_markdown_block_background_color">#FF4D4D4D</item>
 
-        <item name="vctr_pill_receipt">@drawable/pill_receipt_black</item>
-
         <!-- activities background -->
         <item name="android:windowBackground">@color/riot_primary_background_color_black</item>
         <item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_black</item>
         <item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_black</item>
 
-        <item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_black</item>
+        <item name="android:statusBarColor">@color/riotx_header_panel_background_black</item>
+        <item name="android:navigationBarColor">@color/riotx_header_panel_background_black</item>
+
+        <!-- enable window content transitions -->
+        <item name="android:windowContentTransitions">true</item>
+
+        <!-- specify shared element enter and exit transitions -->
+        <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
+        <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
     </style>
 
     <style name="AppTheme.Black" parent="AppTheme.Base.Black" />
diff --git a/vector/src/main/res/values/theme_common.xml b/vector/src/main/res/values/theme_common.xml
index 5b273937bf..e9fbe40e5a 100644
--- a/vector/src/main/res/values/theme_common.xml
+++ b/vector/src/main/res/values/theme_common.xml
@@ -6,11 +6,16 @@
 
     <style name="AppTheme.Launcher.Base" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="android:windowBackground">@drawable/splash</item>
+        <item name="android:statusBarColor">@color/riotx_accent</item>
+        <item name="android:navigationBarColor">@color/riotx_accent</item>
 
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
     </style>
 
-    <style name="AppTheme.AttachmentsPreview" parent="AppTheme.Base.Black"/>
+    <style name="AppTheme.AttachmentsPreview" parent="AppTheme.Base.Black">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+    </style>
 
     <style name="AppTheme.Transparent" parent="AppTheme.Base.Black">
         <item name="windowActionBar">false</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index fae33cf6bf..6059afcfd0 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -27,6 +27,7 @@
         <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_dark</item>
         <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_dark</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_dark</item>
+        <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_dark</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_dark</item>
         <item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_dark</item>
         <item name="riotx_attachment_selector_background">@color/riotx_attachment_selector_background_dark</item>
@@ -38,9 +39,6 @@
 
         <item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_dark</item>
 
-        <!-- Drawables -->
-        <item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_dark</item>
-
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/riotx_accent</item>
         <item name="colorPrimaryVariant">@color/primary_color_dark_light</item>
@@ -83,40 +81,24 @@
         <item name="vctr_toolbar_secondary_text_color">@color/riot_secondary_text_color_dark</item>
         <item name="vctr_toolbar_link_text_color">@color/link_color_dark</item>
 
-        <!-- application bar text hint color -->
-        <item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_dark</item>
-
-        <item name="vctr_tab_home">@color/primary_color_dark</item>
-        <item name="vctr_tab_home_secondary">@color/primary_color_dark_dark</item>
-
         <!-- default text colors -->
         <item name="vctr_default_text_hint_color">@color/default_text_hint_color_dark</item>
 
         <!-- room message colors -->
-        <!--Unread Room Indent-->
-        <item name="vctr_unread_room_indent_color">#FF2E3648</item>
         <item name="vctr_notice_secondary">#61708B</item>
         <item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
         <item name="vctr_message_text_color">@android:color/white</item>
         <item name="vctr_notice_text_color">@color/riot_primary_text_color_dark</item>
         <item name="vctr_encrypting_message_text_color">@color/accent_color_dark</item>
         <item name="vctr_sending_message_text_color">@color/riotx_text_secondary_dark</item>
-        <item name="vctr_highlighted_message_text_color">@color/vector_fuchsia_color</item>
-        <item name="vctr_highlighted_searched_message_text_color">@color/primary_color_light</item>
-        <item name="vctr_search_mode_room_name_text_color">#CCC3C3C3</item>
-        <item name="vctr_unread_marker_line_color">@color/accent_color_dark</item>
         <item name="vctr_markdown_block_background_color">@android:color/black</item>
         <item name="vctr_spoiler_background_color">#FFFFFFFF</item>
-        <item name="vctr_room_activity_divider_color">#565656</item>
+
+        <item name="riot_primary_text_color">@color/riot_primary_text_color_dark</item>
+        <item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_dark</item>
 
         <!-- tab bar colors -->
         <item name="vctr_tab_bar_inverted_background_color">?colorPrimary</item>
-        <item name="vctr_tab_bar_selected_background_color">
-            @color/tab_bar_selected_background_color_dark
-        </item>
-        <item name="vctr_tab_bar_unselected_background_color">
-            @color/tab_bar_unselected_background_color_dark
-        </item>
 
         <!-- list colors -->
         <!--Header/Panel Background-->
@@ -129,20 +111,9 @@
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_dark</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_dark</item>
 
-        <item name="vctr_redacted_message_color">@color/list_divider_color_dark</item>
-
-        <!-- gradient on the home bottom -->
-        <item name="vctr_activity_bottom_gradient_color">#80000000</item>
-
         <!-- outgoing call background color -->
         <item name="vctr_pending_outgoing_view_background_color">#33FFFFFF</item>
 
-        <!-- multi selection member background color -->
-        <item name="vctr_multi_selection_background_color">#4d4d4d</item>
-
-        <!-- sliding menu icon colors -->
-        <item name="vctr_home_navigation_icon_color">@color/riot_primary_text_color_dark</item>
-
         <!-- room notification text color (typing, unsent...) -->
         <!--Notice (secondary)-->
         <item name="vctr_room_notification_text_color">#FF61708b</item>
@@ -150,32 +121,8 @@
         <!-- icon colors -->
         <item name="vctr_settings_icon_tint_color">@android:color/white</item>
         <item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
-        <item name="vctr_icon_tint_on_dark_action_bar_color">@android:color/white</item>
 
-        <!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
-        <!-- dedicated drawables are created for each theme -->
-        <item name="vctr_line_divider">@drawable/line_divider_dark</item>
-        <item name="vctr_shadow_bottom">@drawable/shadow_bottom_dark</item>
-        <item name="vctr_shadow_top">@drawable/shadow_top_dark</item>
-        <item name="vctr_tabbar_selected_background">
-            @drawable/vector_tabbar_selected_background_dark
-        </item>
-        <item name="vctr_tabbar_unselected_background">
-            @drawable/vector_tabbar_unselected_background_dark
-        </item>
-        <item name="vctr_tabbar_background">@drawable/vector_tabbar_background_dark</item>
-
-        <item name="vctr_pill_background_user_id">@drawable/pill_background_user_id_dark</item>
-        <item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_dark</item>
-
-        <item name="vctr_pill_text_color_user_id">@android:color/white</item>
-        <item name="vctr_pill_text_color_room_alias">@color/riot_primary_text_color_dark</item>
-
-        <item name="vctr_pill_receipt">@drawable/pill_receipt_dark</item>
-
-        <item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_dark</item>
-
-        <item name="vctr_widget_banner_background">#FF454545</item>
+        <item name="list_divider_color">@color/list_divider_color_dark</item>
 
         <!-- ANDROID SUPPORT ATTRIBUTES -->
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
@@ -203,13 +150,16 @@
         <item name="android:actionBarDivider">@null</item>
 
         <!-- tabbar background -->
-        <item name="android:actionBarTabStyle">@style/Vector.TabView.Dark</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView.Dark</item>
+        <item name="android:actionBarTabStyle">@style/Vector.TabView</item>
+        <item name="actionBarTabStyle">@style/Vector.TabView</item>
 
         <!-- tabbar text color -->
         <item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
         <item name="actionBarTabTextStyle">@style/Vector.TabText</item>
 
+        <item name="tab_bar_selected_background_color">@color/tab_bar_selected_background_color_dark</item>
+        <item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_dark</item>
+
         <!-- Preference -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
@@ -222,13 +172,27 @@
         <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
         <!-- Style to use for message text within a SnackBar in this theme. -->
         <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
+
+        <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
+        <item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
+        <item name="pf_title">@style/PinCodeTitleStyle</item>
+        <item name="pf_hint">@style/PinCodeHintStyle</item>
+        <item name="pf_code_view">@style/PinCodeDotsViewStyle</item>
+        <item name="pf_delete_button">@style/PinCodeDeleteButtonStyle</item>
+        <item name="pf_fingerprint_button">@style/PinCodeFingerprintButtonStyle</item>
+        <item name="pf_next">@style/PinCodeNextButtonStyle</item>
+
+        <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
+        <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
+
+        <!-- enable window content transitions -->
+        <item name="android:windowContentTransitions">true</item>
+
+        <!-- specify shared element enter and exit transitions -->
+        <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
+        <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
 
-    <style name="Vector.TabView.Dark" parent="Widget.AppCompat.ActionBar.TabView">
-        <item name="android:background">@drawable/vector_tabbar_background_dark</item>
-        <item name="background">@drawable/vector_tabbar_background_dark</item>
-    </style>
-
 </resources>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 28b29094e5..6426a8e699 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -27,6 +27,7 @@
         <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_light</item>
         <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_light</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_light</item>
+        <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_light</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_light</item>
         <item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_light</item>
         <item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_light</item>
@@ -37,9 +38,6 @@
 
         <item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_light</item>
 
-        <!-- Drawables -->
-        <item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_light</item>
-
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/riotx_accent</item>
         <!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
@@ -83,40 +81,24 @@
         <item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item>
         <item name="vctr_toolbar_link_text_color">@color/riotx_links</item>
 
-        <!-- application bar text hint color -->
-        <item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item>
-
-        <item name="vctr_tab_home">@color/primary_color_light</item>
-        <item name="vctr_tab_home_secondary">@color/primary_color_dark_light</item>
-
         <!-- default text colors -->
         <item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item>
 
         <!-- room message colors -->
-        <!-- Notice (Secondary) -->
-        <item name="vctr_unread_room_indent_color">#FF2E3648</item>
         <item name="vctr_notice_secondary">#61708B</item>
         <item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
         <item name="vctr_message_text_color">@color/riot_primary_text_color_light</item>
         <item name="vctr_notice_text_color">#FF61708b</item>
         <item name="vctr_encrypting_message_text_color">@color/accent_color_light</item>
         <item name="vctr_sending_message_text_color">@color/riotx_text_secondary_light</item>
-        <item name="vctr_highlighted_message_text_color">@color/vector_fuchsia_color</item>
-        <item name="vctr_highlighted_searched_message_text_color">@color/primary_color_light</item>
-        <item name="vctr_search_mode_room_name_text_color">#333C3C3C</item>
-        <item name="vctr_unread_marker_line_color">@color/accent_color_light</item>
         <item name="vctr_markdown_block_background_color">#FFEEEEEE</item>
         <item name="vctr_spoiler_background_color">#FF000000</item>
-        <item name="vctr_room_activity_divider_color">#FFF2F2F2</item>
+
+        <item name="riot_primary_text_color">@color/riot_primary_text_color_light</item>
+        <item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_light</item>
 
         <!-- tab bar colors -->
         <item name="vctr_tab_bar_inverted_background_color">#FFF2F2F2</item>
-        <item name="vctr_tab_bar_selected_background_color">
-            @color/tab_bar_selected_background_color_light
-        </item>
-        <item name="vctr_tab_bar_unselected_background_color">
-            @color/tab_bar_unselected_background_color_light
-        </item>
 
         <!-- list colors -->
         <!--Header/Panel Background-->
@@ -129,20 +111,9 @@
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_light</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_light</item>
 
-        <item name="vctr_redacted_message_color">@color/list_divider_color_light</item>
-
-        <!-- gradient on the home bottom -->
-        <item name="vctr_activity_bottom_gradient_color">#80ffffff</item>
-
         <!-- outgoing call background color -->
         <item name="vctr_pending_outgoing_view_background_color">#33000000</item>
 
-        <!-- multi selection member background color -->
-        <item name="vctr_multi_selection_background_color">#FFF2F2F2</item>
-
-        <!-- sliding menu icon colors -->
-        <item name="vctr_home_navigation_icon_color">@color/riot_primary_text_color_light</item>
-
         <!-- room notification text color (typing, unsent...) -->
         <!--Notice (secondary)-->
         <item name="vctr_room_notification_text_color">#FF61708b</item>
@@ -150,32 +121,8 @@
         <!-- icon colors -->
         <item name="vctr_settings_icon_tint_color">@android:color/black</item>
         <item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
-        <item name="vctr_icon_tint_on_dark_action_bar_color">@android:color/white</item>
 
-        <!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
-        <!-- dedicated drawables are created for each theme -->
-        <item name="vctr_line_divider">@drawable/line_divider_light</item>
-        <item name="vctr_shadow_bottom">@drawable/shadow_bottom_light</item>
-        <item name="vctr_shadow_top">@drawable/shadow_top_light</item>
-        <item name="vctr_tabbar_selected_background">
-            @drawable/vector_tabbar_selected_background_light
-        </item>
-        <item name="vctr_tabbar_unselected_background">
-            @drawable/vector_tabbar_unselected_background_light
-        </item>
-        <item name="vctr_tabbar_background">@drawable/vector_tabbar_background_light</item>
-
-        <item name="vctr_pill_background_user_id">@drawable/pill_background_user_id_light</item>
-        <item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_light</item>
-
-        <item name="vctr_pill_text_color_user_id">@color/riot_primary_text_color_light</item>
-        <item name="vctr_pill_text_color_room_alias">@android:color/white</item>
-
-        <item name="vctr_pill_receipt">@drawable/pill_receipt_light</item>
-
-        <item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_light</item>
-
-        <item name="vctr_widget_banner_background">#FFD3EFE1</item>
+        <item name="list_divider_color">@color/list_divider_color_light</item>
 
         <!-- ANDROID SUPPORT ATTRIBUTES -->
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
@@ -203,13 +150,16 @@
         <item name="android:actionBarDivider">@null</item>
 
         <!-- tabbar background -->
-        <item name="android:actionBarTabStyle">@style/Vector.TabView.Light</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView.Light</item>
+        <item name="android:actionBarTabStyle">@style/Vector.TabView</item>
+        <item name="actionBarTabStyle">@style/Vector.TabView</item>
 
         <!-- tabbar text color -->
         <item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
         <item name="actionBarTabTextStyle">@style/Vector.TabText</item>
 
+        <item name="tab_bar_selected_background_color">@color/tab_bar_selected_background_color_light</item>
+        <item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_light</item>
+
         <!-- Preference -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
@@ -222,13 +172,29 @@
         <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
         <!-- Style to use for message text within a SnackBar in this theme. -->
         <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
+
+        <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
+        <item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
+        <item name="pf_title">@style/PinCodeTitleStyle</item>
+        <item name="pf_hint">@style/PinCodeHintStyle</item>
+        <item name="pf_code_view">@style/PinCodeDotsViewStyle</item>
+        <item name="pf_delete_button">@style/PinCodeDeleteButtonStyle</item>
+        <item name="pf_fingerprint_button">@style/PinCodeFingerprintButtonStyle</item>
+        <item name="pf_next">@style/PinCodeNextButtonStyle</item>
+
+        <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
+        <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
+        <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
+        <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
+
+        <!-- enable window content transitions -->
+        <item name="android:windowContentTransitions">true</item>
+
+        <!-- specify shared element enter and exit transitions -->
+        <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
+        <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
 
-    <style name="Vector.TabView.Light" parent="Widget.AppCompat.ActionBar.TabView">
-        <item name="android:background">@drawable/vector_tabbar_background_light</item>
-        <item name="background">@drawable/vector_tabbar_background_light</item>
-    </style>
-
 </resources>
diff --git a/vector/src/main/res/values/theme_status.xml b/vector/src/main/res/values/theme_status.xml
index ed260ccfeb..4d325075d3 100644
--- a/vector/src/main/res/values/theme_status.xml
+++ b/vector/src/main/res/values/theme_status.xml
@@ -9,7 +9,7 @@
         <item name="colorPrimary">@color/primary_color_status</item>
         <item name="colorAccent">@color/accent_color_status</item>
 
-        <item name="android:textColorPrimary">@color/primary_text_color_selector_status</item>
+        <item name="android:textColorPrimary">@color/primary_text_color_selector</item>
         <item name="android:textColorSecondary">@color/riot_secondary_text_color_status</item>
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/riot_tertiary_text_color_status</item>
@@ -29,90 +29,39 @@
         <item name="riotx_waiting_background_color">@color/riotx_waiting_background_color_status</item>
 
         <!-- application bar text color -->
-        <item name="vctr_toolbar_primary_text_color">#FFFFFFFF</item>
-        <item name="vctr_toolbar_secondary_text_color">#FFD8D8D8</item>
-        <item name="vctr_toolbar_link_text_color">#FFD8D8D8</item>
-
-        <!-- application bar text hint color -->
-        <item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item>
-
-        <item name="vctr_tab_home">@color/primary_color_status</item>
-        <item name="vctr_tab_home_secondary">@color/primary_color_dark_status</item>
-
-        <!-- default text colors -->
-        <item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item>
+        <item name="vctr_toolbar_primary_text_color">@color/primary_color_status</item>
+        <item name="vctr_toolbar_secondary_text_color">@color/primary_color_dark_status</item>
+        <item name="vctr_toolbar_link_text_color">@color/primary_color_dark_status</item>
 
         <!-- room message colors -->
-        <item name="vctr_unread_room_indent_color">?colorAccent</item>
         <item name="vctr_notice_secondary">#61708B</item>
         <item name="vctr_unsent_message_text_color">#FFFF4444</item>
         <item name="vctr_message_text_color">#70879d</item>
         <item name="vctr_notice_text_color">#adadbe</item>
         <item name="vctr_encrypting_message_text_color">#AECDF9</item>
         <item name="vctr_sending_message_text_color">#b3e8d2</item>
-        <item name="vctr_highlighted_message_text_color">@color/vector_fuchsia_color</item>
-        <item name="vctr_highlighted_searched_message_text_color">@color/primary_color_status</item>
-        <item name="vctr_search_mode_room_name_text_color">#333C3C3C</item>
-        <item name="vctr_unread_marker_line_color">#AECDF9</item>
         <item name="vctr_markdown_block_background_color">#FFEEEEEE</item>
-        <item name="vctr_room_activity_divider_color">#FFF2F2F2</item>
+
+        <item name="riot_primary_text_color">@color/riot_primary_text_color_status</item>
+        <item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_status</item>
 
         <!-- tab bar colors -->
         <item name="vctr_tab_bar_inverted_background_color">#FFF2F2F2</item>
-        <item name="vctr_tab_bar_selected_background_color">
-            @color/tab_bar_selected_background_color_status
-        </item>
-        <item name="vctr_tab_bar_unselected_background_color">
-            @color/tab_bar_unselected_background_color_status
-        </item>
 
         <!-- list colors -->
         <item name="vctr_list_header_background_color">#FFF6F6F6</item>
         <item name="vctr_list_header_primary_text_color">#7F3C3C3C</item>
         <item name="vctr_list_header_secondary_text_color">#4D3C3C3C</item>
 
-        <!-- gradient on the home bottom -->
-        <item name="vctr_activity_bottom_gradient_color">#80ffffff</item>
-
         <!-- outgoing call background color -->
         <item name="vctr_pending_outgoing_view_background_color">#33000000</item>
 
-        <!-- multi selection member background color -->
-        <item name="vctr_multi_selection_background_color">#FFF2F2F2</item>
-
-        <!-- sliding menu icon colors -->
-        <item name="vctr_home_navigation_icon_color">@color/riot_primary_text_color_status</item>
-
         <!-- room notification text color (typing, unsent...) -->
         <item name="vctr_room_notification_text_color">#a0a29f</item>
 
         <!-- icon colors -->
         <item name="vctr_settings_icon_tint_color">@color/accent_color_status</item>
         <item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
-        <item name="vctr_icon_tint_on_dark_action_bar_color">@android:color/white</item>
-
-        <!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
-        <!-- dedicated drawables are created for each theme -->
-        <item name="vctr_line_divider">@drawable/line_divider_light</item>
-        <item name="vctr_shadow_bottom">@drawable/shadow_bottom_light</item>
-        <item name="vctr_shadow_top">@drawable/shadow_top_light</item>
-        <item name="vctr_tabbar_selected_background">
-            @drawable/vector_tabbar_selected_background_status
-        </item>
-        <item name="vctr_tabbar_unselected_background">
-            @drawable/vector_tabbar_unselected_background_status
-        </item>
-        <item name="vctr_tabbar_background">@drawable/vector_tabbar_background_status</item>
-
-        <item name="vctr_pill_background_user_id">@drawable/pill_background_user_id_status</item>
-        <item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_status</item>
-
-        <item name="vctr_pill_text_color_user_id">@color/riot_primary_text_color_status</item>
-        <item name="vctr_pill_text_color_room_alias">@android:color/white</item>
-
-        <item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_status</item>
-
-        <item name="vctr_widget_banner_background">#FFF7F7F7</item>
 
         <!-- ANDROID SUPPORT ATTRIBUTES -->
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
@@ -139,25 +88,31 @@
         <!-- no divider -->
         <item name="android:actionBarDivider">@null</item>
 
-        <!-- tabbar background -->
-        <item name="android:actionBarTabStyle">@style/Vector.TabView.Status</item>
-        <item name="actionBarTabStyle">@style/Vector.TabView.Status</item>
-
         <!-- tabbar text color -->
         <item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
         <item name="actionBarTabTextStyle">@style/Vector.TabText</item>
 
+        <item name="tab_bar_selected_background_color">@color/tab_bar_selected_background_color_status</item>
+        <item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_status</item>
+
         <!-- Preference -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
         <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Status</item>
+
+        <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
+        <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
+        <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
+        <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
+
+        <!-- enable window content transitions -->
+        <item name="android:windowContentTransitions">true</item>
+
+        <!-- specify shared element enter and exit transitions -->
+        <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
+        <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
     </style>
 
     <style name="AppTheme.Status" parent="AppTheme.Base.Status" />
 
-    <style name="Vector.TabView.Status" parent="Widget.AppCompat.ActionBar.TabView">
-        <item name="android:background">@drawable/vector_tabbar_background_status</item>
-        <item name="background">@drawable/vector_tabbar_background_status</item>
-    </style>
-
 </resources>
diff --git a/vector/src/main/res/xml/motion_scene_fab_menu.xml b/vector/src/main/res/xml/motion_scene_fab_menu.xml
index 646cfc34c5..0be402649a 100644
--- a/vector/src/main/res/xml/motion_scene_fab_menu.xml
+++ b/vector/src/main/res/xml/motion_scene_fab_menu.xml
@@ -73,7 +73,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/fab_menu_create_room"
             android:visibility="invisible"
             motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemGroup"
@@ -102,7 +101,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/fab_menu_create_chat"
             android:visibility="invisible"
             motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemChat"
@@ -115,7 +113,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginBottom="16dp"
             android:src="@drawable/ic_fab_add"
             motion:layout_constraintBottom_toBottomOf="parent"
@@ -153,7 +150,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/fab_menu_create_room"
             motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemGroup"
             motion:layout_constraintEnd_toStartOf="@+id/createRoomItemGroup"
@@ -180,7 +176,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/fab_menu_create_chat"
             motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemChat"
             motion:layout_constraintEnd_toStartOf="@+id/createRoomItemChat"
@@ -192,7 +187,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginBottom="16dp"
             android:rotation="135"
             android:src="@drawable/ic_fab_add"
diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
index e92aae3ff9..6d8de815d8 100644
--- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml
+++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
@@ -2,41 +2,41 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_developer_mode">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_developer_mode">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:key="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
             android:summary="@string/settings_developer_mode_summary"
             android:title="@string/settings_developer_mode" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
             android:key="SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
             android:title="@string/settings_labs_show_hidden_events_in_timeline" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
             android:key="SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
             android:summary="@string/labs_allow_extended_logging_summary"
             android:title="@string/labs_allow_extended_logging" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
             android:key="SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY"
             android:summary="@string/settings_developer_mode_fail_fast_summary"
             android:title="@string/settings_developer_mode_fail_fast_title" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_RAGE_SHAKE_CATEGORY_KEY"
         android:title="@string/settings_rageshake">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_USE_RAGE_SHAKE_KEY"
             android:title="@string/send_bug_report_rage_shake" />
@@ -50,35 +50,35 @@
             android:title="@string/settings_rageshake_detection_threshold"
             app:min="11" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_notifications">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_notifications">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:persistent="false"
             android:title="@string/settings_notifications_targets"
-            app:fragment="im.vector.riotx.features.settings.push.PushGatewaysFragment" />
+            app:fragment="im.vector.app.features.settings.push.PushGatewaysFragment" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:persistent="false"
             android:title="@string/settings_push_rules"
-            app:fragment="im.vector.riotx.features.settings.push.PushRulesFragment" />
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+            app:fragment="im.vector.app.features.settings.push.PushRulesFragment" />
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         android:title="@string/settings_dev_tools">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:persistent="false"
             android:title="@string/settings_account_data"
-            app:fragment="im.vector.riotx.features.settings.devtools.AccountDataFragment" />
+            app:fragment="im.vector.app.features.settings.devtools.AccountDataFragment" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:persistent="false"
             android:title="@string/settings_key_requests"
-            app:fragment="im.vector.riotx.features.settings.devtools.KeyRequestsFragment" />
+            app:fragment="im.vector.app.features.settings.devtools.KeyRequestsFragment" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_flair.xml b/vector/src/main/res/xml/vector_settings_flair.xml
index 9d074cbcf7..ac7ae83d24 100644
--- a/vector/src/main/res/xml/vector_settings_flair.xml
+++ b/vector/src/main/res/xml/vector_settings_flair.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_GROUPS_FLAIR_KEY"
         android:title="@string/settings_flair" />
 
diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml
index 1278dd933f..042ea5c77c 100644
--- a/vector/src/main/res/xml/vector_settings_general.xml
+++ b/vector/src/main/res/xml/vector_settings_general.xml
@@ -4,20 +4,20 @@
     xmlns:tools="http://schemas.android.com/tools">
 
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_USER_SETTINGS_PREFERENCE_KEY"
         android:title="@string/settings_user_settings">
 
-        <im.vector.riotx.core.preference.UserAvatarPreference
+        <im.vector.app.core.preference.UserAvatarPreference
             android:key="SETTINGS_PROFILE_PICTURE_PREFERENCE_KEY"
             android:title="@string/settings_profile_picture" />
 
-        <im.vector.riotx.core.preference.VectorEditTextPreference
+        <im.vector.app.core.preference.VectorEditTextPreference
             android:key="SETTINGS_DISPLAY_NAME_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_display_name" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_CHANGE_PASSWORD_PREFERENCE_KEY"
             android:summary="@string/change_password_summary"
             android:title="@string/settings_password" />
@@ -25,7 +25,7 @@
         <!-- Email will be added here -->
 
         <!-- Note: inputType does not work, it is set also in code, as well as iconTint -->
-        <im.vector.riotx.core.preference.VectorEditTextPreference
+        <im.vector.app.core.preference.VectorEditTextPreference
             android:icon="@drawable/ic_material_add"
             android:inputType="textEmailAddress"
             android:key="ADD_EMAIL_PREFERENCE_KEY"
@@ -36,102 +36,102 @@
         <!-- Phone will be added here -->
 
         <!-- Note: iconTint does not work, it is also done in code -->
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:icon="@drawable/ic_material_add"
             android:key="ADD_PHONE_NUMBER_PREFERENCE_KEY"
             android:order="200"
             android:title="@string/settings_add_phone_number"
             app:iconTint="@color/riotx_accent" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:order="1000"
             android:persistent="false"
             android:summary="@string/settings_discovery_manage"
             android:title="@string/settings_discovery_category"
-            app:fragment="im.vector.riotx.features.discovery.DiscoverySettingsFragment" />
+            app:fragment="im.vector.app.features.discovery.DiscoverySettingsFragment" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CONTACT_PREFERENCE_KEYS"
         android:title="@string/settings_contact"
         app:isPreferenceVisible="@bool/false_not_implemented">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:key="CONTACT_BOOK_ACCESS_KEY"
             android:title="@string/settings_contacts_app_permission" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:dialogTitle="@string/settings_select_country"
             android:key="SETTINGS_CONTACTS_PHONEBOOK_COUNTRY_PREFERENCE_KEY"
             android:title="@string/settings_contacts_phonebook_country" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_integrations">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_integrations">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:focusable="false"
             android:persistent="false"
             android:summary="@string/settings_integrations_summary" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_ALLOW_INTEGRATIONS_KEY"
             android:persistent="false"
             android:title="@string/settings_integration_allow" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:dependency="SETTINGS_ALLOW_INTEGRATIONS_KEY"
             android:key="SETTINGS_INTEGRATION_MANAGER_UI_URL_KEY"
             android:persistent="false"
             android:title="@string/settings_integration_manager" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_advanced">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_advanced">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_LOGGED_IN_PREFERENCE_KEY"
             android:title="@string/settings_logged_in"
             tools:summary="\@user:matrix.org" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_HOME_SERVER_PREFERENCE_KEY"
             android:title="@string/settings_home_server"
             tools:summary="https://homeserver.org" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY"
             android:title="@string/settings_identity_server"
-            app:fragment="im.vector.riotx.features.discovery.DiscoverySettingsFragment"
+            app:fragment="im.vector.app.features.discovery.DiscoverySettingsFragment"
             tools:summary="https://identity.server.url" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_CLEAR_MEDIA_CACHE_PREFERENCE_KEY"
             android:title="@string/settings_clear_media_cache" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_CLEAR_CACHE_PREFERENCE_KEY"
             android:title="@string/settings_clear_cache" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/action_sign_out">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/action_sign_out">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_SIGN_OUT_KEY"
             android:title="@string/action_sign_out" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_deactivate_account_section">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_deactivate_account_section">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_DEACTIVATE_ACCOUNT_KEY"
             android:persistent="false"
             android:title="@string/settings_deactivate_my_account"
-            app:fragment="im.vector.riotx.features.settings.account.deactivation.DeactivateAccountFragment" />
+            app:fragment="im.vector.app.features.settings.account.deactivation.DeactivateAccountFragment" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_help_about.xml b/vector/src/main/res/xml/vector_settings_help_about.xml
index 2720a19533..b36fba05c2 100644
--- a/vector/src/main/res/xml/vector_settings_help_about.xml
+++ b/vector/src/main/res/xml/vector_settings_help_about.xml
@@ -3,43 +3,43 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:key="APP_INFO_LINK_PREFERENCE_KEY"
         android:summary="@string/settings_app_info_link_summary"
         android:title="@string/settings_app_info_link_title" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:key="SETTINGS_VERSION_PREFERENCE_KEY"
         android:title="@string/settings_version"
         tools:summary="1.2.3" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:key="SETTINGS_SDK_VERSION_PREFERENCE_KEY"
         android:title="@string/settings_sdk_version"
         tools:summary="4.5.6" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:key="SETTINGS_OLM_VERSION_PREFERENCE_KEY"
         android:title="@string/settings_olm_version"
         tools:summary="7.8.9" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:key="SETTINGS_COPYRIGHT_PREFERENCE_KEY"
         android:title="@string/settings_copyright" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:key="SETTINGS_APP_TERM_CONDITIONS_PREFERENCE_KEY"
         android:title="@string/settings_app_term_conditions" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:key="SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY"
         android:title="@string/settings_privacy_policy" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:key="SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
         android:title="@string/settings_third_party_notices" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:key="SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
         android:title="@string/settings_other_third_party_notices"
         app:isPreferenceVisible="@bool/isGplay" />
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 2c52b2198e..736a0b90c3 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!--<im.vector.riotx.core.preference.VectorPreferenceCategory-->
+    <!--<im.vector.app.core.preference.VectorPreferenceCategory-->
     <!--android:key="SETTINGS_LABS_PREFERENCE_KEY"-->
     <!--android:title="@string/room_settings_labs_pref_title">-->
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:focusable="false"
         android:key="labs_warning"
         android:summary="@string/room_settings_labs_warning_message" />
 
-    <!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
+    <!--<im.vector.app.core.preference.VectorSwitchPreference-->
     <!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_PREFERENCE_KEY"-->
     <!--android:title="@string/room_settings_labs_end_to_end" />-->
 
-    <!--<im.vector.riotx.core.preference.VectorPreference-->
+    <!--<im.vector.app.core.preference.VectorPreference-->
     <!--android:focusable="false"-->
     <!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_IS_ACTIVE_PREFERENCE_KEY"-->
     <!--android:title="@string/room_settings_labs_end_to_end_is_active" />-->
 
-    <!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
+    <!--<im.vector.app.core.preference.VectorSwitchPreference-->
     <!--android:key="SETTINGS_DATA_SAVE_MODE_PREFERENCE_KEY"-->
     <!--android:summary="@string/settings_data_save_mode_summary"-->
     <!--android:title="@string/settings_data_save_mode" />-->
 
-    <!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
+    <!--<im.vector.app.core.preference.VectorSwitchPreference-->
     <!--android:defaultValue="true"-->
     <!--android:key="SETTINGS_USE_JITSI_CONF_PREFERENCE_KEY"-->
     <!--android:title="@string/settings_labs_create_conference_with_jitsi" />-->
 
-    <!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
+    <!--<im.vector.app.core.preference.VectorSwitchPreference-->
     <!--android:key="SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY"-->
     <!--android:summary="@string/settings_labs_enable_send_voice_summary"-->
     <!--android:title="@string/settings_labs_enable_send_voice" />-->
 
-    <im.vector.riotx.core.preference.VectorSwitchPreference
+    <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="true"
         android:key="SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY"
         android:title="@string/labs_swipe_to_reply_in_timeline" />
 
 
-    <im.vector.riotx.core.preference.VectorSwitchPreference
+    <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_MERGE_E2E_ERRORS"
         android:title="@string/labs_merge_e2e_in_timeline" />
 
 
-    <im.vector.riotx.core.preference.VectorSwitchPreference
+    <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
         android:title="@string/labs_show_unread_notifications_as_tab" />
-    <!--</im.vector.riotx.core.preference.VectorPreferenceCategory>-->
+    <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml b/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml
index 6e0fb71671..4e9a9b07bf 100644
--- a/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml
@@ -1,67 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_NOTIFICATION_LEVEL"
         android:title="@string/settings_notification_by_event">
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_CONTAINING_MY_DISPLAY_NAME_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_containing_my_display_name" />
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_CONTAINING_MY_USER_NAME_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_containing_my_user_name" />
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_CONTAINING_AT_ROOM_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_messages_at_room" />
 
         <!-- TODO Support message with keywords rule -->
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_IN_ONE_TO_ONE_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_messages_in_one_to_one" />
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_ONE_ONE_CHAT_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_messages_in_e2e_one_to_one" />
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_IN_GROUP_CHAT_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_messages_in_group_chat" />
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_GROUP_CHAT_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_messages_in_e2e_group_chat" />
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_INVITED_TO_ROOM_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_invited_to_room" />
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_CALL_INVITATIONS_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_call_invitations" />
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_messages_sent_by_bot" />
 
-        <im.vector.riotx.core.preference.PushRulePreference
+        <im.vector.app.core.preference.PushRulePreference
             android:key="SETTINGS_PUSH_RULE_ROOMS_UPGRADED_KEY"
             android:persistent="false"
             android:title="@string/settings_when_rooms_are_upgraded" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
diff --git a/vector/src/main/res/xml/vector_settings_notifications.xml b/vector/src/main/res/xml/vector_settings_notifications.xml
index 5ecf693b44..3e19c9e9e5 100644
--- a/vector/src/main/res/xml/vector_settings_notifications.xml
+++ b/vector/src/main/res/xml/vector_settings_notifications.xml
@@ -2,103 +2,103 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_notifications">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_notifications">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:title="@string/settings_enable_all_notif" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
             android:title="@string/settings_enable_this_device" />
 
-        <!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
+        <!--<im.vector.app.core.preference.VectorSwitchPreference-->
         <!--android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"-->
         <!--android:key="SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY"-->
         <!--android:title="@string/settings_turn_screen_on" />-->
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
             android:key="SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY"
             android:persistent="false"
-            android:summary="@string/settings_notification_advanced_summary_riotx"
+            android:summary="@string/settings_notification_advanced_summary"
             android:title="@string/settings_notification_advanced"
-            app:fragment="im.vector.riotx.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment" />
+            app:fragment="im.vector.app.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:persistent="false"
         android:title="@string/settings_notification_configuration">
 
         <!-- For API < 26 -->
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:dialogTitle="@string/settings_notification_ringtone"
             android:key="SETTINGS_NOTIFICATION_RINGTONE_SELECTION_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_notification_ringtone" />
 
         <!-- For API >= 26 -->
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_SYSTEM_NOISY_NOTIFICATION_PREFERENCE_KEY"
             android:persistent="false"
             android:summary="@string/settings_system_preferences_summary"
             android:title="@string/settings_noisy_notifications_preferences" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_SYSTEM_SILENT_NOTIFICATION_PREFERENCE_KEY"
             android:persistent="false"
             android:summary="@string/settings_system_preferences_summary"
             android:title="@string/settings_silent_notifications_preferences" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_SYSTEM_CALL_NOTIFICATION_PREFERENCE_KEY"
             android:persistent="false"
             android:summary="@string/settings_system_preferences_summary"
             android:title="@string/settings_call_notifications_preferences" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_troubleshoot_title">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_troubleshoot_title">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_NOTIFICATION_TROUBLESHOOT_PREFERENCE_KEY"
             android:title="@string/settings_notification_troubleshoot"
-            app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment" />
+            app:fragment="im.vector.app.features.settings.VectorSettingsNotificationsTroubleshootFragment" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <!--im.vector.riotx.core.preference.VectorPreferenceCategory
+    <!--im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_BACKGROUND_SYNC_PREFERENCE_KEY"
         android:title="@string/settings_background_sync">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_START_ON_BOOT_PREFERENCE_KEY"
             android:title="@string/settings_start_on_boot" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
             android:title="@string/settings_enable_background_sync" />
 
-        <im.vector.riotx.core.preference.VectorEditTextPreference
+        <im.vector.app.core.preference.VectorEditTextPreference
             android:dependency="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
             android:key="SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY"
             android:numeric="integer"
             android:title="@string/settings_set_sync_timeout" />
 
-        <im.vector.riotx.core.preference.VectorEditTextPreference
+        <im.vector.app.core.preference.VectorEditTextPreference
             android:dependency="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
             android:key="SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY"
             android:numeric="integer"
             android:title="@string/settings_set_sync_delay" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_NOTIFICATIONS_TARGETS_PREFERENCE_KEY"
         android:title="@string/settings_notifications_targets" /-->
 
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index d290b62825..668aa9aa2b 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -2,17 +2,17 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_USER_INTERFACE_KEY"
         android:title="@string/settings_user_interface">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_interface_language"
-            app:fragment="im.vector.riotx.features.settings.locale.LocalePickerFragment" />
+            app:fragment="im.vector.app.features.settings.locale.LocalePickerFragment" />
 
-        <im.vector.riotx.core.preference.VectorListPreference
+        <im.vector.app.core.preference.VectorListPreference
             android:defaultValue="light"
             android:entries="@array/theme_entries"
             android:entryValues="@array/theme_values"
@@ -21,87 +21,87 @@
             android:title="@string/settings_theme"
             app:iconSpaceReserved="false" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:dialogTitle="@string/font_size"
             android:key="SETTINGS_INTERFACE_TEXT_SIZE_KEY"
             android:persistent="false"
             android:title="@string/font_size" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_category_composer">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_category_composer">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:key="SETTINGS_ENABLE_MARKDOWN_KEY"
             android:summary="@string/settings_send_markdown_summary"
             android:title="@string/settings_send_markdown" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SEND_TYPING_NOTIF_KEY"
             android:summary="@string/settings_send_typing_notifs_summary"
             android:title="@string/settings_send_typing_notifs" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_category_timeline">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_category_timeline">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_URL_PREVIEW_KEY"
             android:summary="@string/settings_inline_url_preview_summary"
             android:title="@string/settings_inline_url_preview"
             app:isPreferenceVisible="@bool/false_not_implemented" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY"
             android:title="@string/settings_always_show_timestamps"
             app:isPreferenceVisible="@bool/false_not_implemented" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_12_24_TIMESTAMPS_KEY"
             android:title="@string/settings_12_24_timestamps"
             app:isPreferenceVisible="@bool/false_not_implemented" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_READ_RECEIPTS_KEY"
             android:summary="@string/settings_show_read_receipts_summary"
             android:title="@string/settings_show_read_receipts" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_REDACTED_KEY"
             android:summary="@string/settings_show_redacted_summary"
             android:title="@string/settings_show_redacted" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_JOIN_LEAVE_MESSAGES_KEY"
             android:summary="@string/settings_show_join_leave_messages_summary"
             android:title="@string/settings_show_join_leave_messages"
             app:isPreferenceVisible="@bool/false_not_implemented" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_AVATAR_DISPLAY_NAME_CHANGES_MESSAGES_KEY"
             android:summary="@string/settings_show_avatar_display_name_changes_messages_summary"
             android:title="@string/settings_show_avatar_display_name_changes_messages"
             app:isPreferenceVisible="@bool/false_not_implemented" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_VIBRATE_ON_MENTION_KEY"
             android:title="@string/settings_vibrate_on_mention"
             app:isPreferenceVisible="@bool/false_not_implemented" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_SEND_MESSAGE_WITH_ENTER"
             android:summary="@string/settings_send_message_with_enter_summary"
             android:title="@string/settings_send_message_with_enter"
             app:isPreferenceVisible="@bool/false_not_implemented" />
 
-        <im.vector.riotx.core.preference.VectorListPreference
+        <im.vector.app.core.preference.VectorListPreference
             android:defaultValue="always"
             android:entries="@array/show_info_area_entries"
             android:entryValues="@array/show_info_area_values"
@@ -110,49 +110,49 @@
             android:title="@string/settings_info_area_show"
             app:isPreferenceVisible="@bool/false_not_implemented" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_HOME_DISPLAY_KEY"
         android:title="@string/settings_home_display"
         app:isPreferenceVisible="@bool/false_not_implemented">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_PIN_MISSED_NOTIFICATIONS_PREFERENCE_KEY"
             android:title="@string/settings_pin_missed_notifications" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_PIN_UNREAD_MESSAGES_PREFERENCE_KEY"
             android:title="@string/settings_pin_unread_messages" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:title="@string/settings_media"
         app:isPreferenceVisible="@bool/false_not_implemented">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_MEDIA_SAVING_PERIOD_KEY"
             android:title="@string/settings_keep_media" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_USE_NATIVE_CAMERA_PREFERENCE_KEY"
             android:summary="@string/settings_labs_native_camera_summary"
             android:title="@string/settings_labs_native_camera" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_PLAY_SHUTTER_SOUND_KEY"
 
             android:title="@string/settings_play_shutter_sound" />
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_PREVIEW_MEDIA_BEFORE_SENDING_KEY"
             android:title="@string/settings_preview_media_before_sending" />
 
-        <im.vector.riotx.core.preference.VectorListPreference
+        <im.vector.app.core.preference.VectorListPreference
             android:defaultValue="0"
             android:entries="@array/compression_levels"
             android:entryValues="@array/compression_level_values"
@@ -160,7 +160,7 @@
             android:summary="%s"
             android:title="@string/settings_default_compression" />
 
-        <im.vector.riotx.core.preference.VectorListPreference
+        <im.vector.app.core.preference.VectorListPreference
             android:defaultValue="0"
             android:entries="@array/media_sources"
             android:entryValues="@array/media_source_values"
@@ -168,6 +168,6 @@
             android:summary="%s"
             android:title="@string/settings_default_media_source" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml
index 882919cb99..100db7ce79 100644
--- a/vector/src/main/res/xml/vector_settings_root.xml
+++ b/vector/src/main/res/xml/vector_settings_root.xml
@@ -2,57 +2,55 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_general"
         android:title="@string/settings_general_title"
-        app:fragment="im.vector.riotx.features.settings.VectorSettingsGeneralFragment" />
+        app:fragment="im.vector.app.features.settings.VectorSettingsGeneralFragment" />
 
-    <im.vector.riotx.core.preference.VectorPreference
-        android:enabled="@bool/false_not_implemented"
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_flair"
         android:title="@string/settings_flair"
-        app:fragment="im.vector.riotx.features.settings.VectorSettingsFlairFragment" />
+        app:fragment="im.vector.app.features.settings.VectorSettingsFlairFragment"
+        app:isPreferenceVisible="@bool/false_not_implemented" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_notification"
         android:title="@string/settings_notifications"
-        app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment" />
+        app:fragment="im.vector.app.features.settings.VectorSettingsNotificationPreferenceFragment" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_preferences"
         android:title="@string/settings_preferences"
-        app:fragment="im.vector.riotx.features.settings.VectorSettingsPreferencesFragment" />
+        app:fragment="im.vector.app.features.settings.VectorSettingsPreferencesFragment" />
 
-    <im.vector.riotx.core.preference.VectorPreference
-        app:isPreferenceVisible="@bool/false_not_implemented"
-        android:enabled="@bool/false_not_implemented"
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_call"
         android:title="@string/preference_voice_and_video"
-        app:fragment="im.vector.riotx.features.settings.VectorSettingsVoiceVideoFragment" />
+        app:fragment="im.vector.app.features.settings.VectorSettingsVoiceVideoFragment" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_ignored_users"
         android:title="@string/settings_ignored_users"
-        app:fragment="im.vector.riotx.features.settings.ignored.VectorSettingsIgnoredUsersFragment" />
+        app:fragment="im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_security_privacy"
         android:title="@string/settings_security_and_privacy"
-        app:fragment="im.vector.riotx.features.settings.VectorSettingsSecurityPrivacyFragment" />
+        app:fragment="im.vector.app.features.settings.VectorSettingsSecurityPrivacyFragment" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_labs"
         android:title="@string/room_settings_labs_pref_title"
-        app:fragment="im.vector.riotx.features.settings.VectorSettingsLabsFragment" />
+        app:fragment="im.vector.app.features.settings.VectorSettingsLabsFragment" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_advanced"
         android:title="@string/settings_advanced_settings"
-        app:fragment="im.vector.riotx.features.settings.VectorSettingsAdvancedSettingsFragment" />
+        app:fragment="im.vector.app.features.settings.VectorSettingsAdvancedSettingsFragment" />
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_help_about"
         android:title="@string/preference_root_help_about"
-        app:fragment="im.vector.riotx.features.settings.VectorSettingsHelpAboutFragment" />
+        app:fragment="im.vector.app.features.settings.VectorSettingsHelpAboutFragment" />
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml
index 5f249fb358..9cd629251e 100644
--- a/vector/src/main/res/xml/vector_settings_security_privacy.xml
+++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml
@@ -3,120 +3,132 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_notification_privacy_warning"
         android:key="SETTINGS_CRYPTOGRAPHY_HS_ADMIN_DISABLED_E2E_DEFAULT"
         android:persistent="false"
-        tools:summary="@string/settings_hs_admin_e2e_disabled"
         app:isPreferenceVisible="false"
-        tools:isPreferenceVisible="true">
+        tools:isPreferenceVisible="true"
+        tools:summary="@string/settings_hs_admin_e2e_disabled">
 
-    </im.vector.riotx.core.preference.VectorPreference>
+    </im.vector.app.core.preference.VectorPreference>
 
     <!-- ************ Cryptography section ************ -->
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CRYPTOGRAPHY_PREFERENCE_KEY"
         android:title="@string/settings_cryptography">
-        <im.vector.riotx.core.preference.VectorPreference
+
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_ENCRYPTION_CROSS_SIGNING_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/encryption_information_cross_signing_state"
-            app:fragment="im.vector.riotx.features.settings.crosssigning.CrossSigningSettingsFragment"
+            app:fragment="im.vector.app.features.settings.crosssigning.CrossSigningSettingsFragment"
             tools:icon="@drawable/ic_shield_trusted"
             tools:summary="@string/encryption_information_dg_xsigning_complete" />
 
+        <im.vector.app.core.preference.VectorPreference
+            android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_NAME_PREFERENCE_KEY"
+            android:persistent="false"
+            android:title="@string/encryption_information_device_name"
+            tools:summary="My public device name" />
 
-        <!--        <im.vector.riotx.core.preference.VectorPreference-->
-        <!--            android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_NAME_PREFERENCE_KEY"-->
-        <!--            android:title="@string/encryption_information_device_name" />-->
+        <im.vector.app.core.preference.VectorPreference
+            android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_ID_PREFERENCE_KEY"
+            android:persistent="false"
+            android:title="@string/encryption_information_device_id"
+            tools:summary="VZRHETBEER" />
 
-        <!--        <im.vector.riotx.core.preference.VectorPreference-->
-        <!--            android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_ID_PREFERENCE_KEY"-->
-        <!--            android:title="@string/encryption_information_device_id" />-->
+        <im.vector.app.core.preference.VectorPreference
+            android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_KEY_PREFERENCE_KEY"
+            android:persistent="false"
+            android:title="@string/encryption_information_device_key"
+            tools:summary="3To0 8c/K VRJd 4Njb DUgv 6r8A SNp9 ETZt pMwU CpE4 XJE" />
 
-        <!--        <im.vector.riotx.core.preference.VectorPreference-->
-        <!--            android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_KEY_PREFERENCE_KEY"-->
-        <!--            android:title="@string/encryption_information_device_key" />-->
-
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:enabled="true"
             android:key="SETTINGS_ENCRYPTION_NEVER_SENT_TO_PREFERENCE_KEY"
             android:summary="@string/encryption_never_send_to_unverified_devices_summary"
             android:title="@string/encryption_never_send_to_unverified_devices_title" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
     <!-- devices list entry point -->
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_DEVICES_LIST_PREFERENCE_KEY"
         android:title="@string/settings_active_sessions_list">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_SHOW_DEVICES_LIST_PREFERENCE_KEY"
             android:title="@string/settings_active_sessions_show_all"
-            app:fragment="im.vector.riotx.features.settings.devices.VectorSettingsDevicesFragment" />
+            app:fragment="im.vector.app.features.settings.devices.VectorSettingsDevicesFragment" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_4S_CATEGORY_KEY"
         android:title="@string/settings_secure_backup_section_title">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:icon="@drawable/ic_secure_backup"
             android:key="SETTINGS_SECURE_BACKUP_RECOVERY_PREFERENCE_KEY"
             android:persistent="false"
             android:title="@string/settings_secure_backup_setup" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:focusable="false"
             android:persistent="false"
             android:summary="@string/settings_secure_backup_section_info" />
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_PREFERENCE_KEY"
         android:title="@string/settings_cryptography_manage_keys">
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY"
             android:persistent="false"
             android:summary="@string/encryption_settings_manage_message_recovery_summary"
             android:title="@string/encryption_message_recovery" />
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_ENCRYPTION_EXPORT_E2E_ROOM_KEYS_PREFERENCE_KEY"
             android:summary="@string/encryption_export_room_keys_summary"
             android:title="@string/encryption_export_e2e_room_keys" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_ENCRYPTION_IMPORT_E2E_ROOM_KEYS_PREFERENCE_KEY"
             android:summary="@string/encryption_import_room_keys_summary"
             android:title="@string/encryption_import_e2e_room_keys" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY"
         android:title="@string/settings_analytics"
         app:isPreferenceVisible="@bool/false_not_implemented">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:key="SETTINGS_USE_ANALYTICS_KEY"
             android:summary="@string/settings_opt_in_of_analytics_summary"
             android:title="@string/settings_opt_in_of_analytics" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_other">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_other">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:key="SETTINGS_SECURITY_USE_FLAG_SECURE"
             android:summary="@string/settings_security_prevent_screenshots_summary"
             android:title="@string/settings_security_prevent_screenshots_title" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:key="SETTINGS_SECURITY_USE_PIN_CODE_FLAG"
+            android:summary="@string/settings_security_pin_code_summary"
+            android:title="@string/settings_security_pin_code_title" />
+
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_voice_video.xml b/vector/src/main/res/xml/vector_settings_voice_video.xml
index 787935b884..fc0c4b7bc2 100644
--- a/vector/src/main/res/xml/vector_settings_voice_video.xml
+++ b/vector/src/main/res/xml/vector_settings_voice_video.xml
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_call_category">
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_call_category">
 
-        <im.vector.riotx.core.preference.VectorSwitchPreference
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:key="SETTINGS_CALL_PREVENT_ACCIDENTAL_CALL_KEY"
+            android:summary="@string/settings_call_show_confirmation_dialog_summary"
+            android:title="@string/settings_call_show_confirmation_dialog_title" />
+
+        <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:disableDependentsState="true"
             android:key="SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY"
-            android:title="@string/settings_call_ringtone_use_riot_ringtone" />
+            android:title="@string/settings_call_ringtone_use_app_ringtone"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+        <im.vector.app.core.preference.VectorPreference
             android:dependency="SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY"
             android:key="SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY"
-            android:title="@string/settings_call_ringtone_title" />
+            android:title="@string/settings_call_ringtone_title"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt b/vector/src/release/java/im/vector/app/features/debug/DebugMenuActivity.kt
similarity index 94%
rename from vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt
rename to vector/src/release/java/im/vector/app/features/debug/DebugMenuActivity.kt
index bd97cad9e5..c5db033a18 100644
--- a/vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt
+++ b/vector/src/release/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 import androidx.appcompat.app.AppCompatActivity
 
diff --git a/vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt b/vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt
similarity index 96%
rename from vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt
rename to vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt
index 07baeababc..dfb221fbc5 100644
--- a/vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt
+++ b/vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt
@@ -16,7 +16,7 @@
 
 @file:Suppress("UNUSED_PARAMETER")
 
-package im.vector.riotx.receivers
+package im.vector.app.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/vector/src/sharedTest/java/im/vector/riotx/test/shared/TestRules.kt b/vector/src/sharedTest/java/im/vector/app/test/shared/TestRules.kt
similarity index 96%
rename from vector/src/sharedTest/java/im/vector/riotx/test/shared/TestRules.kt
rename to vector/src/sharedTest/java/im/vector/app/test/shared/TestRules.kt
index d5790ba497..73ac4ffcd2 100644
--- a/vector/src/sharedTest/java/im/vector/riotx/test/shared/TestRules.kt
+++ b/vector/src/sharedTest/java/im/vector/app/test/shared/TestRules.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.test.shared
+package im.vector.app.test.shared
 
 import net.lachlanmckee.timberjunit.TimberTestRule
 
diff --git a/vector/src/test/java/im/vector/riotx/features/home/UserColorTest.kt b/vector/src/test/java/im/vector/app/features/home/UserColorTest.kt
similarity index 91%
rename from vector/src/test/java/im/vector/riotx/features/home/UserColorTest.kt
rename to vector/src/test/java/im/vector/app/features/home/UserColorTest.kt
index da8dba4137..0ae2d694ba 100644
--- a/vector/src/test/java/im/vector/riotx/features/home/UserColorTest.kt
+++ b/vector/src/test/java/im/vector/app/features/home/UserColorTest.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.app.features.home
 
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.getColorFromUserId
+import im.vector.app.R
+import im.vector.app.core.utils.getColorFromUserId
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/vector/src/test/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt b/vector/src/test/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt
similarity index 97%
rename from vector/src/test/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt
rename to vector/src/test/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt
index 5a9fdc0ab7..0e46d67860 100644
--- a/vector/src/test/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt
+++ b/vector/src/test/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.room.detail.composer.rainbow
+package im.vector.app.features.home.room.detail.composer.rainbow
 
-import im.vector.riotx.test.trimIndentOneLine
+import im.vector.app.test.trimIndentOneLine
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/vector/src/test/java/im/vector/riotx/test/Extensions.kt b/vector/src/test/java/im/vector/app/test/Extensions.kt
similarity index 95%
rename from vector/src/test/java/im/vector/riotx/test/Extensions.kt
rename to vector/src/test/java/im/vector/app/test/Extensions.kt
index 31781ce00e..290268df1c 100644
--- a/vector/src/test/java/im/vector/riotx/test/Extensions.kt
+++ b/vector/src/test/java/im/vector/app/test/Extensions.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.test
+package im.vector.app.test
 
 fun String.trimIndentOneLine() = trimIndent().replace("\n", "")