diff --git a/ring-android/.gitignore b/jami-android/.gitignore similarity index 100% rename from ring-android/.gitignore rename to jami-android/.gitignore diff --git a/ring-android/app/build.gradle.kts b/jami-android/app/build.gradle.kts similarity index 100% rename from ring-android/app/build.gradle.kts rename to jami-android/app/build.gradle.kts diff --git a/ring-android/app/proguard-rules.pro b/jami-android/app/proguard-rules.pro similarity index 100% rename from ring-android/app/proguard-rules.pro rename to jami-android/app/proguard-rules.pro diff --git a/ring-android/app/src/androidTest/java/cx/ring/client/Test0001AccountCreation.kt b/jami-android/app/src/androidTest/java/cx/ring/client/Test0001AccountCreation.kt similarity index 100% rename from ring-android/app/src/androidTest/java/cx/ring/client/Test0001AccountCreation.kt rename to jami-android/app/src/androidTest/java/cx/ring/client/Test0001AccountCreation.kt diff --git a/ring-android/app/src/androidTest/java/cx/ring/client/Test0002SearchDirectUri.kt b/jami-android/app/src/androidTest/java/cx/ring/client/Test0002SearchDirectUri.kt similarity index 100% rename from ring-android/app/src/androidTest/java/cx/ring/client/Test0002SearchDirectUri.kt rename to jami-android/app/src/androidTest/java/cx/ring/client/Test0002SearchDirectUri.kt diff --git a/ring-android/app/src/androidTest/java/cx/ring/client/ViewIdlingResource.kt b/jami-android/app/src/androidTest/java/cx/ring/client/ViewIdlingResource.kt similarity index 100% rename from ring-android/app/src/androidTest/java/cx/ring/client/ViewIdlingResource.kt rename to jami-android/app/src/androidTest/java/cx/ring/client/ViewIdlingResource.kt diff --git a/ring-android/app/src/main/AndroidManifest.xml b/jami-android/app/src/main/AndroidManifest.xml similarity index 100% rename from ring-android/app/src/main/AndroidManifest.xml rename to jami-android/app/src/main/AndroidManifest.xml diff --git a/ring-android/app/src/main/assets/.gitignore b/jami-android/app/src/main/assets/.gitignore similarity index 100% rename from ring-android/app/src/main/assets/.gitignore rename to jami-android/app/src/main/assets/.gitignore diff --git a/ring-android/app/src/main/assets/cacert.pem b/jami-android/app/src/main/assets/cacert.pem similarity index 100% rename from ring-android/app/src/main/assets/cacert.pem rename to jami-android/app/src/main/assets/cacert.pem diff --git a/ring-android/app/src/main/assets/ringtones/1 AfroNigeria.opus b/jami-android/app/src/main/assets/ringtones/1 AfroNigeria.opus similarity index 100% rename from ring-android/app/src/main/assets/ringtones/1 AfroNigeria.opus rename to jami-android/app/src/main/assets/ringtones/1 AfroNigeria.opus diff --git a/ring-android/app/src/main/assets/ringtones/10 UrbanTrap.opus b/jami-android/app/src/main/assets/ringtones/10 UrbanTrap.opus similarity index 100% rename from ring-android/app/src/main/assets/ringtones/10 UrbanTrap.opus rename to jami-android/app/src/main/assets/ringtones/10 UrbanTrap.opus diff --git a/ring-android/app/src/main/assets/ringtones/2 AfroNigeria.opus b/jami-android/app/src/main/assets/ringtones/2 AfroNigeria.opus similarity index 100% rename from ring-android/app/src/main/assets/ringtones/2 AfroNigeria.opus rename to jami-android/app/src/main/assets/ringtones/2 AfroNigeria.opus diff --git a/ring-android/app/src/main/assets/ringtones/3 AcousticGuitar.opus b/jami-android/app/src/main/assets/ringtones/3 AcousticGuitar.opus similarity index 100% rename from ring-android/app/src/main/assets/ringtones/3 AcousticGuitar.opus rename to jami-android/app/src/main/assets/ringtones/3 AcousticGuitar.opus diff --git a/ring-android/app/src/main/assets/ringtones/4 ElectricGuitar.opus b/jami-android/app/src/main/assets/ringtones/4 ElectricGuitar.opus similarity index 100% rename from ring-android/app/src/main/assets/ringtones/4 ElectricGuitar.opus rename to jami-android/app/src/main/assets/ringtones/4 ElectricGuitar.opus diff --git a/ring-android/app/src/main/assets/ringtones/5 AcousticIndia.opus b/jami-android/app/src/main/assets/ringtones/5 AcousticIndia.opus similarity index 100% rename from ring-android/app/src/main/assets/ringtones/5 AcousticIndia.opus rename to jami-android/app/src/main/assets/ringtones/5 AcousticIndia.opus diff --git a/ring-android/app/src/main/assets/ringtones/6 RingSoft.opus b/jami-android/app/src/main/assets/ringtones/6 RingSoft.opus similarity index 100% rename from ring-android/app/src/main/assets/ringtones/6 RingSoft.opus rename to jami-android/app/src/main/assets/ringtones/6 RingSoft.opus diff --git a/ring-android/app/src/main/assets/ringtones/7 RingTribal.opus b/jami-android/app/src/main/assets/ringtones/7 RingTribal.opus similarity index 100% rename from ring-android/app/src/main/assets/ringtones/7 RingTribal.opus rename to jami-android/app/src/main/assets/ringtones/7 RingTribal.opus diff --git a/ring-android/app/src/main/assets/ringtones/8 RingFirefly.opus b/jami-android/app/src/main/assets/ringtones/8 RingFirefly.opus similarity index 100% rename from ring-android/app/src/main/assets/ringtones/8 RingFirefly.opus rename to jami-android/app/src/main/assets/ringtones/8 RingFirefly.opus diff --git a/ring-android/app/src/main/assets/ringtones/9 ElectroCloud.opus b/jami-android/app/src/main/assets/ringtones/9 ElectroCloud.opus similarity index 100% rename from ring-android/app/src/main/assets/ringtones/9 ElectroCloud.opus rename to jami-android/app/src/main/assets/ringtones/9 ElectroCloud.opus diff --git a/ring-android/app/src/main/ic_launcher-web.png b/jami-android/app/src/main/ic_launcher-web.png similarity index 100% rename from ring-android/app/src/main/ic_launcher-web.png rename to jami-android/app/src/main/ic_launcher-web.png diff --git a/ring-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.kt b/jami-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.kt rename to jami-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/about/AboutFragment.kt b/jami-android/app/src/main/java/cx/ring/about/AboutFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/about/AboutFragment.kt rename to jami-android/app/src/main/java/cx/ring/about/AboutFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/AccountCreationModelImpl.kt b/jami-android/app/src/main/java/cx/ring/account/AccountCreationModelImpl.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/AccountCreationModelImpl.kt rename to jami-android/app/src/main/java/cx/ring/account/AccountCreationModelImpl.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/AccountCreationViewModel.kt b/jami-android/app/src/main/java/cx/ring/account/AccountCreationViewModel.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/AccountCreationViewModel.kt rename to jami-android/app/src/main/java/cx/ring/account/AccountCreationViewModel.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/AccountEditionFragment.kt b/jami-android/app/src/main/java/cx/ring/account/AccountEditionFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/AccountEditionFragment.kt rename to jami-android/app/src/main/java/cx/ring/account/AccountEditionFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/AccountWizardActivity.kt b/jami-android/app/src/main/java/cx/ring/account/AccountWizardActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/AccountWizardActivity.kt rename to jami-android/app/src/main/java/cx/ring/account/AccountWizardActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/BackupAccountDialog.kt b/jami-android/app/src/main/java/cx/ring/account/BackupAccountDialog.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/BackupAccountDialog.kt rename to jami-android/app/src/main/java/cx/ring/account/BackupAccountDialog.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/ChangePasswordDialog.kt b/jami-android/app/src/main/java/cx/ring/account/ChangePasswordDialog.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/ChangePasswordDialog.kt rename to jami-android/app/src/main/java/cx/ring/account/ChangePasswordDialog.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/ConfirmRevocationDialog.kt b/jami-android/app/src/main/java/cx/ring/account/ConfirmRevocationDialog.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/ConfirmRevocationDialog.kt rename to jami-android/app/src/main/java/cx/ring/account/ConfirmRevocationDialog.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/DeviceAdapter.kt b/jami-android/app/src/main/java/cx/ring/account/DeviceAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/DeviceAdapter.kt rename to jami-android/app/src/main/java/cx/ring/account/DeviceAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/HomeAccountCreationFragment.kt b/jami-android/app/src/main/java/cx/ring/account/HomeAccountCreationFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/HomeAccountCreationFragment.kt rename to jami-android/app/src/main/java/cx/ring/account/HomeAccountCreationFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/JamiAccountConnectFragment.kt b/jami-android/app/src/main/java/cx/ring/account/JamiAccountConnectFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/JamiAccountConnectFragment.kt rename to jami-android/app/src/main/java/cx/ring/account/JamiAccountConnectFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/JamiAccountCreationFragment.kt b/jami-android/app/src/main/java/cx/ring/account/JamiAccountCreationFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/JamiAccountCreationFragment.kt rename to jami-android/app/src/main/java/cx/ring/account/JamiAccountCreationFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/JamiAccountPasswordFragment.kt b/jami-android/app/src/main/java/cx/ring/account/JamiAccountPasswordFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/JamiAccountPasswordFragment.kt rename to jami-android/app/src/main/java/cx/ring/account/JamiAccountPasswordFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt b/jami-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt rename to jami-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/JamiAccountUsernameFragment.kt b/jami-android/app/src/main/java/cx/ring/account/JamiAccountUsernameFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/JamiAccountUsernameFragment.kt rename to jami-android/app/src/main/java/cx/ring/account/JamiAccountUsernameFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/JamiLinkAccountFragment.kt b/jami-android/app/src/main/java/cx/ring/account/JamiLinkAccountFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/JamiLinkAccountFragment.kt rename to jami-android/app/src/main/java/cx/ring/account/JamiLinkAccountFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/JamiLinkAccountPasswordFragment.kt b/jami-android/app/src/main/java/cx/ring/account/JamiLinkAccountPasswordFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/JamiLinkAccountPasswordFragment.kt rename to jami-android/app/src/main/java/cx/ring/account/JamiLinkAccountPasswordFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/ProfileCreationFragment.kt b/jami-android/app/src/main/java/cx/ring/account/ProfileCreationFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/ProfileCreationFragment.kt rename to jami-android/app/src/main/java/cx/ring/account/ProfileCreationFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/RegisterNameDialog.kt b/jami-android/app/src/main/java/cx/ring/account/RegisterNameDialog.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/RegisterNameDialog.kt rename to jami-android/app/src/main/java/cx/ring/account/RegisterNameDialog.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/RenameDeviceDialog.kt b/jami-android/app/src/main/java/cx/ring/account/RenameDeviceDialog.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/RenameDeviceDialog.kt rename to jami-android/app/src/main/java/cx/ring/account/RenameDeviceDialog.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/RenameSwarmDialog.kt b/jami-android/app/src/main/java/cx/ring/account/RenameSwarmDialog.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/RenameSwarmDialog.kt rename to jami-android/app/src/main/java/cx/ring/account/RenameSwarmDialog.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/SettingItem.kt b/jami-android/app/src/main/java/cx/ring/account/SettingItem.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/SettingItem.kt rename to jami-android/app/src/main/java/cx/ring/account/SettingItem.kt diff --git a/ring-android/app/src/main/java/cx/ring/account/SettingsAdapter.kt b/jami-android/app/src/main/java/cx/ring/account/SettingsAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/account/SettingsAdapter.kt rename to jami-android/app/src/main/java/cx/ring/account/SettingsAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/adapters/ConfParticipantAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/ConfParticipantAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/adapters/ConfParticipantAdapter.kt rename to jami-android/app/src/main/java/cx/ring/adapters/ConfParticipantAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/adapters/ContactPickerAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/ContactPickerAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/adapters/ContactPickerAdapter.kt rename to jami-android/app/src/main/java/cx/ring/adapters/ContactPickerAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt rename to jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/adapters/ConversationMediaGalleryAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/ConversationMediaGalleryAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/adapters/ConversationMediaGalleryAdapter.kt rename to jami-android/app/src/main/java/cx/ring/adapters/ConversationMediaGalleryAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/adapters/MessageType.kt b/jami-android/app/src/main/java/cx/ring/adapters/MessageType.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/adapters/MessageType.kt rename to jami-android/app/src/main/java/cx/ring/adapters/MessageType.kt diff --git a/ring-android/app/src/main/java/cx/ring/adapters/NumberAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/NumberAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/adapters/NumberAdapter.kt rename to jami-android/app/src/main/java/cx/ring/adapters/NumberAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/adapters/PluginsAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/PluginsAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/adapters/PluginsAdapter.kt rename to jami-android/app/src/main/java/cx/ring/adapters/PluginsAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/adapters/RingtoneAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/RingtoneAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/adapters/RingtoneAdapter.kt rename to jami-android/app/src/main/java/cx/ring/adapters/RingtoneAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/adapters/SmartListAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/SmartListAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/adapters/SmartListAdapter.kt rename to jami-android/app/src/main/java/cx/ring/adapters/SmartListAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/adapters/SmartListDiffUtil.kt b/jami-android/app/src/main/java/cx/ring/adapters/SmartListDiffUtil.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/adapters/SmartListDiffUtil.kt rename to jami-android/app/src/main/java/cx/ring/adapters/SmartListDiffUtil.kt diff --git a/ring-android/app/src/main/java/cx/ring/application/JamiApplication.kt b/jami-android/app/src/main/java/cx/ring/application/JamiApplication.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/application/JamiApplication.kt rename to jami-android/app/src/main/java/cx/ring/application/JamiApplication.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/AccountSpinnerAdapter.kt b/jami-android/app/src/main/java/cx/ring/client/AccountSpinnerAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/AccountSpinnerAdapter.kt rename to jami-android/app/src/main/java/cx/ring/client/AccountSpinnerAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/CallActivity.kt b/jami-android/app/src/main/java/cx/ring/client/CallActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/CallActivity.kt rename to jami-android/app/src/main/java/cx/ring/client/CallActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/ColorChooserBottomSheet.kt b/jami-android/app/src/main/java/cx/ring/client/ColorChooserBottomSheet.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/ColorChooserBottomSheet.kt rename to jami-android/app/src/main/java/cx/ring/client/ColorChooserBottomSheet.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/ContactDetailsActivity.kt b/jami-android/app/src/main/java/cx/ring/client/ContactDetailsActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/ContactDetailsActivity.kt rename to jami-android/app/src/main/java/cx/ring/client/ContactDetailsActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/ConversationActivity.kt b/jami-android/app/src/main/java/cx/ring/client/ConversationActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/ConversationActivity.kt rename to jami-android/app/src/main/java/cx/ring/client/ConversationActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/ConversationSelectionActivity.kt b/jami-android/app/src/main/java/cx/ring/client/ConversationSelectionActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/ConversationSelectionActivity.kt rename to jami-android/app/src/main/java/cx/ring/client/ConversationSelectionActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/EmojiChooserBottomSheet.kt b/jami-android/app/src/main/java/cx/ring/client/EmojiChooserBottomSheet.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/EmojiChooserBottomSheet.kt rename to jami-android/app/src/main/java/cx/ring/client/EmojiChooserBottomSheet.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/HomeActivity.kt b/jami-android/app/src/main/java/cx/ring/client/HomeActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/HomeActivity.kt rename to jami-android/app/src/main/java/cx/ring/client/HomeActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/LogsActivity.kt b/jami-android/app/src/main/java/cx/ring/client/LogsActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/LogsActivity.kt rename to jami-android/app/src/main/java/cx/ring/client/LogsActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/MediaViewerActivity.kt b/jami-android/app/src/main/java/cx/ring/client/MediaViewerActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/MediaViewerActivity.kt rename to jami-android/app/src/main/java/cx/ring/client/MediaViewerActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/MediaViewerFragment.kt b/jami-android/app/src/main/java/cx/ring/client/MediaViewerFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/MediaViewerFragment.kt rename to jami-android/app/src/main/java/cx/ring/client/MediaViewerFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/MessageEditActivity.kt b/jami-android/app/src/main/java/cx/ring/client/MessageEditActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/MessageEditActivity.kt rename to jami-android/app/src/main/java/cx/ring/client/MessageEditActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/RingtoneActivity.kt b/jami-android/app/src/main/java/cx/ring/client/RingtoneActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/RingtoneActivity.kt rename to jami-android/app/src/main/java/cx/ring/client/RingtoneActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/client/ShareActivity.kt b/jami-android/app/src/main/java/cx/ring/client/ShareActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/client/ShareActivity.kt rename to jami-android/app/src/main/java/cx/ring/client/ShareActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/contactrequests/BlockListAdapter.kt b/jami-android/app/src/main/java/cx/ring/contactrequests/BlockListAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/contactrequests/BlockListAdapter.kt rename to jami-android/app/src/main/java/cx/ring/contactrequests/BlockListAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/contactrequests/BlockListFragment.kt b/jami-android/app/src/main/java/cx/ring/contactrequests/BlockListFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/contactrequests/BlockListFragment.kt rename to jami-android/app/src/main/java/cx/ring/contactrequests/BlockListFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/contactrequests/BlockListViewHolder.kt b/jami-android/app/src/main/java/cx/ring/contactrequests/BlockListViewHolder.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/contactrequests/BlockListViewHolder.kt rename to jami-android/app/src/main/java/cx/ring/contactrequests/BlockListViewHolder.kt diff --git a/ring-android/app/src/main/java/cx/ring/contactrequests/ContactRequestsFragment.kt b/jami-android/app/src/main/java/cx/ring/contactrequests/ContactRequestsFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/contactrequests/ContactRequestsFragment.kt rename to jami-android/app/src/main/java/cx/ring/contactrequests/ContactRequestsFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/dependencyinjection/ServiceInjectionModule.kt b/jami-android/app/src/main/java/cx/ring/dependencyinjection/ServiceInjectionModule.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/dependencyinjection/ServiceInjectionModule.kt rename to jami-android/app/src/main/java/cx/ring/dependencyinjection/ServiceInjectionModule.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/CallFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/CallFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/CodecPreference.kt b/jami-android/app/src/main/java/cx/ring/fragments/CodecPreference.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/CodecPreference.kt rename to jami-android/app/src/main/java/cx/ring/fragments/CodecPreference.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ContactPickerFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/ContactPickerFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/ContactPickerFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/ContactPickerFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationActionsFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/ConversationActionsFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/ConversationActionsFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/ConversationActionsFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationGalleryFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/ConversationGalleryFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/ConversationGalleryFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/ConversationGalleryFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationMembersFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/ConversationMembersFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/ConversationMembersFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/ConversationMembersFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/HomeFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/HomeFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/HomeFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/LinkDeviceFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/LinkDeviceFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/LinkDeviceFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/LinkDeviceFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/LocationSharingFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/LocationSharingFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/LocationSharingFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/LocationSharingFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/MediaPreferenceFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/MediaPreferenceFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/MediaPreferenceFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/MediaPreferenceFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/MembersBottomSheetFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/MembersBottomSheetFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/MembersBottomSheetFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/MembersBottomSheetFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/PluginHandlersListFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/PluginHandlersListFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/PluginHandlersListFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/PluginHandlersListFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/QRCodeFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/QRCodeFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/QRCodeFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/QRCodeFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/SIPAccountCreationFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/SIPAccountCreationFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/SIPAccountCreationFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/SIPAccountCreationFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/SecurityAccountFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/SecurityAccountFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/SecurityAccountFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/SecurityAccountFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ShareWithFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/ShareWithFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/ShareWithFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/ShareWithFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/SmartListFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.kt rename to jami-android/app/src/main/java/cx/ring/fragments/SmartListFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/history/DatabaseHelper.kt b/jami-android/app/src/main/java/cx/ring/history/DatabaseHelper.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/history/DatabaseHelper.kt rename to jami-android/app/src/main/java/cx/ring/history/DatabaseHelper.kt diff --git a/ring-android/app/src/main/java/cx/ring/interfaces/Colorable.kt b/jami-android/app/src/main/java/cx/ring/interfaces/Colorable.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/interfaces/Colorable.kt rename to jami-android/app/src/main/java/cx/ring/interfaces/Colorable.kt diff --git a/ring-android/app/src/main/java/cx/ring/linkpreview/LinkPreview.kt b/jami-android/app/src/main/java/cx/ring/linkpreview/LinkPreview.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/linkpreview/LinkPreview.kt rename to jami-android/app/src/main/java/cx/ring/linkpreview/LinkPreview.kt diff --git a/ring-android/app/src/main/java/cx/ring/linkpreview/PreviewData.kt b/jami-android/app/src/main/java/cx/ring/linkpreview/PreviewData.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/linkpreview/PreviewData.kt rename to jami-android/app/src/main/java/cx/ring/linkpreview/PreviewData.kt diff --git a/ring-android/app/src/main/java/cx/ring/mvp/BaseActivity.java b/jami-android/app/src/main/java/cx/ring/mvp/BaseActivity.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/mvp/BaseActivity.java rename to jami-android/app/src/main/java/cx/ring/mvp/BaseActivity.java diff --git a/ring-android/app/src/main/java/cx/ring/mvp/BaseBottomSheetFragment.java b/jami-android/app/src/main/java/cx/ring/mvp/BaseBottomSheetFragment.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/mvp/BaseBottomSheetFragment.java rename to jami-android/app/src/main/java/cx/ring/mvp/BaseBottomSheetFragment.java diff --git a/ring-android/app/src/main/java/cx/ring/mvp/BasePreferenceFragment.java b/jami-android/app/src/main/java/cx/ring/mvp/BasePreferenceFragment.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/mvp/BasePreferenceFragment.java rename to jami-android/app/src/main/java/cx/ring/mvp/BasePreferenceFragment.java diff --git a/ring-android/app/src/main/java/cx/ring/mvp/BaseSupportFragment.kt b/jami-android/app/src/main/java/cx/ring/mvp/BaseSupportFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/mvp/BaseSupportFragment.kt rename to jami-android/app/src/main/java/cx/ring/mvp/BaseSupportFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/plugins/PluginPreferences.kt b/jami-android/app/src/main/java/cx/ring/plugins/PluginPreferences.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/plugins/PluginPreferences.kt rename to jami-android/app/src/main/java/cx/ring/plugins/PluginPreferences.kt diff --git a/ring-android/app/src/main/java/cx/ring/plugins/PluginUtils.kt b/jami-android/app/src/main/java/cx/ring/plugins/PluginUtils.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/plugins/PluginUtils.kt rename to jami-android/app/src/main/java/cx/ring/plugins/PluginUtils.kt diff --git a/ring-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPicker.java b/jami-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPicker.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPicker.java rename to jami-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPicker.java diff --git a/ring-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPickerAdapter.java b/jami-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPickerAdapter.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPickerAdapter.java rename to jami-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPickerAdapter.java diff --git a/ring-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPickerLayoutManager.kt b/jami-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPickerLayoutManager.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPickerLayoutManager.kt rename to jami-android/app/src/main/java/cx/ring/plugins/RecyclerPicker/RecyclerPickerLayoutManager.kt diff --git a/ring-android/app/src/main/java/cx/ring/service/BootReceiver.kt b/jami-android/app/src/main/java/cx/ring/service/BootReceiver.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/service/BootReceiver.kt rename to jami-android/app/src/main/java/cx/ring/service/BootReceiver.kt diff --git a/ring-android/app/src/main/java/cx/ring/service/CallNotificationService.kt b/jami-android/app/src/main/java/cx/ring/service/CallNotificationService.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/service/CallNotificationService.kt rename to jami-android/app/src/main/java/cx/ring/service/CallNotificationService.kt diff --git a/ring-android/app/src/main/java/cx/ring/service/DRingService.kt b/jami-android/app/src/main/java/cx/ring/service/DRingService.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/service/DRingService.kt rename to jami-android/app/src/main/java/cx/ring/service/DRingService.kt diff --git a/ring-android/app/src/main/java/cx/ring/service/JamiJobService.kt b/jami-android/app/src/main/java/cx/ring/service/JamiJobService.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/service/JamiJobService.kt rename to jami-android/app/src/main/java/cx/ring/service/JamiJobService.kt diff --git a/ring-android/app/src/main/java/cx/ring/service/LocationSharingService.kt b/jami-android/app/src/main/java/cx/ring/service/LocationSharingService.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/service/LocationSharingService.kt rename to jami-android/app/src/main/java/cx/ring/service/LocationSharingService.kt diff --git a/ring-android/app/src/main/java/cx/ring/service/OutgoingCallHandler.kt b/jami-android/app/src/main/java/cx/ring/service/OutgoingCallHandler.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/service/OutgoingCallHandler.kt rename to jami-android/app/src/main/java/cx/ring/service/OutgoingCallHandler.kt diff --git a/ring-android/app/src/main/java/cx/ring/service/SyncService.kt b/jami-android/app/src/main/java/cx/ring/service/SyncService.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/service/SyncService.kt rename to jami-android/app/src/main/java/cx/ring/service/SyncService.kt diff --git a/ring-android/app/src/main/java/cx/ring/services/CameraService.kt b/jami-android/app/src/main/java/cx/ring/services/CameraService.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/services/CameraService.kt rename to jami-android/app/src/main/java/cx/ring/services/CameraService.kt diff --git a/ring-android/app/src/main/java/cx/ring/services/ContactServiceImpl.kt b/jami-android/app/src/main/java/cx/ring/services/ContactServiceImpl.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/services/ContactServiceImpl.kt rename to jami-android/app/src/main/java/cx/ring/services/ContactServiceImpl.kt diff --git a/ring-android/app/src/main/java/cx/ring/services/DataTransferService.kt b/jami-android/app/src/main/java/cx/ring/services/DataTransferService.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/services/DataTransferService.kt rename to jami-android/app/src/main/java/cx/ring/services/DataTransferService.kt diff --git a/ring-android/app/src/main/java/cx/ring/services/DeviceRuntimeServiceImpl.kt b/jami-android/app/src/main/java/cx/ring/services/DeviceRuntimeServiceImpl.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/services/DeviceRuntimeServiceImpl.kt rename to jami-android/app/src/main/java/cx/ring/services/DeviceRuntimeServiceImpl.kt diff --git a/ring-android/app/src/main/java/cx/ring/services/HardwareServiceImpl.kt b/jami-android/app/src/main/java/cx/ring/services/HardwareServiceImpl.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/services/HardwareServiceImpl.kt rename to jami-android/app/src/main/java/cx/ring/services/HardwareServiceImpl.kt diff --git a/ring-android/app/src/main/java/cx/ring/services/HistoryServiceImpl.kt b/jami-android/app/src/main/java/cx/ring/services/HistoryServiceImpl.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/services/HistoryServiceImpl.kt rename to jami-android/app/src/main/java/cx/ring/services/HistoryServiceImpl.kt diff --git a/ring-android/app/src/main/java/cx/ring/services/LogServiceImpl.kt b/jami-android/app/src/main/java/cx/ring/services/LogServiceImpl.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/services/LogServiceImpl.kt rename to jami-android/app/src/main/java/cx/ring/services/LogServiceImpl.kt diff --git a/ring-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.kt b/jami-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.kt rename to jami-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.kt diff --git a/ring-android/app/src/main/java/cx/ring/services/SharedPreferencesServiceImpl.kt b/jami-android/app/src/main/java/cx/ring/services/SharedPreferencesServiceImpl.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/services/SharedPreferencesServiceImpl.kt rename to jami-android/app/src/main/java/cx/ring/services/SharedPreferencesServiceImpl.kt diff --git a/ring-android/app/src/main/java/cx/ring/services/VCardServiceImpl.kt b/jami-android/app/src/main/java/cx/ring/services/VCardServiceImpl.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/services/VCardServiceImpl.kt rename to jami-android/app/src/main/java/cx/ring/services/VCardServiceImpl.kt diff --git a/ring-android/app/src/main/java/cx/ring/settings/AccountFragment.kt b/jami-android/app/src/main/java/cx/ring/settings/AccountFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/settings/AccountFragment.kt rename to jami-android/app/src/main/java/cx/ring/settings/AccountFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/settings/SettingsFragment.kt b/jami-android/app/src/main/java/cx/ring/settings/SettingsFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/settings/SettingsFragment.kt rename to jami-android/app/src/main/java/cx/ring/settings/SettingsFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/settings/VideoSettingsFragment.kt b/jami-android/app/src/main/java/cx/ring/settings/VideoSettingsFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/settings/VideoSettingsFragment.kt rename to jami-android/app/src/main/java/cx/ring/settings/VideoSettingsFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PathListAdapter.kt b/jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PathListAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PathListAdapter.kt rename to jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PathListAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginDetails.kt b/jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginDetails.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginDetails.kt rename to jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginDetails.kt diff --git a/ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginPathPreferenceFragment.kt b/jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginPathPreferenceFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginPathPreferenceFragment.kt rename to jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginPathPreferenceFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginPreferencesDataStore.kt b/jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginPreferencesDataStore.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginPreferencesDataStore.kt rename to jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginPreferencesDataStore.kt diff --git a/ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginSettingsFragment.kt b/jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginSettingsFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginSettingsFragment.kt rename to jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginSettingsFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginsListAdapter.kt b/jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginsListAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginsListAdapter.kt rename to jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginsListAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginsListSettingsFragment.kt b/jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginsListSettingsFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginsListSettingsFragment.kt rename to jami-android/app/src/main/java/cx/ring/settings/pluginssettings/PluginsListSettingsFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/share/ScanFragment.kt b/jami-android/app/src/main/java/cx/ring/share/ScanFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/share/ScanFragment.kt rename to jami-android/app/src/main/java/cx/ring/share/ScanFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/share/ShareFragment.kt b/jami-android/app/src/main/java/cx/ring/share/ShareFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/share/ShareFragment.kt rename to jami-android/app/src/main/java/cx/ring/share/ShareFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/about/AboutDetailsFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/about/AboutDetailsFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/about/AboutDetailsFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/about/AboutDetailsFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/about/AboutDetailsPresenter.kt b/jami-android/app/src/main/java/cx/ring/tv/about/AboutDetailsPresenter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/about/AboutDetailsPresenter.kt rename to jami-android/app/src/main/java/cx/ring/tv/about/AboutDetailsPresenter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/JamiGuidedStepFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/account/JamiGuidedStepFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/JamiGuidedStepFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/account/JamiGuidedStepFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/JamiPreferenceFragment.java b/jami-android/app/src/main/java/cx/ring/tv/account/JamiPreferenceFragment.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/JamiPreferenceFragment.java rename to jami-android/app/src/main/java/cx/ring/tv/account/JamiPreferenceFragment.java diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.kt b/jami-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.kt rename to jami-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountWizard.kt b/jami-android/app/src/main/java/cx/ring/tv/account/TVAccountWizard.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/TVAccountWizard.kt rename to jami-android/app/src/main/java/cx/ring/tv/account/TVAccountWizard.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVJamiAccountCreationFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/account/TVJamiAccountCreationFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/TVJamiAccountCreationFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/account/TVJamiAccountCreationFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVJamiLinkAccountFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/account/TVJamiLinkAccountFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/TVJamiLinkAccountFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/account/TVJamiLinkAccountFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVShareActivity.kt b/jami-android/app/src/main/java/cx/ring/tv/account/TVShareActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/TVShareActivity.kt rename to jami-android/app/src/main/java/cx/ring/tv/account/TVShareActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVShareFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/account/TVShareFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/account/TVShareFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/account/TVShareFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/call/TVCallActivity.kt b/jami-android/app/src/main/java/cx/ring/tv/call/TVCallActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/call/TVCallActivity.kt rename to jami-android/app/src/main/java/cx/ring/tv/call/TVCallActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/call/TVCallFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/call/TVCallFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/call/TVCallFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/call/TVCallFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/camera/CameraPreview.kt b/jami-android/app/src/main/java/cx/ring/tv/camera/CameraPreview.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/camera/CameraPreview.kt rename to jami-android/app/src/main/java/cx/ring/tv/camera/CameraPreview.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/camera/CustomCameraActivity.kt b/jami-android/app/src/main/java/cx/ring/tv/camera/CustomCameraActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/camera/CustomCameraActivity.kt rename to jami-android/app/src/main/java/cx/ring/tv/camera/CustomCameraActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/AbstractCardPresenter.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/AbstractCardPresenter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/AbstractCardPresenter.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/AbstractCardPresenter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/Card.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/Card.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/Card.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/Card.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/CardListRow.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/CardListRow.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/CardListRow.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/CardListRow.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/CardPresenterSelector.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/CardPresenterSelector.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/CardPresenterSelector.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/CardPresenterSelector.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/CardRow.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/CardRow.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/CardRow.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/CardRow.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/CardView.java b/jami-android/app/src/main/java/cx/ring/tv/cards/CardView.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/CardView.java rename to jami-android/app/src/main/java/cx/ring/tv/cards/CardView.java diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/NoDimListRowPresenter.java b/jami-android/app/src/main/java/cx/ring/tv/cards/NoDimListRowPresenter.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/NoDimListRowPresenter.java rename to jami-android/app/src/main/java/cx/ring/tv/cards/NoDimListRowPresenter.java diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/ShadowRowPresenterSelector.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/ShadowRowPresenterSelector.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/ShadowRowPresenterSelector.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/ShadowRowPresenterSelector.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/contacts/ContactCard.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/contacts/ContactCard.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/contacts/ContactCard.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/contacts/ContactCard.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/contacts/ContactCardPresenter.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/contacts/ContactCardPresenter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/contacts/ContactCardPresenter.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/contacts/ContactCardPresenter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCard.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCard.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCard.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCard.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCardHelper.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCardHelper.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCardHelper.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCardHelper.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCardPresenter.kt b/jami-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCardPresenter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCardPresenter.kt rename to jami-android/app/src/main/java/cx/ring/tv/cards/iconcards/IconCardPresenter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/contact/TVContactActivity.kt b/jami-android/app/src/main/java/cx/ring/tv/contact/TVContactActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/contact/TVContactActivity.kt rename to jami-android/app/src/main/java/cx/ring/tv/contact/TVContactActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/contact/TVContactDetailPresenter.kt b/jami-android/app/src/main/java/cx/ring/tv/contact/TVContactDetailPresenter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/contact/TVContactDetailPresenter.kt rename to jami-android/app/src/main/java/cx/ring/tv/contact/TVContactDetailPresenter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/contact/TVContactFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/contact/TVContactFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/contact/TVContactFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/contact/TVContactFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/contact/TVContactPresenter.kt b/jami-android/app/src/main/java/cx/ring/tv/contact/TVContactPresenter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/contact/TVContactPresenter.kt rename to jami-android/app/src/main/java/cx/ring/tv/contact/TVContactPresenter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/contact/TVContactView.kt b/jami-android/app/src/main/java/cx/ring/tv/contact/TVContactView.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/contact/TVContactView.kt rename to jami-android/app/src/main/java/cx/ring/tv/contact/TVContactView.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreActivity.kt b/jami-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreActivity.kt rename to jami-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMorePresenter.kt b/jami-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMorePresenter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMorePresenter.kt rename to jami-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMorePresenter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreView.kt b/jami-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreView.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreView.kt rename to jami-android/app/src/main/java/cx/ring/tv/contact/more/TVContactMoreView.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/contactrequest/TVContactRequestDetailPresenter.kt b/jami-android/app/src/main/java/cx/ring/tv/contactrequest/TVContactRequestDetailPresenter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/contactrequest/TVContactRequestDetailPresenter.kt rename to jami-android/app/src/main/java/cx/ring/tv/contactrequest/TVContactRequestDetailPresenter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/conversation/TvConversationAdapter.kt b/jami-android/app/src/main/java/cx/ring/tv/conversation/TvConversationAdapter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/conversation/TvConversationAdapter.kt rename to jami-android/app/src/main/java/cx/ring/tv/conversation/TvConversationAdapter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/conversation/TvConversationFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/conversation/TvConversationFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/conversation/TvConversationFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/conversation/TvConversationFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/BaseBrowseFragment.java b/jami-android/app/src/main/java/cx/ring/tv/main/BaseBrowseFragment.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/main/BaseBrowseFragment.java rename to jami-android/app/src/main/java/cx/ring/tv/main/BaseBrowseFragment.java diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/BaseDetailFragment.java b/jami-android/app/src/main/java/cx/ring/tv/main/BaseDetailFragment.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/main/BaseDetailFragment.java rename to jami-android/app/src/main/java/cx/ring/tv/main/BaseDetailFragment.java diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/ChannelActionHandler.kt b/jami-android/app/src/main/java/cx/ring/tv/main/ChannelActionHandler.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/main/ChannelActionHandler.kt rename to jami-android/app/src/main/java/cx/ring/tv/main/ChannelActionHandler.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/HomeActivity.kt b/jami-android/app/src/main/java/cx/ring/tv/main/HomeActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/main/HomeActivity.kt rename to jami-android/app/src/main/java/cx/ring/tv/main/HomeActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/MainFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/main/MainFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/main/MainFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/main/MainFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/MainPresenter.kt b/jami-android/app/src/main/java/cx/ring/tv/main/MainPresenter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/main/MainPresenter.kt rename to jami-android/app/src/main/java/cx/ring/tv/main/MainPresenter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/MainView.kt b/jami-android/app/src/main/java/cx/ring/tv/main/MainView.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/main/MainView.kt rename to jami-android/app/src/main/java/cx/ring/tv/main/MainView.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/main/SpinnerFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/main/SpinnerFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/main/SpinnerFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/main/SpinnerFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/search/BaseSearchFragment.java b/jami-android/app/src/main/java/cx/ring/tv/search/BaseSearchFragment.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/search/BaseSearchFragment.java rename to jami-android/app/src/main/java/cx/ring/tv/search/BaseSearchFragment.java diff --git a/ring-android/app/src/main/java/cx/ring/tv/search/ContactSearchFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/search/ContactSearchFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/search/ContactSearchFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/search/ContactSearchFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/search/ContactSearchPresenter.kt b/jami-android/app/src/main/java/cx/ring/tv/search/ContactSearchPresenter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/search/ContactSearchPresenter.kt rename to jami-android/app/src/main/java/cx/ring/tv/search/ContactSearchPresenter.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/search/ContactSearchView.kt b/jami-android/app/src/main/java/cx/ring/tv/search/ContactSearchView.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/search/ContactSearchView.kt rename to jami-android/app/src/main/java/cx/ring/tv/search/ContactSearchView.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/search/SearchActivity.kt b/jami-android/app/src/main/java/cx/ring/tv/search/SearchActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/search/SearchActivity.kt rename to jami-android/app/src/main/java/cx/ring/tv/search/SearchActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/settings/TVAboutFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/settings/TVAboutFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/settings/TVAboutFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/settings/TVAboutFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/settings/TVSettingsActivity.kt b/jami-android/app/src/main/java/cx/ring/tv/settings/TVSettingsActivity.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/settings/TVSettingsActivity.kt rename to jami-android/app/src/main/java/cx/ring/tv/settings/TVSettingsActivity.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/settings/TVSettingsFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/settings/TVSettingsFragment.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/settings/TVSettingsFragment.kt rename to jami-android/app/src/main/java/cx/ring/tv/settings/TVSettingsFragment.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/views/CustomTitleView.kt b/jami-android/app/src/main/java/cx/ring/tv/views/CustomTitleView.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/views/CustomTitleView.kt rename to jami-android/app/src/main/java/cx/ring/tv/views/CustomTitleView.kt diff --git a/ring-android/app/src/main/java/cx/ring/tv/views/FitsWindowsLayout.java b/jami-android/app/src/main/java/cx/ring/tv/views/FitsWindowsLayout.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/tv/views/FitsWindowsLayout.java rename to jami-android/app/src/main/java/cx/ring/tv/views/FitsWindowsLayout.java diff --git a/ring-android/app/src/main/java/cx/ring/utils/ActionHelper.kt b/jami-android/app/src/main/java/cx/ring/utils/ActionHelper.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/ActionHelper.kt rename to jami-android/app/src/main/java/cx/ring/utils/ActionHelper.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/AndroidFileUtils.kt b/jami-android/app/src/main/java/cx/ring/utils/AndroidFileUtils.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/AndroidFileUtils.kt rename to jami-android/app/src/main/java/cx/ring/utils/AndroidFileUtils.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/BitmapUtils.kt b/jami-android/app/src/main/java/cx/ring/utils/BitmapUtils.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/BitmapUtils.kt rename to jami-android/app/src/main/java/cx/ring/utils/BitmapUtils.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/BluetoothWrapper.kt b/jami-android/app/src/main/java/cx/ring/utils/BluetoothWrapper.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/BluetoothWrapper.kt rename to jami-android/app/src/main/java/cx/ring/utils/BluetoothWrapper.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/ContentUriHandler.kt b/jami-android/app/src/main/java/cx/ring/utils/ContentUriHandler.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/ContentUriHandler.kt rename to jami-android/app/src/main/java/cx/ring/utils/ContentUriHandler.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/ConversationPath.kt b/jami-android/app/src/main/java/cx/ring/utils/ConversationPath.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/ConversationPath.kt rename to jami-android/app/src/main/java/cx/ring/utils/ConversationPath.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/DeviceUtils.kt b/jami-android/app/src/main/java/cx/ring/utils/DeviceUtils.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/DeviceUtils.kt rename to jami-android/app/src/main/java/cx/ring/utils/DeviceUtils.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/KeyboardVisibilityManager.kt b/jami-android/app/src/main/java/cx/ring/utils/KeyboardVisibilityManager.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/KeyboardVisibilityManager.kt rename to jami-android/app/src/main/java/cx/ring/utils/KeyboardVisibilityManager.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/MediaButtonsHelper.kt b/jami-android/app/src/main/java/cx/ring/utils/MediaButtonsHelper.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/MediaButtonsHelper.kt rename to jami-android/app/src/main/java/cx/ring/utils/MediaButtonsHelper.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/NetworkUtils.kt b/jami-android/app/src/main/java/cx/ring/utils/NetworkUtils.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/NetworkUtils.kt rename to jami-android/app/src/main/java/cx/ring/utils/NetworkUtils.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/RegisteredNameFilter.kt b/jami-android/app/src/main/java/cx/ring/utils/RegisteredNameFilter.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/RegisteredNameFilter.kt rename to jami-android/app/src/main/java/cx/ring/utils/RegisteredNameFilter.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/ScaleManager.kt b/jami-android/app/src/main/java/cx/ring/utils/ScaleManager.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/ScaleManager.kt rename to jami-android/app/src/main/java/cx/ring/utils/ScaleManager.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/Size.kt b/jami-android/app/src/main/java/cx/ring/utils/Size.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/Size.kt rename to jami-android/app/src/main/java/cx/ring/utils/Size.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/TextUtils.kt b/jami-android/app/src/main/java/cx/ring/utils/TextUtils.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/TextUtils.kt rename to jami-android/app/src/main/java/cx/ring/utils/TextUtils.kt diff --git a/ring-android/app/src/main/java/cx/ring/utils/TouchClickListener.kt b/jami-android/app/src/main/java/cx/ring/utils/TouchClickListener.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/utils/TouchClickListener.kt rename to jami-android/app/src/main/java/cx/ring/utils/TouchClickListener.kt diff --git a/ring-android/app/src/main/java/cx/ring/viewholders/ContactPickerViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/ContactPickerViewHolder.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/viewholders/ContactPickerViewHolder.kt rename to jami-android/app/src/main/java/cx/ring/viewholders/ContactPickerViewHolder.kt diff --git a/ring-android/app/src/main/java/cx/ring/viewholders/ConversationMediaViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/ConversationMediaViewHolder.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/viewholders/ConversationMediaViewHolder.kt rename to jami-android/app/src/main/java/cx/ring/viewholders/ConversationMediaViewHolder.kt diff --git a/ring-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt rename to jami-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt diff --git a/ring-android/app/src/main/java/cx/ring/viewholders/PluginSettingViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/PluginSettingViewHolder.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/viewholders/PluginSettingViewHolder.kt rename to jami-android/app/src/main/java/cx/ring/viewholders/PluginSettingViewHolder.kt diff --git a/ring-android/app/src/main/java/cx/ring/viewholders/PluginViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/PluginViewHolder.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/viewholders/PluginViewHolder.kt rename to jami-android/app/src/main/java/cx/ring/viewholders/PluginViewHolder.kt diff --git a/ring-android/app/src/main/java/cx/ring/viewholders/SmartListViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/SmartListViewHolder.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/viewholders/SmartListViewHolder.kt rename to jami-android/app/src/main/java/cx/ring/viewholders/SmartListViewHolder.kt diff --git a/ring-android/app/src/main/java/cx/ring/views/AutoFitSurfaceView.java b/jami-android/app/src/main/java/cx/ring/views/AutoFitSurfaceView.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/AutoFitSurfaceView.java rename to jami-android/app/src/main/java/cx/ring/views/AutoFitSurfaceView.java diff --git a/ring-android/app/src/main/java/cx/ring/views/AutoFitTextureView.kt b/jami-android/app/src/main/java/cx/ring/views/AutoFitTextureView.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/AutoFitTextureView.kt rename to jami-android/app/src/main/java/cx/ring/views/AutoFitTextureView.kt diff --git a/ring-android/app/src/main/java/cx/ring/views/AvatarDrawable.kt b/jami-android/app/src/main/java/cx/ring/views/AvatarDrawable.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/AvatarDrawable.kt rename to jami-android/app/src/main/java/cx/ring/views/AvatarDrawable.kt diff --git a/ring-android/app/src/main/java/cx/ring/views/AvatarFactory.kt b/jami-android/app/src/main/java/cx/ring/views/AvatarFactory.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/AvatarFactory.kt rename to jami-android/app/src/main/java/cx/ring/views/AvatarFactory.kt diff --git a/ring-android/app/src/main/java/cx/ring/views/BoundedLinearLayout.java b/jami-android/app/src/main/java/cx/ring/views/BoundedLinearLayout.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/BoundedLinearLayout.java rename to jami-android/app/src/main/java/cx/ring/views/BoundedLinearLayout.java diff --git a/ring-android/app/src/main/java/cx/ring/views/BoundedRelativeLayout.java b/jami-android/app/src/main/java/cx/ring/views/BoundedRelativeLayout.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/BoundedRelativeLayout.java rename to jami-android/app/src/main/java/cx/ring/views/BoundedRelativeLayout.java diff --git a/ring-android/app/src/main/java/cx/ring/views/BoundedScrollView.java b/jami-android/app/src/main/java/cx/ring/views/BoundedScrollView.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/BoundedScrollView.java rename to jami-android/app/src/main/java/cx/ring/views/BoundedScrollView.java diff --git a/ring-android/app/src/main/java/cx/ring/views/CheckableImageButton.java b/jami-android/app/src/main/java/cx/ring/views/CheckableImageButton.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/CheckableImageButton.java rename to jami-android/app/src/main/java/cx/ring/views/CheckableImageButton.java diff --git a/ring-android/app/src/main/java/cx/ring/views/ConversationImageView.java b/jami-android/app/src/main/java/cx/ring/views/ConversationImageView.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/ConversationImageView.java rename to jami-android/app/src/main/java/cx/ring/views/ConversationImageView.java diff --git a/ring-android/app/src/main/java/cx/ring/views/CredentialPreferenceDialog.java b/jami-android/app/src/main/java/cx/ring/views/CredentialPreferenceDialog.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/CredentialPreferenceDialog.java rename to jami-android/app/src/main/java/cx/ring/views/CredentialPreferenceDialog.java diff --git a/ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java b/jami-android/app/src/main/java/cx/ring/views/CredentialsPreference.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java rename to jami-android/app/src/main/java/cx/ring/views/CredentialsPreference.java diff --git a/ring-android/app/src/main/java/cx/ring/views/CustomGridLayout.kt b/jami-android/app/src/main/java/cx/ring/views/CustomGridLayout.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/CustomGridLayout.kt rename to jami-android/app/src/main/java/cx/ring/views/CustomGridLayout.kt diff --git a/ring-android/app/src/main/java/cx/ring/views/EditTextIntegerPreference.java b/jami-android/app/src/main/java/cx/ring/views/EditTextIntegerPreference.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/EditTextIntegerPreference.java rename to jami-android/app/src/main/java/cx/ring/views/EditTextIntegerPreference.java diff --git a/ring-android/app/src/main/java/cx/ring/views/EditTextPreferenceDialog.java b/jami-android/app/src/main/java/cx/ring/views/EditTextPreferenceDialog.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/EditTextPreferenceDialog.java rename to jami-android/app/src/main/java/cx/ring/views/EditTextPreferenceDialog.java diff --git a/ring-android/app/src/main/java/cx/ring/views/FitsWindowsLayout.java b/jami-android/app/src/main/java/cx/ring/views/FitsWindowsLayout.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/FitsWindowsLayout.java rename to jami-android/app/src/main/java/cx/ring/views/FitsWindowsLayout.java diff --git a/ring-android/app/src/main/java/cx/ring/views/MessageStatusView.kt b/jami-android/app/src/main/java/cx/ring/views/MessageStatusView.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/MessageStatusView.kt rename to jami-android/app/src/main/java/cx/ring/views/MessageStatusView.kt diff --git a/ring-android/app/src/main/java/cx/ring/views/ParticipantView.kt b/jami-android/app/src/main/java/cx/ring/views/ParticipantView.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/ParticipantView.kt rename to jami-android/app/src/main/java/cx/ring/views/ParticipantView.kt diff --git a/ring-android/app/src/main/java/cx/ring/views/ParticipantsContainerView.kt b/jami-android/app/src/main/java/cx/ring/views/ParticipantsContainerView.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/ParticipantsContainerView.kt rename to jami-android/app/src/main/java/cx/ring/views/ParticipantsContainerView.kt diff --git a/ring-android/app/src/main/java/cx/ring/views/PasswordPreference.java b/jami-android/app/src/main/java/cx/ring/views/PasswordPreference.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/PasswordPreference.java rename to jami-android/app/src/main/java/cx/ring/views/PasswordPreference.java diff --git a/ring-android/app/src/main/java/cx/ring/views/PreviewVideoView.java b/jami-android/app/src/main/java/cx/ring/views/PreviewVideoView.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/PreviewVideoView.java rename to jami-android/app/src/main/java/cx/ring/views/PreviewVideoView.java diff --git a/ring-android/app/src/main/java/cx/ring/views/SwitchButton.kt b/jami-android/app/src/main/java/cx/ring/views/SwitchButton.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/SwitchButton.kt rename to jami-android/app/src/main/java/cx/ring/views/SwitchButton.kt diff --git a/ring-android/app/src/main/java/cx/ring/views/TwoButtonEditText.java b/jami-android/app/src/main/java/cx/ring/views/TwoButtonEditText.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/TwoButtonEditText.java rename to jami-android/app/src/main/java/cx/ring/views/TwoButtonEditText.java diff --git a/ring-android/app/src/main/java/cx/ring/views/VideoSinkView.kt b/jami-android/app/src/main/java/cx/ring/views/VideoSinkView.kt similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/VideoSinkView.kt rename to jami-android/app/src/main/java/cx/ring/views/VideoSinkView.kt diff --git a/ring-android/app/src/main/java/cx/ring/views/WizardViewPager.java b/jami-android/app/src/main/java/cx/ring/views/WizardViewPager.java similarity index 100% rename from ring-android/app/src/main/java/cx/ring/views/WizardViewPager.java rename to jami-android/app/src/main/java/cx/ring/views/WizardViewPager.java diff --git a/ring-android/app/src/main/res/anim/fade_in.xml b/jami-android/app/src/main/res/anim/fade_in.xml similarity index 100% rename from ring-android/app/src/main/res/anim/fade_in.xml rename to jami-android/app/src/main/res/anim/fade_in.xml diff --git a/ring-android/app/src/main/res/anim/fade_out.xml b/jami-android/app/src/main/res/anim/fade_out.xml similarity index 100% rename from ring-android/app/src/main/res/anim/fade_out.xml rename to jami-android/app/src/main/res/anim/fade_out.xml diff --git a/ring-android/app/src/main/res/anim/slide_in_left.xml b/jami-android/app/src/main/res/anim/slide_in_left.xml similarity index 100% rename from ring-android/app/src/main/res/anim/slide_in_left.xml rename to jami-android/app/src/main/res/anim/slide_in_left.xml diff --git a/ring-android/app/src/main/res/anim/slide_in_right.xml b/jami-android/app/src/main/res/anim/slide_in_right.xml similarity index 100% rename from ring-android/app/src/main/res/anim/slide_in_right.xml rename to jami-android/app/src/main/res/anim/slide_in_right.xml diff --git a/ring-android/app/src/main/res/anim/slide_out_left.xml b/jami-android/app/src/main/res/anim/slide_out_left.xml similarity index 100% rename from ring-android/app/src/main/res/anim/slide_out_left.xml rename to jami-android/app/src/main/res/anim/slide_out_left.xml diff --git a/ring-android/app/src/main/res/anim/slide_out_right.xml b/jami-android/app/src/main/res/anim/slide_out_right.xml similarity index 100% rename from ring-android/app/src/main/res/anim/slide_out_right.xml rename to jami-android/app/src/main/res/anim/slide_out_right.xml diff --git a/ring-android/app/src/main/res/animator/bounce.xml b/jami-android/app/src/main/res/animator/bounce.xml similarity index 100% rename from ring-android/app/src/main/res/animator/bounce.xml rename to jami-android/app/src/main/res/animator/bounce.xml diff --git a/ring-android/app/src/main/res/animator/bounce2.xml b/jami-android/app/src/main/res/animator/bounce2.xml similarity index 100% rename from ring-android/app/src/main/res/animator/bounce2.xml rename to jami-android/app/src/main/res/animator/bounce2.xml diff --git a/ring-android/app/src/main/res/animator/bounce3.xml b/jami-android/app/src/main/res/animator/bounce3.xml similarity index 100% rename from ring-android/app/src/main/res/animator/bounce3.xml rename to jami-android/app/src/main/res/animator/bounce3.xml diff --git a/ring-android/app/src/main/res/color/call_button.xml b/jami-android/app/src/main/res/color/call_button.xml similarity index 100% rename from ring-android/app/src/main/res/color/call_button.xml rename to jami-android/app/src/main/res/color/call_button.xml diff --git a/ring-android/app/src/main/res/drawable-anydpi/ic_baseline_more_vert.xml b/jami-android/app/src/main/res/drawable-anydpi/ic_baseline_more_vert.xml similarity index 100% rename from ring-android/app/src/main/res/drawable-anydpi/ic_baseline_more_vert.xml rename to jami-android/app/src/main/res/drawable-anydpi/ic_baseline_more_vert.xml diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_action_scan_qr.png b/jami-android/app/src/main/res/drawable-hdpi/ic_action_scan_qr.png similarity index 100% rename from ring-android/app/src/main/res/drawable-hdpi/ic_action_scan_qr.png rename to jami-android/app/src/main/res/drawable-hdpi/ic_action_scan_qr.png diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_contact_picture_fallback.png b/jami-android/app/src/main/res/drawable-hdpi/ic_contact_picture_fallback.png similarity index 100% rename from ring-android/app/src/main/res/drawable-hdpi/ic_contact_picture_fallback.png rename to jami-android/app/src/main/res/drawable-hdpi/ic_contact_picture_fallback.png diff --git a/ring-android/app/src/main/res/drawable-hdpi/ic_ring_logo_white.png b/jami-android/app/src/main/res/drawable-hdpi/ic_ring_logo_white.png similarity index 100% rename from ring-android/app/src/main/res/drawable-hdpi/ic_ring_logo_white.png rename to jami-android/app/src/main/res/drawable-hdpi/ic_ring_logo_white.png diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_action_scan_qr.png b/jami-android/app/src/main/res/drawable-mdpi/ic_action_scan_qr.png similarity index 100% rename from ring-android/app/src/main/res/drawable-mdpi/ic_action_scan_qr.png rename to jami-android/app/src/main/res/drawable-mdpi/ic_action_scan_qr.png diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_contact_picture_fallback.png b/jami-android/app/src/main/res/drawable-mdpi/ic_contact_picture_fallback.png similarity index 100% rename from ring-android/app/src/main/res/drawable-mdpi/ic_contact_picture_fallback.png rename to jami-android/app/src/main/res/drawable-mdpi/ic_contact_picture_fallback.png diff --git a/ring-android/app/src/main/res/drawable-mdpi/ic_ring_logo_white.png b/jami-android/app/src/main/res/drawable-mdpi/ic_ring_logo_white.png similarity index 100% rename from ring-android/app/src/main/res/drawable-mdpi/ic_ring_logo_white.png rename to jami-android/app/src/main/res/drawable-mdpi/ic_ring_logo_white.png diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_action_scan_qr.png b/jami-android/app/src/main/res/drawable-xhdpi/ic_action_scan_qr.png similarity index 100% rename from ring-android/app/src/main/res/drawable-xhdpi/ic_action_scan_qr.png rename to jami-android/app/src/main/res/drawable-xhdpi/ic_action_scan_qr.png diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_contact_picture_fallback.png b/jami-android/app/src/main/res/drawable-xhdpi/ic_contact_picture_fallback.png similarity index 100% rename from ring-android/app/src/main/res/drawable-xhdpi/ic_contact_picture_fallback.png rename to jami-android/app/src/main/res/drawable-xhdpi/ic_contact_picture_fallback.png diff --git a/ring-android/app/src/main/res/drawable-xhdpi/ic_ring_logo_white.png b/jami-android/app/src/main/res/drawable-xhdpi/ic_ring_logo_white.png similarity index 100% rename from ring-android/app/src/main/res/drawable-xhdpi/ic_ring_logo_white.png rename to jami-android/app/src/main/res/drawable-xhdpi/ic_ring_logo_white.png diff --git a/ring-android/app/src/main/res/drawable-xhdpi/jami_banner.png b/jami-android/app/src/main/res/drawable-xhdpi/jami_banner.png similarity index 100% rename from ring-android/app/src/main/res/drawable-xhdpi/jami_banner.png rename to jami-android/app/src/main/res/drawable-xhdpi/jami_banner.png diff --git a/ring-android/app/src/main/res/drawable-xhdpi/tv_background.webp b/jami-android/app/src/main/res/drawable-xhdpi/tv_background.webp similarity index 100% rename from ring-android/app/src/main/res/drawable-xhdpi/tv_background.webp rename to jami-android/app/src/main/res/drawable-xhdpi/tv_background.webp diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_action_scan_qr.png b/jami-android/app/src/main/res/drawable-xxhdpi/ic_action_scan_qr.png similarity index 100% rename from ring-android/app/src/main/res/drawable-xxhdpi/ic_action_scan_qr.png rename to jami-android/app/src/main/res/drawable-xxhdpi/ic_action_scan_qr.png diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_contact_picture_fallback.png b/jami-android/app/src/main/res/drawable-xxhdpi/ic_contact_picture_fallback.png similarity index 100% rename from ring-android/app/src/main/res/drawable-xxhdpi/ic_contact_picture_fallback.png rename to jami-android/app/src/main/res/drawable-xxhdpi/ic_contact_picture_fallback.png diff --git a/ring-android/app/src/main/res/drawable-xxhdpi/ic_ring_logo_white.png b/jami-android/app/src/main/res/drawable-xxhdpi/ic_ring_logo_white.png similarity index 100% rename from ring-android/app/src/main/res/drawable-xxhdpi/ic_ring_logo_white.png rename to jami-android/app/src/main/res/drawable-xxhdpi/ic_ring_logo_white.png diff --git a/ring-android/app/src/main/res/drawable-xxxhdpi/ic_action_scan_qr.png b/jami-android/app/src/main/res/drawable-xxxhdpi/ic_action_scan_qr.png similarity index 100% rename from ring-android/app/src/main/res/drawable-xxxhdpi/ic_action_scan_qr.png rename to jami-android/app/src/main/res/drawable-xxxhdpi/ic_action_scan_qr.png diff --git a/ring-android/app/src/main/res/drawable-xxxhdpi/ic_contact_picture_fallback.png b/jami-android/app/src/main/res/drawable-xxxhdpi/ic_contact_picture_fallback.png similarity index 100% rename from ring-android/app/src/main/res/drawable-xxxhdpi/ic_contact_picture_fallback.png rename to jami-android/app/src/main/res/drawable-xxxhdpi/ic_contact_picture_fallback.png diff --git a/ring-android/app/src/main/res/drawable-xxxhdpi/ic_ring_logo_white.png b/jami-android/app/src/main/res/drawable-xxxhdpi/ic_ring_logo_white.png similarity index 100% rename from ring-android/app/src/main/res/drawable-xxxhdpi/ic_ring_logo_white.png rename to jami-android/app/src/main/res/drawable-xxxhdpi/ic_ring_logo_white.png diff --git a/ring-android/app/src/main/res/drawable/background_bottom_sheet.xml b/jami-android/app/src/main/res/drawable/background_bottom_sheet.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_bottom_sheet.xml rename to jami-android/app/src/main/res/drawable/background_bottom_sheet.xml diff --git a/ring-android/app/src/main/res/drawable/background_call_menu.xml b/jami-android/app/src/main/res/drawable/background_call_menu.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_call_menu.xml rename to jami-android/app/src/main/res/drawable/background_call_menu.xml diff --git a/ring-android/app/src/main/res/drawable/background_conference_hand.xml b/jami-android/app/src/main/res/drawable/background_conference_hand.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_conference_hand.xml rename to jami-android/app/src/main/res/drawable/background_conference_hand.xml diff --git a/ring-android/app/src/main/res/drawable/background_conference_label.xml b/jami-android/app/src/main/res/drawable/background_conference_label.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_conference_label.xml rename to jami-android/app/src/main/res/drawable/background_conference_label.xml diff --git a/ring-android/app/src/main/res/drawable/background_conference_participant.xml b/jami-android/app/src/main/res/drawable/background_conference_participant.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_conference_participant.xml rename to jami-android/app/src/main/res/drawable/background_conference_participant.xml diff --git a/ring-android/app/src/main/res/drawable/background_item_conv_contact.xml b/jami-android/app/src/main/res/drawable/background_item_conv_contact.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_item_conv_contact.xml rename to jami-android/app/src/main/res/drawable/background_item_conv_contact.xml diff --git a/ring-android/app/src/main/res/drawable/background_item_conv_image.xml b/jami-android/app/src/main/res/drawable/background_item_conv_image.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_item_conv_image.xml rename to jami-android/app/src/main/res/drawable/background_item_conv_image.xml diff --git a/ring-android/app/src/main/res/drawable/background_item_smartlist.xml b/jami-android/app/src/main/res/drawable/background_item_smartlist.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_item_smartlist.xml rename to jami-android/app/src/main/res/drawable/background_item_smartlist.xml diff --git a/ring-android/app/src/main/res/drawable/background_jami_edittext.xml b/jami-android/app/src/main/res/drawable/background_jami_edittext.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_jami_edittext.xml rename to jami-android/app/src/main/res/drawable/background_jami_edittext.xml diff --git a/ring-android/app/src/main/res/drawable/background_status_optional.xml b/jami-android/app/src/main/res/drawable/background_status_optional.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_status_optional.xml rename to jami-android/app/src/main/res/drawable/background_status_optional.xml diff --git a/ring-android/app/src/main/res/drawable/background_status_recommended.xml b/jami-android/app/src/main/res/drawable/background_status_recommended.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_status_recommended.xml rename to jami-android/app/src/main/res/drawable/background_status_recommended.xml diff --git a/ring-android/app/src/main/res/drawable/background_status_required.xml b/jami-android/app/src/main/res/drawable/background_status_required.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/background_status_required.xml rename to jami-android/app/src/main/res/drawable/background_status_required.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_account_card_details.xml b/jami-android/app/src/main/res/drawable/baseline_account_card_details.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_account_card_details.xml rename to jami-android/app/src/main/res/drawable/baseline_account_card_details.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_account_circle_white_36.xml b/jami-android/app/src/main/res/drawable/baseline_account_circle_white_36.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_account_circle_white_36.xml rename to jami-android/app/src/main/res/drawable/baseline_account_circle_white_36.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_account_crop_24.xml b/jami-android/app/src/main/res/drawable/baseline_account_crop_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_account_crop_24.xml rename to jami-android/app/src/main/res/drawable/baseline_account_crop_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_account_settings_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_account_settings_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_account_settings_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_account_settings_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_add_24.xml b/jami-android/app/src/main/res/drawable/baseline_add_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_add_24.xml rename to jami-android/app/src/main/res/drawable/baseline_add_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_advanced_settings_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_advanced_settings_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_advanced_settings_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_advanced_settings_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_android_24.xml b/jami-android/app/src/main/res/drawable/baseline_android_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_android_24.xml rename to jami-android/app/src/main/res/drawable/baseline_android_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_androidtv_account.xml b/jami-android/app/src/main/res/drawable/baseline_androidtv_account.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_androidtv_account.xml rename to jami-android/app/src/main/res/drawable/baseline_androidtv_account.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_androidtv_add_user.xml b/jami-android/app/src/main/res/drawable/baseline_androidtv_add_user.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_androidtv_add_user.xml rename to jami-android/app/src/main/res/drawable/baseline_androidtv_add_user.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_androidtv_chat.xml b/jami-android/app/src/main/res/drawable/baseline_androidtv_chat.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_androidtv_chat.xml rename to jami-android/app/src/main/res/drawable/baseline_androidtv_chat.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_androidtv_clearconversation.xml b/jami-android/app/src/main/res/drawable/baseline_androidtv_clearconversation.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_androidtv_clearconversation.xml rename to jami-android/app/src/main/res/drawable/baseline_androidtv_clearconversation.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_androidtv_deletecontact.xml b/jami-android/app/src/main/res/drawable/baseline_androidtv_deletecontact.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_androidtv_deletecontact.xml rename to jami-android/app/src/main/res/drawable/baseline_androidtv_deletecontact.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_androidtv_link_device.xml b/jami-android/app/src/main/res/drawable/baseline_androidtv_link_device.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_androidtv_link_device.xml rename to jami-android/app/src/main/res/drawable/baseline_androidtv_link_device.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_androidtv_message_audio.xml b/jami-android/app/src/main/res/drawable/baseline_androidtv_message_audio.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_androidtv_message_audio.xml rename to jami-android/app/src/main/res/drawable/baseline_androidtv_message_audio.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_androidtv_message_video.xml b/jami-android/app/src/main/res/drawable/baseline_androidtv_message_video.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_androidtv_message_video.xml rename to jami-android/app/src/main/res/drawable/baseline_androidtv_message_video.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_androidtv_settings.xml b/jami-android/app/src/main/res/drawable/baseline_androidtv_settings.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_androidtv_settings.xml rename to jami-android/app/src/main/res/drawable/baseline_androidtv_settings.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_arrow_down_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_arrow_down_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_arrow_down_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_arrow_down_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_arrow_forward_black_18.xml b/jami-android/app/src/main/res/drawable/baseline_arrow_forward_black_18.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_arrow_forward_black_18.xml rename to jami-android/app/src/main/res/drawable/baseline_arrow_forward_black_18.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_arrow_forward_white_18.xml b/jami-android/app/src/main/res/drawable/baseline_arrow_forward_white_18.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_arrow_forward_white_18.xml rename to jami-android/app/src/main/res/drawable/baseline_arrow_forward_white_18.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_article_24.xml b/jami-android/app/src/main/res/drawable/baseline_article_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_article_24.xml rename to jami-android/app/src/main/res/drawable/baseline_article_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_attach_file_24.xml b/jami-android/app/src/main/res/drawable/baseline_attach_file_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_attach_file_24.xml rename to jami-android/app/src/main/res/drawable/baseline_attach_file_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_autorenew_white_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_autorenew_white_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_autorenew_white_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_autorenew_white_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_backup_black_36.xml b/jami-android/app/src/main/res/drawable/baseline_backup_black_36.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_backup_black_36.xml rename to jami-android/app/src/main/res/drawable/baseline_backup_black_36.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_bitrate_24.xml b/jami-android/app/src/main/res/drawable/baseline_bitrate_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_bitrate_24.xml rename to jami-android/app/src/main/res/drawable/baseline_bitrate_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_block_24.xml b/jami-android/app/src/main/res/drawable/baseline_block_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_block_24.xml rename to jami-android/app/src/main/res/drawable/baseline_block_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_call_24.xml b/jami-android/app/src/main/res/drawable/baseline_call_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_call_24.xml rename to jami-android/app/src/main/res/drawable/baseline_call_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_call_24_primary.xml b/jami-android/app/src/main/res/drawable/baseline_call_24_primary.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_call_24_primary.xml rename to jami-android/app/src/main/res/drawable/baseline_call_24_primary.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_call_end_24.xml b/jami-android/app/src/main/res/drawable/baseline_call_end_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_call_end_24.xml rename to jami-android/app/src/main/res/drawable/baseline_call_end_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_call_end_24_primary.xml b/jami-android/app/src/main/res/drawable/baseline_call_end_24_primary.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_call_end_24_primary.xml rename to jami-android/app/src/main/res/drawable/baseline_call_end_24_primary.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_call_made_24.xml b/jami-android/app/src/main/res/drawable/baseline_call_made_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_call_made_24.xml rename to jami-android/app/src/main/res/drawable/baseline_call_made_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_call_missed_24.xml b/jami-android/app/src/main/res/drawable/baseline_call_missed_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_call_missed_24.xml rename to jami-android/app/src/main/res/drawable/baseline_call_missed_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_call_missed_outgoing_24.xml b/jami-android/app/src/main/res/drawable/baseline_call_missed_outgoing_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_call_missed_outgoing_24.xml rename to jami-android/app/src/main/res/drawable/baseline_call_missed_outgoing_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_call_received_24.xml b/jami-android/app/src/main/res/drawable/baseline_call_received_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_call_received_24.xml rename to jami-android/app/src/main/res/drawable/baseline_call_received_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_camera_front_24.xml b/jami-android/app/src/main/res/drawable/baseline_camera_front_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_camera_front_24.xml rename to jami-android/app/src/main/res/drawable/baseline_camera_front_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_camera_rear_24.xml b/jami-android/app/src/main/res/drawable/baseline_camera_rear_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_camera_rear_24.xml rename to jami-android/app/src/main/res/drawable/baseline_camera_rear_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_cancel_24.xml b/jami-android/app/src/main/res/drawable/baseline_cancel_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_cancel_24.xml rename to jami-android/app/src/main/res/drawable/baseline_cancel_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_chat_24.xml b/jami-android/app/src/main/res/drawable/baseline_chat_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_chat_24.xml rename to jami-android/app/src/main/res/drawable/baseline_chat_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_check_circle_24.xml b/jami-android/app/src/main/res/drawable/baseline_check_circle_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_check_circle_24.xml rename to jami-android/app/src/main/res/drawable/baseline_check_circle_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_check_circle_outline_24.xml b/jami-android/app/src/main/res/drawable/baseline_check_circle_outline_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_check_circle_outline_24.xml rename to jami-android/app/src/main/res/drawable/baseline_check_circle_outline_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_circle_24.xml b/jami-android/app/src/main/res/drawable/baseline_circle_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_circle_24.xml rename to jami-android/app/src/main/res/drawable/baseline_circle_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_clear_all_24.xml b/jami-android/app/src/main/res/drawable/baseline_clear_all_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_clear_all_24.xml rename to jami-android/app/src/main/res/drawable/baseline_clear_all_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_close_24.xml b/jami-android/app/src/main/res/drawable/baseline_close_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_close_24.xml rename to jami-android/app/src/main/res/drawable/baseline_close_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_close_fullscreen_24.xml b/jami-android/app/src/main/res/drawable/baseline_close_fullscreen_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_close_fullscreen_24.xml rename to jami-android/app/src/main/res/drawable/baseline_close_fullscreen_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_cloud_24.xml b/jami-android/app/src/main/res/drawable/baseline_cloud_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_cloud_24.xml rename to jami-android/app/src/main/res/drawable/baseline_cloud_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_conf_participants.xml b/jami-android/app/src/main/res/drawable/baseline_conf_participants.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_conf_participants.xml rename to jami-android/app/src/main/res/drawable/baseline_conf_participants.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_content_copy_twoton_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_content_copy_twoton_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_content_copy_twoton_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_content_copy_twoton_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_copyright_24.xml b/jami-android/app/src/main/res/drawable/baseline_copyright_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_copyright_24.xml rename to jami-android/app/src/main/res/drawable/baseline_copyright_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_delete_24.xml b/jami-android/app/src/main/res/drawable/baseline_delete_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_delete_24.xml rename to jami-android/app/src/main/res/drawable/baseline_delete_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_description_24.xml b/jami-android/app/src/main/res/drawable/baseline_description_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_description_24.xml rename to jami-android/app/src/main/res/drawable/baseline_description_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_desktop_windows_24.xml b/jami-android/app/src/main/res/drawable/baseline_desktop_windows_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_desktop_windows_24.xml rename to jami-android/app/src/main/res/drawable/baseline_desktop_windows_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_devices_24.xml b/jami-android/app/src/main/res/drawable/baseline_devices_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_devices_24.xml rename to jami-android/app/src/main/res/drawable/baseline_devices_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_devices_white_36.xml b/jami-android/app/src/main/res/drawable/baseline_devices_white_36.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_devices_white_36.xml rename to jami-android/app/src/main/res/drawable/baseline_devices_white_36.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_dialer_sip_24.xml b/jami-android/app/src/main/res/drawable/baseline_dialer_sip_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_dialer_sip_24.xml rename to jami-android/app/src/main/res/drawable/baseline_dialer_sip_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_dialpad_24.xml b/jami-android/app/src/main/res/drawable/baseline_dialpad_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_dialpad_24.xml rename to jami-android/app/src/main/res/drawable/baseline_dialpad_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_dns_24.xml b/jami-android/app/src/main/res/drawable/baseline_dns_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_dns_24.xml rename to jami-android/app/src/main/res/drawable/baseline_dns_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_drafts_24.xml b/jami-android/app/src/main/res/drawable/baseline_drafts_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_drafts_24.xml rename to jami-android/app/src/main/res/drawable/baseline_drafts_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_edit_16.xml b/jami-android/app/src/main/res/drawable/baseline_edit_16.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_edit_16.xml rename to jami-android/app/src/main/res/drawable/baseline_edit_16.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_edit_24.xml b/jami-android/app/src/main/res/drawable/baseline_edit_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_edit_24.xml rename to jami-android/app/src/main/res/drawable/baseline_edit_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_edit_twoton_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_edit_twoton_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_edit_twoton_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_edit_twoton_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_error_24.xml b/jami-android/app/src/main/res/drawable/baseline_error_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_error_24.xml rename to jami-android/app/src/main/res/drawable/baseline_error_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_expand_less_24.xml b/jami-android/app/src/main/res/drawable/baseline_expand_less_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_expand_less_24.xml rename to jami-android/app/src/main/res/drawable/baseline_expand_less_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_face_24.xml b/jami-android/app/src/main/res/drawable/baseline_face_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_face_24.xml rename to jami-android/app/src/main/res/drawable/baseline_face_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_feedback_24.xml b/jami-android/app/src/main/res/drawable/baseline_feedback_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_feedback_24.xml rename to jami-android/app/src/main/res/drawable/baseline_feedback_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_file_download_24.xml b/jami-android/app/src/main/res/drawable/baseline_file_download_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_file_download_24.xml rename to jami-android/app/src/main/res/drawable/baseline_file_download_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_flip_camera_24.xml b/jami-android/app/src/main/res/drawable/baseline_flip_camera_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_flip_camera_24.xml rename to jami-android/app/src/main/res/drawable/baseline_flip_camera_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_flip_camera_24_off.xml b/jami-android/app/src/main/res/drawable/baseline_flip_camera_24_off.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_flip_camera_24_off.xml rename to jami-android/app/src/main/res/drawable/baseline_flip_camera_24_off.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_forum_24.xml b/jami-android/app/src/main/res/drawable/baseline_forum_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_forum_24.xml rename to jami-android/app/src/main/res/drawable/baseline_forum_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_grain_24.xml b/jami-android/app/src/main/res/drawable/baseline_grain_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_grain_24.xml rename to jami-android/app/src/main/res/drawable/baseline_grain_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_graphic_eq_24.xml b/jami-android/app/src/main/res/drawable/baseline_graphic_eq_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_graphic_eq_24.xml rename to jami-android/app/src/main/res/drawable/baseline_graphic_eq_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_group_24.xml b/jami-android/app/src/main/res/drawable/baseline_group_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_group_24.xml rename to jami-android/app/src/main/res/drawable/baseline_group_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_group_add_24.xml b/jami-android/app/src/main/res/drawable/baseline_group_add_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_group_add_24.xml rename to jami-android/app/src/main/res/drawable/baseline_group_add_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_hd_24.xml b/jami-android/app/src/main/res/drawable/baseline_hd_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_hd_24.xml rename to jami-android/app/src/main/res/drawable/baseline_hd_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_highlight_off_24.xml b/jami-android/app/src/main/res/drawable/baseline_highlight_off_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_highlight_off_24.xml rename to jami-android/app/src/main/res/drawable/baseline_highlight_off_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_home_24.xml b/jami-android/app/src/main/res/drawable/baseline_home_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_home_24.xml rename to jami-android/app/src/main/res/drawable/baseline_home_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_info_24.xml b/jami-android/app/src/main/res/drawable/baseline_info_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_info_24.xml rename to jami-android/app/src/main/res/drawable/baseline_info_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_insert_drive_file_24.xml b/jami-android/app/src/main/res/drawable/baseline_insert_drive_file_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_insert_drive_file_24.xml rename to jami-android/app/src/main/res/drawable/baseline_insert_drive_file_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_insert_photo_24.xml b/jami-android/app/src/main/res/drawable/baseline_insert_photo_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_insert_photo_24.xml rename to jami-android/app/src/main/res/drawable/baseline_insert_photo_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_invert_colors_24.xml b/jami-android/app/src/main/res/drawable/baseline_invert_colors_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_invert_colors_24.xml rename to jami-android/app/src/main/res/drawable/baseline_invert_colors_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_keyboard_24.xml b/jami-android/app/src/main/res/drawable/baseline_keyboard_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_keyboard_24.xml rename to jami-android/app/src/main/res/drawable/baseline_keyboard_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_language_18.xml b/jami-android/app/src/main/res/drawable/baseline_language_18.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_language_18.xml rename to jami-android/app/src/main/res/drawable/baseline_language_18.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_location_disabled_24.xml b/jami-android/app/src/main/res/drawable/baseline_location_disabled_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_location_disabled_24.xml rename to jami-android/app/src/main/res/drawable/baseline_location_disabled_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_lock_24.xml b/jami-android/app/src/main/res/drawable/baseline_lock_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_lock_24.xml rename to jami-android/app/src/main/res/drawable/baseline_lock_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_mark_chat_read_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_mark_chat_read_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_mark_chat_read_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_mark_chat_read_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_memory_24.xml b/jami-android/app/src/main/res/drawable/baseline_memory_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_memory_24.xml rename to jami-android/app/src/main/res/drawable/baseline_memory_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_mic_24.xml b/jami-android/app/src/main/res/drawable/baseline_mic_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_mic_24.xml rename to jami-android/app/src/main/res/drawable/baseline_mic_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_mic_off_24.xml b/jami-android/app/src/main/res/drawable/baseline_mic_off_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_mic_off_24.xml rename to jami-android/app/src/main/res/drawable/baseline_mic_off_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_mic_on_24.xml b/jami-android/app/src/main/res/drawable/baseline_mic_on_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_mic_on_24.xml rename to jami-android/app/src/main/res/drawable/baseline_mic_on_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_mobile_screen_share_24.xml b/jami-android/app/src/main/res/drawable/baseline_mobile_screen_share_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_mobile_screen_share_24.xml rename to jami-android/app/src/main/res/drawable/baseline_mobile_screen_share_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_moderateur.xml b/jami-android/app/src/main/res/drawable/baseline_moderateur.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_moderateur.xml rename to jami-android/app/src/main/res/drawable/baseline_moderateur.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_more_horiz_24.xml b/jami-android/app/src/main/res/drawable/baseline_more_horiz_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_more_horiz_24.xml rename to jami-android/app/src/main/res/drawable/baseline_more_horiz_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_more_vert_24.xml b/jami-android/app/src/main/res/drawable/baseline_more_vert_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_more_vert_24.xml rename to jami-android/app/src/main/res/drawable/baseline_more_vert_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_my_location_24.xml b/jami-android/app/src/main/res/drawable/baseline_my_location_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_my_location_24.xml rename to jami-android/app/src/main/res/drawable/baseline_my_location_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_navigation_24.xml b/jami-android/app/src/main/res/drawable/baseline_navigation_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_navigation_24.xml rename to jami-android/app/src/main/res/drawable/baseline_navigation_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_network_check_24.xml b/jami-android/app/src/main/res/drawable/baseline_network_check_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_network_check_24.xml rename to jami-android/app/src/main/res/drawable/baseline_network_check_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_notification_important_24.xml b/jami-android/app/src/main/res/drawable/baseline_notification_important_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_notification_important_24.xml rename to jami-android/app/src/main/res/drawable/baseline_notification_important_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_notifications_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_notifications_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_notifications_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_notifications_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_notifications_active_24.xml b/jami-android/app/src/main/res/drawable/baseline_notifications_active_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_notifications_active_24.xml rename to jami-android/app/src/main/res/drawable/baseline_notifications_active_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_notifications_off_24.xml b/jami-android/app/src/main/res/drawable/baseline_notifications_off_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_notifications_off_24.xml rename to jami-android/app/src/main/res/drawable/baseline_notifications_off_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_open_in_full_24.xml b/jami-android/app/src/main/res/drawable/baseline_open_in_full_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_open_in_full_24.xml rename to jami-android/app/src/main/res/drawable/baseline_open_in_full_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_open_in_new_24.xml b/jami-android/app/src/main/res/drawable/baseline_open_in_new_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_open_in_new_24.xml rename to jami-android/app/src/main/res/drawable/baseline_open_in_new_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_pause_24.xml b/jami-android/app/src/main/res/drawable/baseline_pause_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_pause_24.xml rename to jami-android/app/src/main/res/drawable/baseline_pause_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_people_24.xml b/jami-android/app/src/main/res/drawable/baseline_people_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_people_24.xml rename to jami-android/app/src/main/res/drawable/baseline_people_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_perm_data_setting_24.xml b/jami-android/app/src/main/res/drawable/baseline_perm_data_setting_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_perm_data_setting_24.xml rename to jami-android/app/src/main/res/drawable/baseline_perm_data_setting_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_person_24.xml b/jami-android/app/src/main/res/drawable/baseline_person_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_person_24.xml rename to jami-android/app/src/main/res/drawable/baseline_person_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_person_add_24.xml b/jami-android/app/src/main/res/drawable/baseline_person_add_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_person_add_24.xml rename to jami-android/app/src/main/res/drawable/baseline_person_add_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_photo_camera_24.xml b/jami-android/app/src/main/res/drawable/baseline_photo_camera_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_photo_camera_24.xml rename to jami-android/app/src/main/res/drawable/baseline_photo_camera_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_photo_library_24.xml b/jami-android/app/src/main/res/drawable/baseline_photo_library_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_photo_library_24.xml rename to jami-android/app/src/main/res/drawable/baseline_photo_library_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_photo_size_select_small_24.xml b/jami-android/app/src/main/res/drawable/baseline_photo_size_select_small_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_photo_size_select_small_24.xml rename to jami-android/app/src/main/res/drawable/baseline_photo_size_select_small_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_play_arrow_24.xml b/jami-android/app/src/main/res/drawable/baseline_play_arrow_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_play_arrow_24.xml rename to jami-android/app/src/main/res/drawable/baseline_play_arrow_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_preview_24.xml b/jami-android/app/src/main/res/drawable/baseline_preview_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_preview_24.xml rename to jami-android/app/src/main/res/drawable/baseline_preview_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_qr_code_2_black_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_qr_code_2_black_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_qr_code_2_black_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_qr_code_2_black_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_qr_code_twotone_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_qr_code_twotone_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_qr_code_twotone_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_qr_code_twotone_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_raisehand_24.xml b/jami-android/app/src/main/res/drawable/baseline_raisehand_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_raisehand_24.xml rename to jami-android/app/src/main/res/drawable/baseline_raisehand_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_replay_24.xml b/jami-android/app/src/main/res/drawable/baseline_replay_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_replay_24.xml rename to jami-android/app/src/main/res/drawable/baseline_replay_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_reply_24.xml b/jami-android/app/src/main/res/drawable/baseline_reply_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_reply_24.xml rename to jami-android/app/src/main/res/drawable/baseline_reply_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_ripple_effect.xml b/jami-android/app/src/main/res/drawable/baseline_ripple_effect.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_ripple_effect.xml rename to jami-android/app/src/main/res/drawable/baseline_ripple_effect.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_router_black_36.xml b/jami-android/app/src/main/res/drawable/baseline_router_black_36.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_router_black_36.xml rename to jami-android/app/src/main/res/drawable/baseline_router_black_36.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_search_24.xml b/jami-android/app/src/main/res/drawable/baseline_search_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_search_24.xml rename to jami-android/app/src/main/res/drawable/baseline_search_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_send_24.xml b/jami-android/app/src/main/res/drawable/baseline_send_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_send_24.xml rename to jami-android/app/src/main/res/drawable/baseline_send_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_settings_24.xml b/jami-android/app/src/main/res/drawable/baseline_settings_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_settings_24.xml rename to jami-android/app/src/main/res/drawable/baseline_settings_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_share_24.xml b/jami-android/app/src/main/res/drawable/baseline_share_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_share_24.xml rename to jami-android/app/src/main/res/drawable/baseline_share_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_share_twoton_16dp.xml b/jami-android/app/src/main/res/drawable/baseline_share_twoton_16dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_share_twoton_16dp.xml rename to jami-android/app/src/main/res/drawable/baseline_share_twoton_16dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_share_twoton_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_share_twoton_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_share_twoton_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_share_twoton_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_sound_24.xml b/jami-android/app/src/main/res/drawable/baseline_sound_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_sound_24.xml rename to jami-android/app/src/main/res/drawable/baseline_sound_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_sound_off_24.xml b/jami-android/app/src/main/res/drawable/baseline_sound_off_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_sound_off_24.xml rename to jami-android/app/src/main/res/drawable/baseline_sound_off_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_sound_on_24.xml b/jami-android/app/src/main/res/drawable/baseline_sound_on_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_sound_on_24.xml rename to jami-android/app/src/main/res/drawable/baseline_sound_on_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_sound_on_low_24.xml b/jami-android/app/src/main/res/drawable/baseline_sound_on_low_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_sound_on_low_24.xml rename to jami-android/app/src/main/res/drawable/baseline_sound_on_low_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_stop_screen_share_24dp.xml b/jami-android/app/src/main/res/drawable/baseline_stop_screen_share_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_stop_screen_share_24dp.xml rename to jami-android/app/src/main/res/drawable/baseline_stop_screen_share_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_sync_disabled_24.xml b/jami-android/app/src/main/res/drawable/baseline_sync_disabled_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_sync_disabled_24.xml rename to jami-android/app/src/main/res/drawable/baseline_sync_disabled_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_upload_24.xml b/jami-android/app/src/main/res/drawable/baseline_upload_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_upload_24.xml rename to jami-android/app/src/main/res/drawable/baseline_upload_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_videocam_24.xml b/jami-android/app/src/main/res/drawable/baseline_videocam_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_videocam_24.xml rename to jami-android/app/src/main/res/drawable/baseline_videocam_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_videocam_24_primary.xml b/jami-android/app/src/main/res/drawable/baseline_videocam_24_primary.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_videocam_24_primary.xml rename to jami-android/app/src/main/res/drawable/baseline_videocam_24_primary.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_videocam_off_24.xml b/jami-android/app/src/main/res/drawable/baseline_videocam_off_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_videocam_off_24.xml rename to jami-android/app/src/main/res/drawable/baseline_videocam_off_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_videocam_on_24.xml b/jami-android/app/src/main/res/drawable/baseline_videocam_on_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_videocam_on_24.xml rename to jami-android/app/src/main/res/drawable/baseline_videocam_on_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_videocam_w.xml b/jami-android/app/src/main/res/drawable/baseline_videocam_w.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_videocam_w.xml rename to jami-android/app/src/main/res/drawable/baseline_videocam_w.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_volume_up_24.xml b/jami-android/app/src/main/res/drawable/baseline_volume_up_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_volume_up_24.xml rename to jami-android/app/src/main/res/drawable/baseline_volume_up_24.xml diff --git a/ring-android/app/src/main/res/drawable/baseline_warning_24.xml b/jami-android/app/src/main/res/drawable/baseline_warning_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/baseline_warning_24.xml rename to jami-android/app/src/main/res/drawable/baseline_warning_24.xml diff --git a/ring-android/app/src/main/res/drawable/bg_spinner.xml b/jami-android/app/src/main/res/drawable/bg_spinner.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/bg_spinner.xml rename to jami-android/app/src/main/res/drawable/bg_spinner.xml diff --git a/ring-android/app/src/main/res/drawable/call_button_background_checkable.xml b/jami-android/app/src/main/res/drawable/call_button_background_checkable.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/call_button_background_checkable.xml rename to jami-android/app/src/main/res/drawable/call_button_background_checkable.xml diff --git a/ring-android/app/src/main/res/drawable/call_button_background_pressable.xml b/jami-android/app/src/main/res/drawable/call_button_background_pressable.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/call_button_background_pressable.xml rename to jami-android/app/src/main/res/drawable/call_button_background_pressable.xml diff --git a/ring-android/app/src/main/res/drawable/call_hangup_btn_background.xml b/jami-android/app/src/main/res/drawable/call_hangup_btn_background.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/call_hangup_btn_background.xml rename to jami-android/app/src/main/res/drawable/call_hangup_btn_background.xml diff --git a/ring-android/app/src/main/res/drawable/contrib_background.webp b/jami-android/app/src/main/res/drawable/contrib_background.webp similarity index 100% rename from ring-android/app/src/main/res/drawable/contrib_background.webp rename to jami-android/app/src/main/res/drawable/contrib_background.webp diff --git a/ring-android/app/src/main/res/drawable/drawer_handlebar.xml b/jami-android/app/src/main/res/drawable/drawer_handlebar.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/drawer_handlebar.xml rename to jami-android/app/src/main/res/drawable/drawer_handlebar.xml diff --git a/ring-android/app/src/main/res/drawable/hd_button_background.xml b/jami-android/app/src/main/res/drawable/hd_button_background.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/hd_button_background.xml rename to jami-android/app/src/main/res/drawable/hd_button_background.xml diff --git a/ring-android/app/src/main/res/drawable/ic_arrow_drop_up_black_24dp.xml b/jami-android/app/src/main/res/drawable/ic_arrow_drop_up_black_24dp.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_arrow_drop_up_black_24dp.xml rename to jami-android/app/src/main/res/drawable/ic_arrow_drop_up_black_24dp.xml diff --git a/ring-android/app/src/main/res/drawable/ic_chevron_left_24px.xml b/jami-android/app/src/main/res/drawable/ic_chevron_left_24px.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_chevron_left_24px.xml rename to jami-android/app/src/main/res/drawable/ic_chevron_left_24px.xml diff --git a/ring-android/app/src/main/res/drawable/ic_chevron_right_24px.xml b/jami-android/app/src/main/res/drawable/ic_chevron_right_24px.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_chevron_right_24px.xml rename to jami-android/app/src/main/res/drawable/ic_chevron_right_24px.xml diff --git a/ring-android/app/src/main/res/drawable/ic_error_red.xml b/jami-android/app/src/main/res/drawable/ic_error_red.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_error_red.xml rename to jami-android/app/src/main/res/drawable/ic_error_red.xml diff --git a/ring-android/app/src/main/res/drawable/ic_good_green.xml b/jami-android/app/src/main/res/drawable/ic_good_green.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_good_green.xml rename to jami-android/app/src/main/res/drawable/ic_good_green.xml diff --git a/ring-android/app/src/main/res/drawable/ic_jami.xml b/jami-android/app/src/main/res/drawable/ic_jami.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_jami.xml rename to jami-android/app/src/main/res/drawable/ic_jami.xml diff --git a/ring-android/app/src/main/res/drawable/ic_jami_24.xml b/jami-android/app/src/main/res/drawable/ic_jami_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_jami_24.xml rename to jami-android/app/src/main/res/drawable/ic_jami_24.xml diff --git a/ring-android/app/src/main/res/drawable/ic_jami_48.xml b/jami-android/app/src/main/res/drawable/ic_jami_48.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_jami_48.xml rename to jami-android/app/src/main/res/drawable/ic_jami_48.xml diff --git a/ring-android/app/src/main/res/drawable/ic_jami_full_logo.xml b/jami-android/app/src/main/res/drawable/ic_jami_full_logo.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_jami_full_logo.xml rename to jami-android/app/src/main/res/drawable/ic_jami_full_logo.xml diff --git a/ring-android/app/src/main/res/drawable/ic_online_indicator.xml b/jami-android/app/src/main/res/drawable/ic_online_indicator.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_online_indicator.xml rename to jami-android/app/src/main/res/drawable/ic_online_indicator.xml diff --git a/ring-android/app/src/main/res/drawable/ic_plugin.xml b/jami-android/app/src/main/res/drawable/ic_plugin.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_plugin.xml rename to jami-android/app/src/main/res/drawable/ic_plugin.xml diff --git a/ring-android/app/src/main/res/drawable/ic_preview_handle.xml b/jami-android/app/src/main/res/drawable/ic_preview_handle.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_preview_handle.xml rename to jami-android/app/src/main/res/drawable/ic_preview_handle.xml diff --git a/ring-android/app/src/main/res/drawable/ic_ring_logo_white_vd.xml b/jami-android/app/src/main/res/drawable/ic_ring_logo_white_vd.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_ring_logo_white_vd.xml rename to jami-android/app/src/main/res/drawable/ic_ring_logo_white_vd.xml diff --git a/ring-android/app/src/main/res/drawable/ic_tv_online_indicator.xml b/jami-android/app/src/main/res/drawable/ic_tv_online_indicator.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/ic_tv_online_indicator.xml rename to jami-android/app/src/main/res/drawable/ic_tv_online_indicator.xml diff --git a/ring-android/app/src/main/res/drawable/icon_focused.xml b/jami-android/app/src/main/res/drawable/icon_focused.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/icon_focused.xml rename to jami-android/app/src/main/res/drawable/icon_focused.xml diff --git a/ring-android/app/src/main/res/drawable/item_color_background.xml b/jami-android/app/src/main/res/drawable/item_color_background.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/item_color_background.xml rename to jami-android/app/src/main/res/drawable/item_color_background.xml diff --git a/ring-android/app/src/main/res/drawable/item_settings_icon_background.xml b/jami-android/app/src/main/res/drawable/item_settings_icon_background.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/item_settings_icon_background.xml rename to jami-android/app/src/main/res/drawable/item_settings_icon_background.xml diff --git a/ring-android/app/src/main/res/drawable/loccationshare_bg_gradient.xml b/jami-android/app/src/main/res/drawable/loccationshare_bg_gradient.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/loccationshare_bg_gradient.xml rename to jami-android/app/src/main/res/drawable/loccationshare_bg_gradient.xml diff --git a/ring-android/app/src/main/res/drawable/logo_sfl_coul_rgb.webp b/jami-android/app/src/main/res/drawable/logo_sfl_coul_rgb.webp similarity index 100% rename from ring-android/app/src/main/res/drawable/logo_sfl_coul_rgb.webp rename to jami-android/app/src/main/res/drawable/logo_sfl_coul_rgb.webp diff --git a/ring-android/app/src/main/res/drawable/outline_file_copy_16.xml b/jami-android/app/src/main/res/drawable/outline_file_copy_16.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/outline_file_copy_16.xml rename to jami-android/app/src/main/res/drawable/outline_file_copy_16.xml diff --git a/ring-android/app/src/main/res/drawable/outline_file_copy_24.xml b/jami-android/app/src/main/res/drawable/outline_file_copy_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/outline_file_copy_24.xml rename to jami-android/app/src/main/res/drawable/outline_file_copy_24.xml diff --git a/ring-android/app/src/main/res/drawable/outline_history_16.xml b/jami-android/app/src/main/res/drawable/outline_history_16.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/outline_history_16.xml rename to jami-android/app/src/main/res/drawable/outline_history_16.xml diff --git a/ring-android/app/src/main/res/drawable/outline_history_24.xml b/jami-android/app/src/main/res/drawable/outline_history_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/outline_history_24.xml rename to jami-android/app/src/main/res/drawable/outline_history_24.xml diff --git a/ring-android/app/src/main/res/drawable/rotate.xml b/jami-android/app/src/main/res/drawable/rotate.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/rotate.xml rename to jami-android/app/src/main/res/drawable/rotate.xml diff --git a/ring-android/app/src/main/res/drawable/round_check_circle_24.xml b/jami-android/app/src/main/res/drawable/round_check_circle_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/round_check_circle_24.xml rename to jami-android/app/src/main/res/drawable/round_check_circle_24.xml diff --git a/ring-android/app/src/main/res/drawable/round_highlight_off_24.xml b/jami-android/app/src/main/res/drawable/round_highlight_off_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/round_highlight_off_24.xml rename to jami-android/app/src/main/res/drawable/round_highlight_off_24.xml diff --git a/ring-android/app/src/main/res/drawable/round_settings_backup_restore_24.xml b/jami-android/app/src/main/res/drawable/round_settings_backup_restore_24.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/round_settings_backup_restore_24.xml rename to jami-android/app/src/main/res/drawable/round_settings_backup_restore_24.xml diff --git a/ring-android/app/src/main/res/drawable/show_preview.xml b/jami-android/app/src/main/res/drawable/show_preview.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/show_preview.xml rename to jami-android/app/src/main/res/drawable/show_preview.xml diff --git a/ring-android/app/src/main/res/drawable/static_rounded_background.xml b/jami-android/app/src/main/res/drawable/static_rounded_background.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/static_rounded_background.xml rename to jami-android/app/src/main/res/drawable/static_rounded_background.xml diff --git a/ring-android/app/src/main/res/drawable/tab_indicator_default.xml b/jami-android/app/src/main/res/drawable/tab_indicator_default.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/tab_indicator_default.xml rename to jami-android/app/src/main/res/drawable/tab_indicator_default.xml diff --git a/ring-android/app/src/main/res/drawable/tab_indicator_selected.xml b/jami-android/app/src/main/res/drawable/tab_indicator_selected.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/tab_indicator_selected.xml rename to jami-android/app/src/main/res/drawable/tab_indicator_selected.xml diff --git a/ring-android/app/src/main/res/drawable/tab_selector.xml b/jami-android/app/src/main/res/drawable/tab_selector.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/tab_selector.xml rename to jami-android/app/src/main/res/drawable/tab_selector.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_in.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_in.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_in.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_in.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_in_first.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_in_first.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_in_first.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_in_first.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_in_last.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_in_last.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_in_last.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_in_last.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_in_middle.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_in_middle.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_in_middle.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_in_middle.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_input.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_input.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_input.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_input.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_out.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_out.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_out.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_out.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_out_first.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_out_first.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_out_first.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_out_first.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_out_last.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_out_last.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_out_last.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_out_last.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_out_middle.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_out_middle.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_out_middle.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_out_middle.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_preview.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_preview.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_preview.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_preview.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_bg_ripple.xml b/jami-android/app/src/main/res/drawable/textmsg_bg_ripple.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_bg_ripple.xml rename to jami-android/app/src/main/res/drawable/textmsg_bg_ripple.xml diff --git a/ring-android/app/src/main/res/drawable/textmsg_call_background.xml b/jami-android/app/src/main/res/drawable/textmsg_call_background.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/textmsg_call_background.xml rename to jami-android/app/src/main/res/drawable/textmsg_call_background.xml diff --git a/ring-android/app/src/main/res/drawable/transparent_round_grey.xml b/jami-android/app/src/main/res/drawable/transparent_round_grey.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/transparent_round_grey.xml rename to jami-android/app/src/main/res/drawable/transparent_round_grey.xml diff --git a/ring-android/app/src/main/res/drawable/tv_button_shape.xml b/jami-android/app/src/main/res/drawable/tv_button_shape.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/tv_button_shape.xml rename to jami-android/app/src/main/res/drawable/tv_button_shape.xml diff --git a/ring-android/app/src/main/res/drawable/tv_header_bg.xml b/jami-android/app/src/main/res/drawable/tv_header_bg.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/tv_header_bg.xml rename to jami-android/app/src/main/res/drawable/tv_header_bg.xml diff --git a/ring-android/app/src/main/res/drawable/tv_item_selected_background.xml b/jami-android/app/src/main/res/drawable/tv_item_selected_background.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/tv_item_selected_background.xml rename to jami-android/app/src/main/res/drawable/tv_item_selected_background.xml diff --git a/ring-android/app/src/main/res/drawable/tv_item_unselected_background.xml b/jami-android/app/src/main/res/drawable/tv_item_unselected_background.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/tv_item_unselected_background.xml rename to jami-android/app/src/main/res/drawable/tv_item_unselected_background.xml diff --git a/ring-android/app/src/main/res/drawable/typing_indicator.xml b/jami-android/app/src/main/res/drawable/typing_indicator.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/typing_indicator.xml rename to jami-android/app/src/main/res/drawable/typing_indicator.xml diff --git a/ring-android/app/src/main/res/drawable/typing_indicator_animation.xml b/jami-android/app/src/main/res/drawable/typing_indicator_animation.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/typing_indicator_animation.xml rename to jami-android/app/src/main/res/drawable/typing_indicator_animation.xml diff --git a/ring-android/app/src/main/res/drawable/wizard_button_background_selector.xml b/jami-android/app/src/main/res/drawable/wizard_button_background_selector.xml similarity index 100% rename from ring-android/app/src/main/res/drawable/wizard_button_background_selector.xml rename to jami-android/app/src/main/res/drawable/wizard_button_background_selector.xml diff --git a/ring-android/app/src/main/res/font/mulish_regular.ttf b/jami-android/app/src/main/res/font/mulish_regular.ttf similarity index 100% rename from ring-android/app/src/main/res/font/mulish_regular.ttf rename to jami-android/app/src/main/res/font/mulish_regular.ttf diff --git a/ring-android/app/src/main/res/font/mulish_semibold.ttf b/jami-android/app/src/main/res/font/mulish_semibold.ttf similarity index 100% rename from ring-android/app/src/main/res/font/mulish_semibold.ttf rename to jami-android/app/src/main/res/font/mulish_semibold.ttf diff --git a/ring-android/app/src/main/res/font/ubuntu_light.ttf b/jami-android/app/src/main/res/font/ubuntu_light.ttf similarity index 100% rename from ring-android/app/src/main/res/font/ubuntu_light.ttf rename to jami-android/app/src/main/res/font/ubuntu_light.ttf diff --git a/ring-android/app/src/main/res/font/ubuntu_medium.ttf b/jami-android/app/src/main/res/font/ubuntu_medium.ttf similarity index 100% rename from ring-android/app/src/main/res/font/ubuntu_medium.ttf rename to jami-android/app/src/main/res/font/ubuntu_medium.ttf diff --git a/ring-android/app/src/main/res/font/ubuntu_regular.ttf b/jami-android/app/src/main/res/font/ubuntu_regular.ttf similarity index 100% rename from ring-android/app/src/main/res/font/ubuntu_regular.ttf rename to jami-android/app/src/main/res/font/ubuntu_regular.ttf diff --git a/ring-android/app/src/main/res/layout-w720dp-land/tv_activity_call.xml b/jami-android/app/src/main/res/layout-w720dp-land/tv_activity_call.xml similarity index 100% rename from ring-android/app/src/main/res/layout-w720dp-land/tv_activity_call.xml rename to jami-android/app/src/main/res/layout-w720dp-land/tv_activity_call.xml diff --git a/ring-android/app/src/main/res/layout-w720dp-land/tv_activity_search.xml b/jami-android/app/src/main/res/layout-w720dp-land/tv_activity_search.xml similarity index 100% rename from ring-android/app/src/main/res/layout-w720dp-land/tv_activity_search.xml rename to jami-android/app/src/main/res/layout-w720dp-land/tv_activity_search.xml diff --git a/ring-android/app/src/main/res/layout-w720dp-land/tv_activity_send_text.xml b/jami-android/app/src/main/res/layout-w720dp-land/tv_activity_send_text.xml similarity index 100% rename from ring-android/app/src/main/res/layout-w720dp-land/tv_activity_send_text.xml rename to jami-android/app/src/main/res/layout-w720dp-land/tv_activity_send_text.xml diff --git a/ring-android/app/src/main/res/layout-w720dp-land/tv_activity_share.xml b/jami-android/app/src/main/res/layout-w720dp-land/tv_activity_share.xml similarity index 100% rename from ring-android/app/src/main/res/layout-w720dp-land/tv_activity_share.xml rename to jami-android/app/src/main/res/layout-w720dp-land/tv_activity_share.xml diff --git a/ring-android/app/src/main/res/layout-w720dp-land/tv_frag_call.xml b/jami-android/app/src/main/res/layout-w720dp-land/tv_frag_call.xml similarity index 100% rename from ring-android/app/src/main/res/layout-w720dp-land/tv_frag_call.xml rename to jami-android/app/src/main/res/layout-w720dp-land/tv_frag_call.xml diff --git a/ring-android/app/src/main/res/layout-w720dp-land/tv_frag_share.xml b/jami-android/app/src/main/res/layout-w720dp-land/tv_frag_share.xml similarity index 100% rename from ring-android/app/src/main/res/layout-w720dp-land/tv_frag_share.xml rename to jami-android/app/src/main/res/layout-w720dp-land/tv_frag_share.xml diff --git a/ring-android/app/src/main/res/layout/activity_call_layout.xml b/jami-android/app/src/main/res/layout/activity_call_layout.xml similarity index 100% rename from ring-android/app/src/main/res/layout/activity_call_layout.xml rename to jami-android/app/src/main/res/layout/activity_call_layout.xml diff --git a/ring-android/app/src/main/res/layout/activity_contact_details.xml b/jami-android/app/src/main/res/layout/activity_contact_details.xml similarity index 100% rename from ring-android/app/src/main/res/layout/activity_contact_details.xml rename to jami-android/app/src/main/res/layout/activity_contact_details.xml diff --git a/ring-android/app/src/main/res/layout/activity_conversation.xml b/jami-android/app/src/main/res/layout/activity_conversation.xml similarity index 100% rename from ring-android/app/src/main/res/layout/activity_conversation.xml rename to jami-android/app/src/main/res/layout/activity_conversation.xml diff --git a/ring-android/app/src/main/res/layout/activity_home.xml b/jami-android/app/src/main/res/layout/activity_home.xml similarity index 100% rename from ring-android/app/src/main/res/layout/activity_home.xml rename to jami-android/app/src/main/res/layout/activity_home.xml diff --git a/ring-android/app/src/main/res/layout/activity_logs.xml b/jami-android/app/src/main/res/layout/activity_logs.xml similarity index 100% rename from ring-android/app/src/main/res/layout/activity_logs.xml rename to jami-android/app/src/main/res/layout/activity_logs.xml diff --git a/ring-android/app/src/main/res/layout/activity_media_viewer.xml b/jami-android/app/src/main/res/layout/activity_media_viewer.xml similarity index 100% rename from ring-android/app/src/main/res/layout/activity_media_viewer.xml rename to jami-android/app/src/main/res/layout/activity_media_viewer.xml diff --git a/ring-android/app/src/main/res/layout/activity_message_edit.xml b/jami-android/app/src/main/res/layout/activity_message_edit.xml similarity index 100% rename from ring-android/app/src/main/res/layout/activity_message_edit.xml rename to jami-android/app/src/main/res/layout/activity_message_edit.xml diff --git a/ring-android/app/src/main/res/layout/activity_ringtone.xml b/jami-android/app/src/main/res/layout/activity_ringtone.xml similarity index 100% rename from ring-android/app/src/main/res/layout/activity_ringtone.xml rename to jami-android/app/src/main/res/layout/activity_ringtone.xml diff --git a/ring-android/app/src/main/res/layout/activity_share.xml b/jami-android/app/src/main/res/layout/activity_share.xml similarity index 100% rename from ring-android/app/src/main/res/layout/activity_share.xml rename to jami-android/app/src/main/res/layout/activity_share.xml diff --git a/ring-android/app/src/main/res/layout/activity_wizard.xml b/jami-android/app/src/main/res/layout/activity_wizard.xml similarity index 100% rename from ring-android/app/src/main/res/layout/activity_wizard.xml rename to jami-android/app/src/main/res/layout/activity_wizard.xml diff --git a/ring-android/app/src/main/res/layout/call_notification.xml b/jami-android/app/src/main/res/layout/call_notification.xml similarity index 100% rename from ring-android/app/src/main/res/layout/call_notification.xml rename to jami-android/app/src/main/res/layout/call_notification.xml diff --git a/ring-android/app/src/main/res/layout/camerapicker.xml b/jami-android/app/src/main/res/layout/camerapicker.xml similarity index 100% rename from ring-android/app/src/main/res/layout/camerapicker.xml rename to jami-android/app/src/main/res/layout/camerapicker.xml diff --git a/ring-android/app/src/main/res/layout/content_contact_details.xml b/jami-android/app/src/main/res/layout/content_contact_details.xml similarity index 100% rename from ring-android/app/src/main/res/layout/content_contact_details.xml rename to jami-android/app/src/main/res/layout/content_contact_details.xml diff --git a/ring-android/app/src/main/res/layout/content_media_viewer.xml b/jami-android/app/src/main/res/layout/content_media_viewer.xml similarity index 100% rename from ring-android/app/src/main/res/layout/content_media_viewer.xml rename to jami-android/app/src/main/res/layout/content_media_viewer.xml diff --git a/ring-android/app/src/main/res/layout/conv_reaction_tag.xml b/jami-android/app/src/main/res/layout/conv_reaction_tag.xml similarity index 100% rename from ring-android/app/src/main/res/layout/conv_reaction_tag.xml rename to jami-android/app/src/main/res/layout/conv_reaction_tag.xml diff --git a/ring-android/app/src/main/res/layout/credentials_pref.xml b/jami-android/app/src/main/res/layout/credentials_pref.xml similarity index 100% rename from ring-android/app/src/main/res/layout/credentials_pref.xml rename to jami-android/app/src/main/res/layout/credentials_pref.xml diff --git a/ring-android/app/src/main/res/layout/detail_view_content.xml b/jami-android/app/src/main/res/layout/detail_view_content.xml similarity index 100% rename from ring-android/app/src/main/res/layout/detail_view_content.xml rename to jami-android/app/src/main/res/layout/detail_view_content.xml diff --git a/ring-android/app/src/main/res/layout/dialog_about.xml b/jami-android/app/src/main/res/layout/dialog_about.xml similarity index 100% rename from ring-android/app/src/main/res/layout/dialog_about.xml rename to jami-android/app/src/main/res/layout/dialog_about.xml diff --git a/ring-android/app/src/main/res/layout/dialog_confirm_revocation.xml b/jami-android/app/src/main/res/layout/dialog_confirm_revocation.xml similarity index 100% rename from ring-android/app/src/main/res/layout/dialog_confirm_revocation.xml rename to jami-android/app/src/main/res/layout/dialog_confirm_revocation.xml diff --git a/ring-android/app/src/main/res/layout/dialog_device_rename.xml b/jami-android/app/src/main/res/layout/dialog_device_rename.xml similarity index 100% rename from ring-android/app/src/main/res/layout/dialog_device_rename.xml rename to jami-android/app/src/main/res/layout/dialog_device_rename.xml diff --git a/ring-android/app/src/main/res/layout/dialog_profile.xml b/jami-android/app/src/main/res/layout/dialog_profile.xml similarity index 100% rename from ring-android/app/src/main/res/layout/dialog_profile.xml rename to jami-android/app/src/main/res/layout/dialog_profile.xml diff --git a/ring-android/app/src/main/res/layout/dialog_set_password.xml b/jami-android/app/src/main/res/layout/dialog_set_password.xml similarity index 100% rename from ring-android/app/src/main/res/layout/dialog_set_password.xml rename to jami-android/app/src/main/res/layout/dialog_set_password.xml diff --git a/ring-android/app/src/main/res/layout/dialog_swarm_title.xml b/jami-android/app/src/main/res/layout/dialog_swarm_title.xml similarity index 100% rename from ring-android/app/src/main/res/layout/dialog_swarm_title.xml rename to jami-android/app/src/main/res/layout/dialog_swarm_title.xml diff --git a/ring-android/app/src/main/res/layout/frag_about.xml b/jami-android/app/src/main/res/layout/frag_about.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_about.xml rename to jami-android/app/src/main/res/layout/frag_about.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml b/jami-android/app/src/main/res/layout/frag_acc_home_create.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_home_create.xml rename to jami-android/app/src/main/res/layout/frag_acc_home_create.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_import_archive.xml b/jami-android/app/src/main/res/layout/frag_acc_import_archive.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_import_archive.xml rename to jami-android/app/src/main/res/layout/frag_acc_import_archive.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_jami_connect.xml b/jami-android/app/src/main/res/layout/frag_acc_jami_connect.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_jami_connect.xml rename to jami-android/app/src/main/res/layout/frag_acc_jami_connect.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_jami_create.xml b/jami-android/app/src/main/res/layout/frag_acc_jami_create.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_jami_create.xml rename to jami-android/app/src/main/res/layout/frag_acc_jami_create.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_jami_link.xml b/jami-android/app/src/main/res/layout/frag_acc_jami_link.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_jami_link.xml rename to jami-android/app/src/main/res/layout/frag_acc_jami_link.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_jami_link_password.xml b/jami-android/app/src/main/res/layout/frag_acc_jami_link_password.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_jami_link_password.xml rename to jami-android/app/src/main/res/layout/frag_acc_jami_link_password.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_jami_password.xml b/jami-android/app/src/main/res/layout/frag_acc_jami_password.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_jami_password.xml rename to jami-android/app/src/main/res/layout/frag_acc_jami_password.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_jami_username.xml b/jami-android/app/src/main/res/layout/frag_acc_jami_username.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_jami_username.xml rename to jami-android/app/src/main/res/layout/frag_acc_jami_username.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml b/jami-android/app/src/main/res/layout/frag_acc_profile_create.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_profile_create.xml rename to jami-android/app/src/main/res/layout/frag_acc_profile_create.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml b/jami-android/app/src/main/res/layout/frag_acc_sip_create.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_sip_create.xml rename to jami-android/app/src/main/res/layout/frag_acc_sip_create.xml diff --git a/ring-android/app/src/main/res/layout/frag_acc_summary.xml b/jami-android/app/src/main/res/layout/frag_acc_summary.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_acc_summary.xml rename to jami-android/app/src/main/res/layout/frag_acc_summary.xml diff --git a/ring-android/app/src/main/res/layout/frag_account.xml b/jami-android/app/src/main/res/layout/frag_account.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_account.xml rename to jami-android/app/src/main/res/layout/frag_account.xml diff --git a/ring-android/app/src/main/res/layout/frag_account_migration.xml b/jami-android/app/src/main/res/layout/frag_account_migration.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_account_migration.xml rename to jami-android/app/src/main/res/layout/frag_account_migration.xml diff --git a/ring-android/app/src/main/res/layout/frag_account_settings.xml b/jami-android/app/src/main/res/layout/frag_account_settings.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_account_settings.xml rename to jami-android/app/src/main/res/layout/frag_account_settings.xml diff --git a/ring-android/app/src/main/res/layout/frag_audio_mgmt.xml b/jami-android/app/src/main/res/layout/frag_audio_mgmt.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_audio_mgmt.xml rename to jami-android/app/src/main/res/layout/frag_audio_mgmt.xml diff --git a/ring-android/app/src/main/res/layout/frag_blocklist.xml b/jami-android/app/src/main/res/layout/frag_blocklist.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_blocklist.xml rename to jami-android/app/src/main/res/layout/frag_blocklist.xml diff --git a/ring-android/app/src/main/res/layout/frag_call.xml b/jami-android/app/src/main/res/layout/frag_call.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_call.xml rename to jami-android/app/src/main/res/layout/frag_call.xml diff --git a/ring-android/app/src/main/res/layout/frag_call_bottom_sheet.xml b/jami-android/app/src/main/res/layout/frag_call_bottom_sheet.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_call_bottom_sheet.xml rename to jami-android/app/src/main/res/layout/frag_call_bottom_sheet.xml diff --git a/ring-android/app/src/main/res/layout/frag_color_chooser.xml b/jami-android/app/src/main/res/layout/frag_color_chooser.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_color_chooser.xml rename to jami-android/app/src/main/res/layout/frag_color_chooser.xml diff --git a/ring-android/app/src/main/res/layout/frag_contact_picker.xml b/jami-android/app/src/main/res/layout/frag_contact_picker.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_contact_picker.xml rename to jami-android/app/src/main/res/layout/frag_contact_picker.xml diff --git a/ring-android/app/src/main/res/layout/frag_conversation.xml b/jami-android/app/src/main/res/layout/frag_conversation.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_conversation.xml rename to jami-android/app/src/main/res/layout/frag_conversation.xml diff --git a/ring-android/app/src/main/res/layout/frag_conversation_actions.xml b/jami-android/app/src/main/res/layout/frag_conversation_actions.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_conversation_actions.xml rename to jami-android/app/src/main/res/layout/frag_conversation_actions.xml diff --git a/ring-android/app/src/main/res/layout/frag_conversation_gallery.xml b/jami-android/app/src/main/res/layout/frag_conversation_gallery.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_conversation_gallery.xml rename to jami-android/app/src/main/res/layout/frag_conversation_gallery.xml diff --git a/ring-android/app/src/main/res/layout/frag_conversation_members.xml b/jami-android/app/src/main/res/layout/frag_conversation_members.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_conversation_members.xml rename to jami-android/app/src/main/res/layout/frag_conversation_members.xml diff --git a/ring-android/app/src/main/res/layout/frag_conversation_tv.xml b/jami-android/app/src/main/res/layout/frag_conversation_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_conversation_tv.xml rename to jami-android/app/src/main/res/layout/frag_conversation_tv.xml diff --git a/ring-android/app/src/main/res/layout/frag_home.xml b/jami-android/app/src/main/res/layout/frag_home.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_home.xml rename to jami-android/app/src/main/res/layout/frag_home.xml diff --git a/ring-android/app/src/main/res/layout/frag_link_device.xml b/jami-android/app/src/main/res/layout/frag_link_device.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_link_device.xml rename to jami-android/app/src/main/res/layout/frag_link_device.xml diff --git a/ring-android/app/src/main/res/layout/frag_linked_devices.xml b/jami-android/app/src/main/res/layout/frag_linked_devices.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_linked_devices.xml rename to jami-android/app/src/main/res/layout/frag_linked_devices.xml diff --git a/ring-android/app/src/main/res/layout/frag_location_sharing.xml b/jami-android/app/src/main/res/layout/frag_location_sharing.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_location_sharing.xml rename to jami-android/app/src/main/res/layout/frag_location_sharing.xml diff --git a/ring-android/app/src/main/res/layout/frag_members_bottomsheet.xml b/jami-android/app/src/main/res/layout/frag_members_bottomsheet.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_members_bottomsheet.xml rename to jami-android/app/src/main/res/layout/frag_members_bottomsheet.xml diff --git a/ring-android/app/src/main/res/layout/frag_path_list_item.xml b/jami-android/app/src/main/res/layout/frag_path_list_item.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_path_list_item.xml rename to jami-android/app/src/main/res/layout/frag_path_list_item.xml diff --git a/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml b/jami-android/app/src/main/res/layout/frag_pending_contact_requests.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml rename to jami-android/app/src/main/res/layout/frag_pending_contact_requests.xml diff --git a/ring-android/app/src/main/res/layout/frag_plugin_handlers_list.xml b/jami-android/app/src/main/res/layout/frag_plugin_handlers_list.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_plugin_handlers_list.xml rename to jami-android/app/src/main/res/layout/frag_plugin_handlers_list.xml diff --git a/ring-android/app/src/main/res/layout/frag_plugin_settings.xml b/jami-android/app/src/main/res/layout/frag_plugin_settings.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_plugin_settings.xml rename to jami-android/app/src/main/res/layout/frag_plugin_settings.xml diff --git a/ring-android/app/src/main/res/layout/frag_plugins_list_item.xml b/jami-android/app/src/main/res/layout/frag_plugins_list_item.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_plugins_list_item.xml rename to jami-android/app/src/main/res/layout/frag_plugins_list_item.xml diff --git a/ring-android/app/src/main/res/layout/frag_plugins_list_settings.xml b/jami-android/app/src/main/res/layout/frag_plugins_list_settings.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_plugins_list_settings.xml rename to jami-android/app/src/main/res/layout/frag_plugins_list_settings.xml diff --git a/ring-android/app/src/main/res/layout/frag_plugins_path_preference.xml b/jami-android/app/src/main/res/layout/frag_plugins_path_preference.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_plugins_path_preference.xml rename to jami-android/app/src/main/res/layout/frag_plugins_path_preference.xml diff --git a/ring-android/app/src/main/res/layout/frag_qrcode.xml b/jami-android/app/src/main/res/layout/frag_qrcode.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_qrcode.xml rename to jami-android/app/src/main/res/layout/frag_qrcode.xml diff --git a/ring-android/app/src/main/res/layout/frag_register_name.xml b/jami-android/app/src/main/res/layout/frag_register_name.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_register_name.xml rename to jami-android/app/src/main/res/layout/frag_register_name.xml diff --git a/ring-android/app/src/main/res/layout/frag_scan.xml b/jami-android/app/src/main/res/layout/frag_scan.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_scan.xml rename to jami-android/app/src/main/res/layout/frag_scan.xml diff --git a/ring-android/app/src/main/res/layout/frag_selectconv.xml b/jami-android/app/src/main/res/layout/frag_selectconv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_selectconv.xml rename to jami-android/app/src/main/res/layout/frag_selectconv.xml diff --git a/ring-android/app/src/main/res/layout/frag_settings.xml b/jami-android/app/src/main/res/layout/frag_settings.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_settings.xml rename to jami-android/app/src/main/res/layout/frag_settings.xml diff --git a/ring-android/app/src/main/res/layout/frag_share.xml b/jami-android/app/src/main/res/layout/frag_share.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_share.xml rename to jami-android/app/src/main/res/layout/frag_share.xml diff --git a/ring-android/app/src/main/res/layout/frag_sharewith.xml b/jami-android/app/src/main/res/layout/frag_sharewith.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_sharewith.xml rename to jami-android/app/src/main/res/layout/frag_sharewith.xml diff --git a/ring-android/app/src/main/res/layout/frag_smartlist.xml b/jami-android/app/src/main/res/layout/frag_smartlist.xml similarity index 100% rename from ring-android/app/src/main/res/layout/frag_smartlist.xml rename to jami-android/app/src/main/res/layout/frag_smartlist.xml diff --git a/ring-android/app/src/main/res/layout/fragment_media_viewer.xml b/jami-android/app/src/main/res/layout/fragment_media_viewer.xml similarity index 100% rename from ring-android/app/src/main/res/layout/fragment_media_viewer.xml rename to jami-android/app/src/main/res/layout/fragment_media_viewer.xml diff --git a/ring-android/app/src/main/res/layout/item_account.xml b/jami-android/app/src/main/res/layout/item_account.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_account.xml rename to jami-android/app/src/main/res/layout/item_account.xml diff --git a/ring-android/app/src/main/res/layout/item_codec.xml b/jami-android/app/src/main/res/layout/item_codec.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_codec.xml rename to jami-android/app/src/main/res/layout/item_codec.xml diff --git a/ring-android/app/src/main/res/layout/item_color.xml b/jami-android/app/src/main/res/layout/item_color.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_color.xml rename to jami-android/app/src/main/res/layout/item_color.xml diff --git a/ring-android/app/src/main/res/layout/item_conference_add.xml b/jami-android/app/src/main/res/layout/item_conference_add.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conference_add.xml rename to jami-android/app/src/main/res/layout/item_conference_add.xml diff --git a/ring-android/app/src/main/res/layout/item_conference_participant.xml b/jami-android/app/src/main/res/layout/item_conference_participant.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conference_participant.xml rename to jami-android/app/src/main/res/layout/item_conference_participant.xml diff --git a/ring-android/app/src/main/res/layout/item_contact.xml b/jami-android/app/src/main/res/layout/item_contact.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_contact.xml rename to jami-android/app/src/main/res/layout/item_contact.xml diff --git a/ring-android/app/src/main/res/layout/item_contact_action.xml b/jami-android/app/src/main/res/layout/item_contact_action.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_contact_action.xml rename to jami-android/app/src/main/res/layout/item_contact_action.xml diff --git a/ring-android/app/src/main/res/layout/item_contact_blacklist.xml b/jami-android/app/src/main/res/layout/item_contact_blacklist.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_contact_blacklist.xml rename to jami-android/app/src/main/res/layout/item_contact_blacklist.xml diff --git a/ring-android/app/src/main/res/layout/item_contact_horizontal.xml b/jami-android/app/src/main/res/layout/item_contact_horizontal.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_contact_horizontal.xml rename to jami-android/app/src/main/res/layout/item_contact_horizontal.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_audio_me.xml b/jami-android/app/src/main/res/layout/item_conv_audio_me.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_audio_me.xml rename to jami-android/app/src/main/res/layout/item_conv_audio_me.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_audio_me_tv.xml b/jami-android/app/src/main/res/layout/item_conv_audio_me_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_audio_me_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_audio_me_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_audio_peer.xml b/jami-android/app/src/main/res/layout/item_conv_audio_peer.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_audio_peer.xml rename to jami-android/app/src/main/res/layout/item_conv_audio_peer.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_audio_peer_tv.xml b/jami-android/app/src/main/res/layout/item_conv_audio_peer_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_audio_peer_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_audio_peer_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_call.xml b/jami-android/app/src/main/res/layout/item_conv_call.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_call.xml rename to jami-android/app/src/main/res/layout/item_conv_call.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_call_tv.xml b/jami-android/app/src/main/res/layout/item_conv_call_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_call_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_call_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_composing.xml b/jami-android/app/src/main/res/layout/item_conv_composing.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_composing.xml rename to jami-android/app/src/main/res/layout/item_conv_composing.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_contact.xml b/jami-android/app/src/main/res/layout/item_conv_contact.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_contact.xml rename to jami-android/app/src/main/res/layout/item_conv_contact.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_contact_tv.xml b/jami-android/app/src/main/res/layout/item_conv_contact_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_contact_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_contact_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_file_me.xml b/jami-android/app/src/main/res/layout/item_conv_file_me.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_file_me.xml rename to jami-android/app/src/main/res/layout/item_conv_file_me.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_file_me_tv.xml b/jami-android/app/src/main/res/layout/item_conv_file_me_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_file_me_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_file_me_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_file_peer.xml b/jami-android/app/src/main/res/layout/item_conv_file_peer.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_file_peer.xml rename to jami-android/app/src/main/res/layout/item_conv_file_peer.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_file_peer_tv.xml b/jami-android/app/src/main/res/layout/item_conv_file_peer_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_file_peer_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_file_peer_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_image_me.xml b/jami-android/app/src/main/res/layout/item_conv_image_me.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_image_me.xml rename to jami-android/app/src/main/res/layout/item_conv_image_me.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_image_me_tv.xml b/jami-android/app/src/main/res/layout/item_conv_image_me_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_image_me_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_image_me_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_image_peer.xml b/jami-android/app/src/main/res/layout/item_conv_image_peer.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_image_peer.xml rename to jami-android/app/src/main/res/layout/item_conv_image_peer.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_image_peer_tv.xml b/jami-android/app/src/main/res/layout/item_conv_image_peer_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_image_peer_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_image_peer_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_msg_me.xml b/jami-android/app/src/main/res/layout/item_conv_msg_me.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_msg_me.xml rename to jami-android/app/src/main/res/layout/item_conv_msg_me.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_msg_me_tv.xml b/jami-android/app/src/main/res/layout/item_conv_msg_me_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_msg_me_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_msg_me_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml b/jami-android/app/src/main/res/layout/item_conv_msg_peer.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_msg_peer.xml rename to jami-android/app/src/main/res/layout/item_conv_msg_peer.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_msg_peer_tv.xml b/jami-android/app/src/main/res/layout/item_conv_msg_peer_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_msg_peer_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_msg_peer_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_video_me.xml b/jami-android/app/src/main/res/layout/item_conv_video_me.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_video_me.xml rename to jami-android/app/src/main/res/layout/item_conv_video_me.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_video_me_tv.xml b/jami-android/app/src/main/res/layout/item_conv_video_me_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_video_me_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_video_me_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_video_peer.xml b/jami-android/app/src/main/res/layout/item_conv_video_peer.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_video_peer.xml rename to jami-android/app/src/main/res/layout/item_conv_video_peer.xml diff --git a/ring-android/app/src/main/res/layout/item_conv_video_peer_tv.xml b/jami-android/app/src/main/res/layout/item_conv_video_peer_tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_conv_video_peer_tv.xml rename to jami-android/app/src/main/res/layout/item_conv_video_peer_tv.xml diff --git a/ring-android/app/src/main/res/layout/item_device.xml b/jami-android/app/src/main/res/layout/item_device.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_device.xml rename to jami-android/app/src/main/res/layout/item_device.xml diff --git a/ring-android/app/src/main/res/layout/item_emoji.xml b/jami-android/app/src/main/res/layout/item_emoji.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_emoji.xml rename to jami-android/app/src/main/res/layout/item_emoji.xml diff --git a/ring-android/app/src/main/res/layout/item_media_file.xml b/jami-android/app/src/main/res/layout/item_media_file.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_media_file.xml rename to jami-android/app/src/main/res/layout/item_media_file.xml diff --git a/ring-android/app/src/main/res/layout/item_media_image.xml b/jami-android/app/src/main/res/layout/item_media_image.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_media_image.xml rename to jami-android/app/src/main/res/layout/item_media_image.xml diff --git a/ring-android/app/src/main/res/layout/item_media_video.xml b/jami-android/app/src/main/res/layout/item_media_video.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_media_video.xml rename to jami-android/app/src/main/res/layout/item_media_video.xml diff --git a/ring-android/app/src/main/res/layout/item_members_bottomsheet.xml b/jami-android/app/src/main/res/layout/item_members_bottomsheet.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_members_bottomsheet.xml rename to jami-android/app/src/main/res/layout/item_members_bottomsheet.xml diff --git a/ring-android/app/src/main/res/layout/item_number.xml b/jami-android/app/src/main/res/layout/item_number.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_number.xml rename to jami-android/app/src/main/res/layout/item_number.xml diff --git a/ring-android/app/src/main/res/layout/item_number_selected.xml b/jami-android/app/src/main/res/layout/item_number_selected.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_number_selected.xml rename to jami-android/app/src/main/res/layout/item_number_selected.xml diff --git a/ring-android/app/src/main/res/layout/item_participant_hand_container.xml b/jami-android/app/src/main/res/layout/item_participant_hand_container.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_participant_hand_container.xml rename to jami-android/app/src/main/res/layout/item_participant_hand_container.xml diff --git a/ring-android/app/src/main/res/layout/item_participant_label.xml b/jami-android/app/src/main/res/layout/item_participant_label.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_participant_label.xml rename to jami-android/app/src/main/res/layout/item_participant_label.xml diff --git a/ring-android/app/src/main/res/layout/item_picker.xml b/jami-android/app/src/main/res/layout/item_picker.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_picker.xml rename to jami-android/app/src/main/res/layout/item_picker.xml diff --git a/ring-android/app/src/main/res/layout/item_ringtone.xml b/jami-android/app/src/main/res/layout/item_ringtone.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_ringtone.xml rename to jami-android/app/src/main/res/layout/item_ringtone.xml diff --git a/ring-android/app/src/main/res/layout/item_setting.xml b/jami-android/app/src/main/res/layout/item_setting.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_setting.xml rename to jami-android/app/src/main/res/layout/item_setting.xml diff --git a/ring-android/app/src/main/res/layout/item_smartlist.xml b/jami-android/app/src/main/res/layout/item_smartlist.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_smartlist.xml rename to jami-android/app/src/main/res/layout/item_smartlist.xml diff --git a/ring-android/app/src/main/res/layout/item_smartlist_header.xml b/jami-android/app/src/main/res/layout/item_smartlist_header.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_smartlist_header.xml rename to jami-android/app/src/main/res/layout/item_smartlist_header.xml diff --git a/ring-android/app/src/main/res/layout/item_toolbar_selected.xml b/jami-android/app/src/main/res/layout/item_toolbar_selected.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_toolbar_selected.xml rename to jami-android/app/src/main/res/layout/item_toolbar_selected.xml diff --git a/ring-android/app/src/main/res/layout/item_toolbar_spinner.xml b/jami-android/app/src/main/res/layout/item_toolbar_spinner.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_toolbar_spinner.xml rename to jami-android/app/src/main/res/layout/item_toolbar_spinner.xml diff --git a/ring-android/app/src/main/res/layout/item_two_button_edittext.xml b/jami-android/app/src/main/res/layout/item_two_button_edittext.xml similarity index 100% rename from ring-android/app/src/main/res/layout/item_two_button_edittext.xml rename to jami-android/app/src/main/res/layout/item_two_button_edittext.xml diff --git a/ring-android/app/src/main/res/layout/menu_conversation.xml b/jami-android/app/src/main/res/layout/menu_conversation.xml similarity index 100% rename from ring-android/app/src/main/res/layout/menu_conversation.xml rename to jami-android/app/src/main/res/layout/menu_conversation.xml diff --git a/ring-android/app/src/main/res/layout/msg_link_preview.xml b/jami-android/app/src/main/res/layout/msg_link_preview.xml similarity index 100% rename from ring-android/app/src/main/res/layout/msg_link_preview.xml rename to jami-android/app/src/main/res/layout/msg_link_preview.xml diff --git a/ring-android/app/src/main/res/layout/preference_widget_material_checkbox.xml b/jami-android/app/src/main/res/layout/preference_widget_material_checkbox.xml similarity index 100% rename from ring-android/app/src/main/res/layout/preference_widget_material_checkbox.xml rename to jami-android/app/src/main/res/layout/preference_widget_material_checkbox.xml diff --git a/ring-android/app/src/main/res/layout/preference_widget_material_slider.xml b/jami-android/app/src/main/res/layout/preference_widget_material_slider.xml similarity index 100% rename from ring-android/app/src/main/res/layout/preference_widget_material_slider.xml rename to jami-android/app/src/main/res/layout/preference_widget_material_slider.xml diff --git a/ring-android/app/src/main/res/layout/preference_widget_material_switch.xml b/jami-android/app/src/main/res/layout/preference_widget_material_switch.xml similarity index 100% rename from ring-android/app/src/main/res/layout/preference_widget_material_switch.xml rename to jami-android/app/src/main/res/layout/preference_widget_material_switch.xml diff --git a/ring-android/app/src/main/res/layout/titleview.xml b/jami-android/app/src/main/res/layout/titleview.xml similarity index 100% rename from ring-android/app/src/main/res/layout/titleview.xml rename to jami-android/app/src/main/res/layout/titleview.xml diff --git a/ring-android/app/src/main/res/layout/tv.xml b/jami-android/app/src/main/res/layout/tv.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv.xml rename to jami-android/app/src/main/res/layout/tv.xml diff --git a/ring-android/app/src/main/res/layout/tv_about_layout.xml b/jami-android/app/src/main/res/layout/tv_about_layout.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_about_layout.xml rename to jami-android/app/src/main/res/layout/tv_about_layout.xml diff --git a/ring-android/app/src/main/res/layout/tv_activity_call.xml b/jami-android/app/src/main/res/layout/tv_activity_call.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_activity_call.xml rename to jami-android/app/src/main/res/layout/tv_activity_call.xml diff --git a/ring-android/app/src/main/res/layout/tv_activity_contact_more.xml b/jami-android/app/src/main/res/layout/tv_activity_contact_more.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_activity_contact_more.xml rename to jami-android/app/src/main/res/layout/tv_activity_contact_more.xml diff --git a/ring-android/app/src/main/res/layout/tv_activity_home.xml b/jami-android/app/src/main/res/layout/tv_activity_home.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_activity_home.xml rename to jami-android/app/src/main/res/layout/tv_activity_home.xml diff --git a/ring-android/app/src/main/res/layout/tv_activity_search.xml b/jami-android/app/src/main/res/layout/tv_activity_search.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_activity_search.xml rename to jami-android/app/src/main/res/layout/tv_activity_search.xml diff --git a/ring-android/app/src/main/res/layout/tv_activity_send_text.xml b/jami-android/app/src/main/res/layout/tv_activity_send_text.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_activity_send_text.xml rename to jami-android/app/src/main/res/layout/tv_activity_send_text.xml diff --git a/ring-android/app/src/main/res/layout/tv_activity_settings.xml b/jami-android/app/src/main/res/layout/tv_activity_settings.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_activity_settings.xml rename to jami-android/app/src/main/res/layout/tv_activity_settings.xml diff --git a/ring-android/app/src/main/res/layout/tv_activity_share.xml b/jami-android/app/src/main/res/layout/tv_activity_share.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_activity_share.xml rename to jami-android/app/src/main/res/layout/tv_activity_share.xml diff --git a/ring-android/app/src/main/res/layout/tv_frag_call.xml b/jami-android/app/src/main/res/layout/tv_frag_call.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_frag_call.xml rename to jami-android/app/src/main/res/layout/tv_frag_call.xml diff --git a/ring-android/app/src/main/res/layout/tv_frag_contact.xml b/jami-android/app/src/main/res/layout/tv_frag_contact.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_frag_contact.xml rename to jami-android/app/src/main/res/layout/tv_frag_contact.xml diff --git a/ring-android/app/src/main/res/layout/tv_frag_contact_request.xml b/jami-android/app/src/main/res/layout/tv_frag_contact_request.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_frag_contact_request.xml rename to jami-android/app/src/main/res/layout/tv_frag_contact_request.xml diff --git a/ring-android/app/src/main/res/layout/tv_frag_share.xml b/jami-android/app/src/main/res/layout/tv_frag_share.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_frag_share.xml rename to jami-android/app/src/main/res/layout/tv_frag_share.xml diff --git a/ring-android/app/src/main/res/layout/tv_header_blank.xml b/jami-android/app/src/main/res/layout/tv_header_blank.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_header_blank.xml rename to jami-android/app/src/main/res/layout/tv_header_blank.xml diff --git a/ring-android/app/src/main/res/layout/tv_titleview.xml b/jami-android/app/src/main/res/layout/tv_titleview.xml similarity index 100% rename from ring-android/app/src/main/res/layout/tv_titleview.xml rename to jami-android/app/src/main/res/layout/tv_titleview.xml diff --git a/ring-android/app/src/main/res/menu/ac_call.xml b/jami-android/app/src/main/res/menu/ac_call.xml similarity index 100% rename from ring-android/app/src/main/res/menu/ac_call.xml rename to jami-android/app/src/main/res/menu/ac_call.xml diff --git a/ring-android/app/src/main/res/menu/account_edition.xml b/jami-android/app/src/main/res/menu/account_edition.xml similarity index 100% rename from ring-android/app/src/main/res/menu/account_edition.xml rename to jami-android/app/src/main/res/menu/account_edition.xml diff --git a/ring-android/app/src/main/res/menu/conference_participant_actions.xml b/jami-android/app/src/main/res/menu/conference_participant_actions.xml similarity index 100% rename from ring-android/app/src/main/res/menu/conference_participant_actions.xml rename to jami-android/app/src/main/res/menu/conference_participant_actions.xml diff --git a/ring-android/app/src/main/res/menu/conversation_actions.xml b/jami-android/app/src/main/res/menu/conversation_actions.xml similarity index 100% rename from ring-android/app/src/main/res/menu/conversation_actions.xml rename to jami-android/app/src/main/res/menu/conversation_actions.xml diff --git a/ring-android/app/src/main/res/menu/conversation_item_actions_file.xml b/jami-android/app/src/main/res/menu/conversation_item_actions_file.xml similarity index 100% rename from ring-android/app/src/main/res/menu/conversation_item_actions_file.xml rename to jami-android/app/src/main/res/menu/conversation_item_actions_file.xml diff --git a/ring-android/app/src/main/res/menu/conversation_item_actions_file_tv.xml b/jami-android/app/src/main/res/menu/conversation_item_actions_file_tv.xml similarity index 100% rename from ring-android/app/src/main/res/menu/conversation_item_actions_file_tv.xml rename to jami-android/app/src/main/res/menu/conversation_item_actions_file_tv.xml diff --git a/ring-android/app/src/main/res/menu/conversation_item_actions_messages.xml b/jami-android/app/src/main/res/menu/conversation_item_actions_messages.xml similarity index 100% rename from ring-android/app/src/main/res/menu/conversation_item_actions_messages.xml rename to jami-android/app/src/main/res/menu/conversation_item_actions_messages.xml diff --git a/ring-android/app/src/main/res/menu/conversation_item_actions_messages_tv.xml b/jami-android/app/src/main/res/menu/conversation_item_actions_messages_tv.xml similarity index 100% rename from ring-android/app/src/main/res/menu/conversation_item_actions_messages_tv.xml rename to jami-android/app/src/main/res/menu/conversation_item_actions_messages_tv.xml diff --git a/ring-android/app/src/main/res/menu/conversation_share_actions.xml b/jami-android/app/src/main/res/menu/conversation_share_actions.xml similarity index 100% rename from ring-android/app/src/main/res/menu/conversation_share_actions.xml rename to jami-android/app/src/main/res/menu/conversation_share_actions.xml diff --git a/ring-android/app/src/main/res/menu/logs_menu.xml b/jami-android/app/src/main/res/menu/logs_menu.xml similarity index 100% rename from ring-android/app/src/main/res/menu/logs_menu.xml rename to jami-android/app/src/main/res/menu/logs_menu.xml diff --git a/ring-android/app/src/main/res/menu/media_actions.xml b/jami-android/app/src/main/res/menu/media_actions.xml similarity index 100% rename from ring-android/app/src/main/res/menu/media_actions.xml rename to jami-android/app/src/main/res/menu/media_actions.xml diff --git a/ring-android/app/src/main/res/menu/menu_contact_details.xml b/jami-android/app/src/main/res/menu/menu_contact_details.xml similarity index 100% rename from ring-android/app/src/main/res/menu/menu_contact_details.xml rename to jami-android/app/src/main/res/menu/menu_contact_details.xml diff --git a/ring-android/app/src/main/res/menu/navigation_bar.xml b/jami-android/app/src/main/res/menu/navigation_bar.xml similarity index 100% rename from ring-android/app/src/main/res/menu/navigation_bar.xml rename to jami-android/app/src/main/res/menu/navigation_bar.xml diff --git a/ring-android/app/src/main/res/menu/navigation_bottom_menu.xml b/jami-android/app/src/main/res/menu/navigation_bottom_menu.xml similarity index 100% rename from ring-android/app/src/main/res/menu/navigation_bottom_menu.xml rename to jami-android/app/src/main/res/menu/navigation_bottom_menu.xml diff --git a/ring-android/app/src/main/res/menu/plugin_edition.xml b/jami-android/app/src/main/res/menu/plugin_edition.xml similarity index 100% rename from ring-android/app/src/main/res/menu/plugin_edition.xml rename to jami-android/app/src/main/res/menu/plugin_edition.xml diff --git a/ring-android/app/src/main/res/menu/qr_menu.xml b/jami-android/app/src/main/res/menu/qr_menu.xml similarity index 100% rename from ring-android/app/src/main/res/menu/qr_menu.xml rename to jami-android/app/src/main/res/menu/qr_menu.xml diff --git a/ring-android/app/src/main/res/menu/smartlist_menu.xml b/jami-android/app/src/main/res/menu/smartlist_menu.xml similarity index 100% rename from ring-android/app/src/main/res/menu/smartlist_menu.xml rename to jami-android/app/src/main/res/menu/smartlist_menu.xml diff --git a/ring-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/jami-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from ring-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to jami-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/ring-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/jami-android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from ring-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to jami-android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/ring-android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/jami-android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from ring-android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to jami-android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/ring-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/jami-android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from ring-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to jami-android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/ring-android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/jami-android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from ring-android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to jami-android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/ring-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/jami-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from ring-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to jami-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/ring-android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/jami-android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from ring-android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to jami-android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/ring-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/jami-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from ring-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to jami-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/ring-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/jami-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from ring-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to jami-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/ring-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/jami-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from ring-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to jami-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/ring-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/jami-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from ring-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to jami-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/ring-android/app/src/main/res/raw/baseline_graphic_eq_black_24dp.gif b/jami-android/app/src/main/res/raw/baseline_graphic_eq_black_24dp.gif similarity index 100% rename from ring-android/app/src/main/res/raw/baseline_graphic_eq_black_24dp.gif rename to jami-android/app/src/main/res/raw/baseline_graphic_eq_black_24dp.gif diff --git a/ring-android/app/src/main/res/values-ar-rEG/strings.xml b/jami-android/app/src/main/res/values-ar-rEG/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ar-rEG/strings.xml rename to jami-android/app/src/main/res/values-ar-rEG/strings.xml diff --git a/ring-android/app/src/main/res/values-ar-rEG/strings_account.xml b/jami-android/app/src/main/res/values-ar-rEG/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ar-rEG/strings_account.xml rename to jami-android/app/src/main/res/values-ar-rEG/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ar-rEG/strings_call.xml b/jami-android/app/src/main/res/values-ar-rEG/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ar-rEG/strings_call.xml rename to jami-android/app/src/main/res/values-ar-rEG/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ar-rEG/strings_content_description.xml b/jami-android/app/src/main/res/values-ar-rEG/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-ar-rEG/strings_content_description.xml rename to jami-android/app/src/main/res/values-ar-rEG/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-ar-rEG/strings_preferences.xml b/jami-android/app/src/main/res/values-ar-rEG/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ar-rEG/strings_preferences.xml rename to jami-android/app/src/main/res/values-ar-rEG/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/jami-android/app/src/main/res/values-ar/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ar/strings.xml rename to jami-android/app/src/main/res/values-ar/strings.xml diff --git a/ring-android/app/src/main/res/values-ar/strings_account.xml b/jami-android/app/src/main/res/values-ar/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ar/strings_account.xml rename to jami-android/app/src/main/res/values-ar/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ar/strings_call.xml b/jami-android/app/src/main/res/values-ar/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ar/strings_call.xml rename to jami-android/app/src/main/res/values-ar/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ar/strings_content_description.xml b/jami-android/app/src/main/res/values-ar/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-ar/strings_content_description.xml rename to jami-android/app/src/main/res/values-ar/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-ar/strings_preferences.xml b/jami-android/app/src/main/res/values-ar/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ar/strings_preferences.xml rename to jami-android/app/src/main/res/values-ar/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-az/strings.xml b/jami-android/app/src/main/res/values-az/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-az/strings.xml rename to jami-android/app/src/main/res/values-az/strings.xml diff --git a/ring-android/app/src/main/res/values-az/strings_call.xml b/jami-android/app/src/main/res/values-az/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-az/strings_call.xml rename to jami-android/app/src/main/res/values-az/strings_call.xml diff --git a/ring-android/app/src/main/res/values-az/strings_content_description.xml b/jami-android/app/src/main/res/values-az/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-az/strings_content_description.xml rename to jami-android/app/src/main/res/values-az/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-az/strings_preferences.xml b/jami-android/app/src/main/res/values-az/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-az/strings_preferences.xml rename to jami-android/app/src/main/res/values-az/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-b+es+419/strings.xml b/jami-android/app/src/main/res/values-b+es+419/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-b+es+419/strings.xml rename to jami-android/app/src/main/res/values-b+es+419/strings.xml diff --git a/ring-android/app/src/main/res/values-b+sr+Cyrl/strings.xml b/jami-android/app/src/main/res/values-b+sr+Cyrl/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-b+sr+Cyrl/strings.xml rename to jami-android/app/src/main/res/values-b+sr+Cyrl/strings.xml diff --git a/ring-android/app/src/main/res/values-b+sr+Cyrl/strings_account.xml b/jami-android/app/src/main/res/values-b+sr+Cyrl/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-b+sr+Cyrl/strings_account.xml rename to jami-android/app/src/main/res/values-b+sr+Cyrl/strings_account.xml diff --git a/ring-android/app/src/main/res/values-b+sr+Cyrl/strings_call.xml b/jami-android/app/src/main/res/values-b+sr+Cyrl/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-b+sr+Cyrl/strings_call.xml rename to jami-android/app/src/main/res/values-b+sr+Cyrl/strings_call.xml diff --git a/ring-android/app/src/main/res/values-b+sr+Cyrl/strings_preferences.xml b/jami-android/app/src/main/res/values-b+sr+Cyrl/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-b+sr+Cyrl/strings_preferences.xml rename to jami-android/app/src/main/res/values-b+sr+Cyrl/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-be-rBY/strings.xml b/jami-android/app/src/main/res/values-be-rBY/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-be-rBY/strings.xml rename to jami-android/app/src/main/res/values-be-rBY/strings.xml diff --git a/ring-android/app/src/main/res/values-be-rBY/strings_call.xml b/jami-android/app/src/main/res/values-be-rBY/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-be-rBY/strings_call.xml rename to jami-android/app/src/main/res/values-be-rBY/strings_call.xml diff --git a/ring-android/app/src/main/res/values-be-rBY/strings_preferences.xml b/jami-android/app/src/main/res/values-be-rBY/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-be-rBY/strings_preferences.xml rename to jami-android/app/src/main/res/values-be-rBY/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-be/strings.xml b/jami-android/app/src/main/res/values-be/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-be/strings.xml rename to jami-android/app/src/main/res/values-be/strings.xml diff --git a/ring-android/app/src/main/res/values-be/strings_call.xml b/jami-android/app/src/main/res/values-be/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-be/strings_call.xml rename to jami-android/app/src/main/res/values-be/strings_call.xml diff --git a/ring-android/app/src/main/res/values-be/strings_preferences.xml b/jami-android/app/src/main/res/values-be/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-be/strings_preferences.xml rename to jami-android/app/src/main/res/values-be/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-bg-rBG/strings.xml b/jami-android/app/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-bg-rBG/strings.xml rename to jami-android/app/src/main/res/values-bg-rBG/strings.xml diff --git a/ring-android/app/src/main/res/values-bg-rBG/strings_account.xml b/jami-android/app/src/main/res/values-bg-rBG/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-bg-rBG/strings_account.xml rename to jami-android/app/src/main/res/values-bg-rBG/strings_account.xml diff --git a/ring-android/app/src/main/res/values-bg-rBG/strings_call.xml b/jami-android/app/src/main/res/values-bg-rBG/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-bg-rBG/strings_call.xml rename to jami-android/app/src/main/res/values-bg-rBG/strings_call.xml diff --git a/ring-android/app/src/main/res/values-bg-rBG/strings_content_description.xml b/jami-android/app/src/main/res/values-bg-rBG/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-bg-rBG/strings_content_description.xml rename to jami-android/app/src/main/res/values-bg-rBG/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-bg-rBG/strings_preferences.xml b/jami-android/app/src/main/res/values-bg-rBG/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-bg-rBG/strings_preferences.xml rename to jami-android/app/src/main/res/values-bg-rBG/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/jami-android/app/src/main/res/values-bg/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-bg/strings.xml rename to jami-android/app/src/main/res/values-bg/strings.xml diff --git a/ring-android/app/src/main/res/values-bg/strings_account.xml b/jami-android/app/src/main/res/values-bg/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-bg/strings_account.xml rename to jami-android/app/src/main/res/values-bg/strings_account.xml diff --git a/ring-android/app/src/main/res/values-bg/strings_call.xml b/jami-android/app/src/main/res/values-bg/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-bg/strings_call.xml rename to jami-android/app/src/main/res/values-bg/strings_call.xml diff --git a/ring-android/app/src/main/res/values-bg/strings_content_description.xml b/jami-android/app/src/main/res/values-bg/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-bg/strings_content_description.xml rename to jami-android/app/src/main/res/values-bg/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-bg/strings_preferences.xml b/jami-android/app/src/main/res/values-bg/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-bg/strings_preferences.xml rename to jami-android/app/src/main/res/values-bg/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-bn/strings.xml b/jami-android/app/src/main/res/values-bn/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-bn/strings.xml rename to jami-android/app/src/main/res/values-bn/strings.xml diff --git a/ring-android/app/src/main/res/values-bn/strings_call.xml b/jami-android/app/src/main/res/values-bn/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-bn/strings_call.xml rename to jami-android/app/src/main/res/values-bn/strings_call.xml diff --git a/ring-android/app/src/main/res/values-bn/strings_preferences.xml b/jami-android/app/src/main/res/values-bn/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-bn/strings_preferences.xml rename to jami-android/app/src/main/res/values-bn/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-brx/strings_preferences.xml b/jami-android/app/src/main/res/values-brx/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-brx/strings_preferences.xml rename to jami-android/app/src/main/res/values-brx/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/jami-android/app/src/main/res/values-ca/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ca/strings.xml rename to jami-android/app/src/main/res/values-ca/strings.xml diff --git a/ring-android/app/src/main/res/values-ca/strings_account.xml b/jami-android/app/src/main/res/values-ca/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ca/strings_account.xml rename to jami-android/app/src/main/res/values-ca/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ca/strings_call.xml b/jami-android/app/src/main/res/values-ca/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ca/strings_call.xml rename to jami-android/app/src/main/res/values-ca/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ca/strings_content_description.xml b/jami-android/app/src/main/res/values-ca/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-ca/strings_content_description.xml rename to jami-android/app/src/main/res/values-ca/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-ca/strings_preferences.xml b/jami-android/app/src/main/res/values-ca/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ca/strings_preferences.xml rename to jami-android/app/src/main/res/values-ca/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/jami-android/app/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-cs-rCZ/strings.xml rename to jami-android/app/src/main/res/values-cs-rCZ/strings.xml diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml b/jami-android/app/src/main/res/values-cs-rCZ/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml rename to jami-android/app/src/main/res/values-cs-rCZ/strings_account.xml diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml b/jami-android/app/src/main/res/values-cs-rCZ/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml rename to jami-android/app/src/main/res/values-cs-rCZ/strings_call.xml diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml b/jami-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml rename to jami-android/app/src/main/res/values-cs-rCZ/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml b/jami-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml rename to jami-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-da/strings.xml b/jami-android/app/src/main/res/values-da/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-da/strings.xml rename to jami-android/app/src/main/res/values-da/strings.xml diff --git a/ring-android/app/src/main/res/values-da/strings_account.xml b/jami-android/app/src/main/res/values-da/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-da/strings_account.xml rename to jami-android/app/src/main/res/values-da/strings_account.xml diff --git a/ring-android/app/src/main/res/values-da/strings_call.xml b/jami-android/app/src/main/res/values-da/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-da/strings_call.xml rename to jami-android/app/src/main/res/values-da/strings_call.xml diff --git a/ring-android/app/src/main/res/values-da/strings_content_description.xml b/jami-android/app/src/main/res/values-da/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-da/strings_content_description.xml rename to jami-android/app/src/main/res/values-da/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-da/strings_preferences.xml b/jami-android/app/src/main/res/values-da/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-da/strings_preferences.xml rename to jami-android/app/src/main/res/values-da/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/jami-android/app/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-de-rDE/strings.xml rename to jami-android/app/src/main/res/values-de-rDE/strings.xml diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml b/jami-android/app/src/main/res/values-de-rDE/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-de-rDE/strings_account.xml rename to jami-android/app/src/main/res/values-de-rDE/strings_account.xml diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_call.xml b/jami-android/app/src/main/res/values-de-rDE/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-de-rDE/strings_call.xml rename to jami-android/app/src/main/res/values-de-rDE/strings_call.xml diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_content_description.xml b/jami-android/app/src/main/res/values-de-rDE/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-de-rDE/strings_content_description.xml rename to jami-android/app/src/main/res/values-de-rDE/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml b/jami-android/app/src/main/res/values-de-rDE/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml rename to jami-android/app/src/main/res/values-de-rDE/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/jami-android/app/src/main/res/values-de/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-de/strings.xml rename to jami-android/app/src/main/res/values-de/strings.xml diff --git a/ring-android/app/src/main/res/values-de/strings_account.xml b/jami-android/app/src/main/res/values-de/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-de/strings_account.xml rename to jami-android/app/src/main/res/values-de/strings_account.xml diff --git a/ring-android/app/src/main/res/values-de/strings_call.xml b/jami-android/app/src/main/res/values-de/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-de/strings_call.xml rename to jami-android/app/src/main/res/values-de/strings_call.xml diff --git a/ring-android/app/src/main/res/values-de/strings_content_description.xml b/jami-android/app/src/main/res/values-de/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-de/strings_content_description.xml rename to jami-android/app/src/main/res/values-de/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-de/strings_preferences.xml b/jami-android/app/src/main/res/values-de/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-de/strings_preferences.xml rename to jami-android/app/src/main/res/values-de/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/jami-android/app/src/main/res/values-el/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-el/strings.xml rename to jami-android/app/src/main/res/values-el/strings.xml diff --git a/ring-android/app/src/main/res/values-el/strings_account.xml b/jami-android/app/src/main/res/values-el/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-el/strings_account.xml rename to jami-android/app/src/main/res/values-el/strings_account.xml diff --git a/ring-android/app/src/main/res/values-el/strings_call.xml b/jami-android/app/src/main/res/values-el/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-el/strings_call.xml rename to jami-android/app/src/main/res/values-el/strings_call.xml diff --git a/ring-android/app/src/main/res/values-el/strings_content_description.xml b/jami-android/app/src/main/res/values-el/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-el/strings_content_description.xml rename to jami-android/app/src/main/res/values-el/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-el/strings_preferences.xml b/jami-android/app/src/main/res/values-el/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-el/strings_preferences.xml rename to jami-android/app/src/main/res/values-el/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-en-rGB/strings_preferences.xml b/jami-android/app/src/main/res/values-en-rGB/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-en-rGB/strings_preferences.xml rename to jami-android/app/src/main/res/values-en-rGB/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-en-rIE/strings_preferences.xml b/jami-android/app/src/main/res/values-en-rIE/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-en-rIE/strings_preferences.xml rename to jami-android/app/src/main/res/values-en-rIE/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-eo/strings.xml b/jami-android/app/src/main/res/values-eo/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-eo/strings.xml rename to jami-android/app/src/main/res/values-eo/strings.xml diff --git a/ring-android/app/src/main/res/values-eo/strings_account.xml b/jami-android/app/src/main/res/values-eo/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-eo/strings_account.xml rename to jami-android/app/src/main/res/values-eo/strings_account.xml diff --git a/ring-android/app/src/main/res/values-eo/strings_call.xml b/jami-android/app/src/main/res/values-eo/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-eo/strings_call.xml rename to jami-android/app/src/main/res/values-eo/strings_call.xml diff --git a/ring-android/app/src/main/res/values-eo/strings_content_description.xml b/jami-android/app/src/main/res/values-eo/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-eo/strings_content_description.xml rename to jami-android/app/src/main/res/values-eo/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-eo/strings_preferences.xml b/jami-android/app/src/main/res/values-eo/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-eo/strings_preferences.xml rename to jami-android/app/src/main/res/values-eo/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-es-rAR/strings.xml b/jami-android/app/src/main/res/values-es-rAR/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rAR/strings.xml rename to jami-android/app/src/main/res/values-es-rAR/strings.xml diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_account.xml b/jami-android/app/src/main/res/values-es-rAR/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rAR/strings_account.xml rename to jami-android/app/src/main/res/values-es-rAR/strings_account.xml diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_call.xml b/jami-android/app/src/main/res/values-es-rAR/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rAR/strings_call.xml rename to jami-android/app/src/main/res/values-es-rAR/strings_call.xml diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_content_description.xml b/jami-android/app/src/main/res/values-es-rAR/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rAR/strings_content_description.xml rename to jami-android/app/src/main/res/values-es-rAR/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml b/jami-android/app/src/main/res/values-es-rAR/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml rename to jami-android/app/src/main/res/values-es-rAR/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-es-rCO/strings.xml b/jami-android/app/src/main/res/values-es-rCO/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rCO/strings.xml rename to jami-android/app/src/main/res/values-es-rCO/strings.xml diff --git a/ring-android/app/src/main/res/values-es-rCO/strings_account.xml b/jami-android/app/src/main/res/values-es-rCO/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rCO/strings_account.xml rename to jami-android/app/src/main/res/values-es-rCO/strings_account.xml diff --git a/ring-android/app/src/main/res/values-es-rCO/strings_call.xml b/jami-android/app/src/main/res/values-es-rCO/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rCO/strings_call.xml rename to jami-android/app/src/main/res/values-es-rCO/strings_call.xml diff --git a/ring-android/app/src/main/res/values-es-rCO/strings_content_description.xml b/jami-android/app/src/main/res/values-es-rCO/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rCO/strings_content_description.xml rename to jami-android/app/src/main/res/values-es-rCO/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-es-rCO/strings_preferences.xml b/jami-android/app/src/main/res/values-es-rCO/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rCO/strings_preferences.xml rename to jami-android/app/src/main/res/values-es-rCO/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-es-rMX/strings.xml b/jami-android/app/src/main/res/values-es-rMX/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rMX/strings.xml rename to jami-android/app/src/main/res/values-es-rMX/strings.xml diff --git a/ring-android/app/src/main/res/values-es-rMX/strings_account.xml b/jami-android/app/src/main/res/values-es-rMX/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rMX/strings_account.xml rename to jami-android/app/src/main/res/values-es-rMX/strings_account.xml diff --git a/ring-android/app/src/main/res/values-es-rMX/strings_call.xml b/jami-android/app/src/main/res/values-es-rMX/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rMX/strings_call.xml rename to jami-android/app/src/main/res/values-es-rMX/strings_call.xml diff --git a/ring-android/app/src/main/res/values-es-rMX/strings_content_description.xml b/jami-android/app/src/main/res/values-es-rMX/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rMX/strings_content_description.xml rename to jami-android/app/src/main/res/values-es-rMX/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-es-rMX/strings_preferences.xml b/jami-android/app/src/main/res/values-es-rMX/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-es-rMX/strings_preferences.xml rename to jami-android/app/src/main/res/values-es-rMX/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/jami-android/app/src/main/res/values-es/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-es/strings.xml rename to jami-android/app/src/main/res/values-es/strings.xml diff --git a/ring-android/app/src/main/res/values-es/strings_account.xml b/jami-android/app/src/main/res/values-es/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-es/strings_account.xml rename to jami-android/app/src/main/res/values-es/strings_account.xml diff --git a/ring-android/app/src/main/res/values-es/strings_call.xml b/jami-android/app/src/main/res/values-es/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-es/strings_call.xml rename to jami-android/app/src/main/res/values-es/strings_call.xml diff --git a/ring-android/app/src/main/res/values-es/strings_content_description.xml b/jami-android/app/src/main/res/values-es/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-es/strings_content_description.xml rename to jami-android/app/src/main/res/values-es/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-es/strings_preferences.xml b/jami-android/app/src/main/res/values-es/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-es/strings_preferences.xml rename to jami-android/app/src/main/res/values-es/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-et-rEE/strings.xml b/jami-android/app/src/main/res/values-et-rEE/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-et-rEE/strings.xml rename to jami-android/app/src/main/res/values-et-rEE/strings.xml diff --git a/ring-android/app/src/main/res/values-et-rEE/strings_account.xml b/jami-android/app/src/main/res/values-et-rEE/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-et-rEE/strings_account.xml rename to jami-android/app/src/main/res/values-et-rEE/strings_account.xml diff --git a/ring-android/app/src/main/res/values-et-rEE/strings_call.xml b/jami-android/app/src/main/res/values-et-rEE/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-et-rEE/strings_call.xml rename to jami-android/app/src/main/res/values-et-rEE/strings_call.xml diff --git a/ring-android/app/src/main/res/values-et-rEE/strings_content_description.xml b/jami-android/app/src/main/res/values-et-rEE/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-et-rEE/strings_content_description.xml rename to jami-android/app/src/main/res/values-et-rEE/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-et-rEE/strings_preferences.xml b/jami-android/app/src/main/res/values-et-rEE/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-et-rEE/strings_preferences.xml rename to jami-android/app/src/main/res/values-et-rEE/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-et/strings.xml b/jami-android/app/src/main/res/values-et/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-et/strings.xml rename to jami-android/app/src/main/res/values-et/strings.xml diff --git a/ring-android/app/src/main/res/values-et/strings_account.xml b/jami-android/app/src/main/res/values-et/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-et/strings_account.xml rename to jami-android/app/src/main/res/values-et/strings_account.xml diff --git a/ring-android/app/src/main/res/values-et/strings_call.xml b/jami-android/app/src/main/res/values-et/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-et/strings_call.xml rename to jami-android/app/src/main/res/values-et/strings_call.xml diff --git a/ring-android/app/src/main/res/values-et/strings_content_description.xml b/jami-android/app/src/main/res/values-et/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-et/strings_content_description.xml rename to jami-android/app/src/main/res/values-et/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-et/strings_preferences.xml b/jami-android/app/src/main/res/values-et/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-et/strings_preferences.xml rename to jami-android/app/src/main/res/values-et/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-eu/strings.xml b/jami-android/app/src/main/res/values-eu/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-eu/strings.xml rename to jami-android/app/src/main/res/values-eu/strings.xml diff --git a/ring-android/app/src/main/res/values-eu/strings_account.xml b/jami-android/app/src/main/res/values-eu/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-eu/strings_account.xml rename to jami-android/app/src/main/res/values-eu/strings_account.xml diff --git a/ring-android/app/src/main/res/values-eu/strings_call.xml b/jami-android/app/src/main/res/values-eu/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-eu/strings_call.xml rename to jami-android/app/src/main/res/values-eu/strings_call.xml diff --git a/ring-android/app/src/main/res/values-eu/strings_content_description.xml b/jami-android/app/src/main/res/values-eu/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-eu/strings_content_description.xml rename to jami-android/app/src/main/res/values-eu/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-eu/strings_preferences.xml b/jami-android/app/src/main/res/values-eu/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-eu/strings_preferences.xml rename to jami-android/app/src/main/res/values-eu/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/jami-android/app/src/main/res/values-fa-rIR/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-fa-rIR/strings.xml rename to jami-android/app/src/main/res/values-fa-rIR/strings.xml diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/jami-android/app/src/main/res/values-fa-rIR/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-fa-rIR/strings_account.xml rename to jami-android/app/src/main/res/values-fa-rIR/strings_account.xml diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml b/jami-android/app/src/main/res/values-fa-rIR/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-fa-rIR/strings_call.xml rename to jami-android/app/src/main/res/values-fa-rIR/strings_call.xml diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_content_description.xml b/jami-android/app/src/main/res/values-fa-rIR/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-fa-rIR/strings_content_description.xml rename to jami-android/app/src/main/res/values-fa-rIR/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml b/jami-android/app/src/main/res/values-fa-rIR/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml rename to jami-android/app/src/main/res/values-fa-rIR/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-fa/strings.xml b/jami-android/app/src/main/res/values-fa/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-fa/strings.xml rename to jami-android/app/src/main/res/values-fa/strings.xml diff --git a/ring-android/app/src/main/res/values-fa/strings_account.xml b/jami-android/app/src/main/res/values-fa/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-fa/strings_account.xml rename to jami-android/app/src/main/res/values-fa/strings_account.xml diff --git a/ring-android/app/src/main/res/values-fa/strings_call.xml b/jami-android/app/src/main/res/values-fa/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-fa/strings_call.xml rename to jami-android/app/src/main/res/values-fa/strings_call.xml diff --git a/ring-android/app/src/main/res/values-fa/strings_content_description.xml b/jami-android/app/src/main/res/values-fa/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-fa/strings_content_description.xml rename to jami-android/app/src/main/res/values-fa/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-fa/strings_preferences.xml b/jami-android/app/src/main/res/values-fa/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-fa/strings_preferences.xml rename to jami-android/app/src/main/res/values-fa/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/jami-android/app/src/main/res/values-fi/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-fi/strings.xml rename to jami-android/app/src/main/res/values-fi/strings.xml diff --git a/ring-android/app/src/main/res/values-fi/strings_account.xml b/jami-android/app/src/main/res/values-fi/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-fi/strings_account.xml rename to jami-android/app/src/main/res/values-fi/strings_account.xml diff --git a/ring-android/app/src/main/res/values-fi/strings_call.xml b/jami-android/app/src/main/res/values-fi/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-fi/strings_call.xml rename to jami-android/app/src/main/res/values-fi/strings_call.xml diff --git a/ring-android/app/src/main/res/values-fi/strings_content_description.xml b/jami-android/app/src/main/res/values-fi/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-fi/strings_content_description.xml rename to jami-android/app/src/main/res/values-fi/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-fi/strings_preferences.xml b/jami-android/app/src/main/res/values-fi/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-fi/strings_preferences.xml rename to jami-android/app/src/main/res/values-fi/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings.xml b/jami-android/app/src/main/res/values-fr-rBE/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rBE/strings.xml rename to jami-android/app/src/main/res/values-fr-rBE/strings.xml diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings_account.xml b/jami-android/app/src/main/res/values-fr-rBE/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rBE/strings_account.xml rename to jami-android/app/src/main/res/values-fr-rBE/strings_account.xml diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings_call.xml b/jami-android/app/src/main/res/values-fr-rBE/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rBE/strings_call.xml rename to jami-android/app/src/main/res/values-fr-rBE/strings_call.xml diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings_content_description.xml b/jami-android/app/src/main/res/values-fr-rBE/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rBE/strings_content_description.xml rename to jami-android/app/src/main/res/values-fr-rBE/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings_preferences.xml b/jami-android/app/src/main/res/values-fr-rBE/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rBE/strings_preferences.xml rename to jami-android/app/src/main/res/values-fr-rBE/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/jami-android/app/src/main/res/values-fr-rCA/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rCA/strings.xml rename to jami-android/app/src/main/res/values-fr-rCA/strings.xml diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml b/jami-android/app/src/main/res/values-fr-rCA/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rCA/strings_account.xml rename to jami-android/app/src/main/res/values-fr-rCA/strings_account.xml diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_call.xml b/jami-android/app/src/main/res/values-fr-rCA/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rCA/strings_call.xml rename to jami-android/app/src/main/res/values-fr-rCA/strings_call.xml diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_content_description.xml b/jami-android/app/src/main/res/values-fr-rCA/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rCA/strings_content_description.xml rename to jami-android/app/src/main/res/values-fr-rCA/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml b/jami-android/app/src/main/res/values-fr-rCA/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml rename to jami-android/app/src/main/res/values-fr-rCA/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings.xml b/jami-android/app/src/main/res/values-fr-rCH/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rCH/strings.xml rename to jami-android/app/src/main/res/values-fr-rCH/strings.xml diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings_account.xml b/jami-android/app/src/main/res/values-fr-rCH/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rCH/strings_account.xml rename to jami-android/app/src/main/res/values-fr-rCH/strings_account.xml diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings_call.xml b/jami-android/app/src/main/res/values-fr-rCH/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rCH/strings_call.xml rename to jami-android/app/src/main/res/values-fr-rCH/strings_call.xml diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings_content_description.xml b/jami-android/app/src/main/res/values-fr-rCH/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rCH/strings_content_description.xml rename to jami-android/app/src/main/res/values-fr-rCH/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings_preferences.xml b/jami-android/app/src/main/res/values-fr-rCH/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rCH/strings_preferences.xml rename to jami-android/app/src/main/res/values-fr-rCH/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/jami-android/app/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rFR/strings.xml rename to jami-android/app/src/main/res/values-fr-rFR/strings.xml diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml b/jami-android/app/src/main/res/values-fr-rFR/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rFR/strings_account.xml rename to jami-android/app/src/main/res/values-fr-rFR/strings_account.xml diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml b/jami-android/app/src/main/res/values-fr-rFR/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rFR/strings_call.xml rename to jami-android/app/src/main/res/values-fr-rFR/strings_call.xml diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_content_description.xml b/jami-android/app/src/main/res/values-fr-rFR/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rFR/strings_content_description.xml rename to jami-android/app/src/main/res/values-fr-rFR/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_preferences.xml b/jami-android/app/src/main/res/values-fr-rFR/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr-rFR/strings_preferences.xml rename to jami-android/app/src/main/res/values-fr-rFR/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/jami-android/app/src/main/res/values-fr/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr/strings.xml rename to jami-android/app/src/main/res/values-fr/strings.xml diff --git a/ring-android/app/src/main/res/values-fr/strings_account.xml b/jami-android/app/src/main/res/values-fr/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr/strings_account.xml rename to jami-android/app/src/main/res/values-fr/strings_account.xml diff --git a/ring-android/app/src/main/res/values-fr/strings_call.xml b/jami-android/app/src/main/res/values-fr/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr/strings_call.xml rename to jami-android/app/src/main/res/values-fr/strings_call.xml diff --git a/ring-android/app/src/main/res/values-fr/strings_content_description.xml b/jami-android/app/src/main/res/values-fr/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr/strings_content_description.xml rename to jami-android/app/src/main/res/values-fr/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-fr/strings_preferences.xml b/jami-android/app/src/main/res/values-fr/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-fr/strings_preferences.xml rename to jami-android/app/src/main/res/values-fr/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ga/strings.xml b/jami-android/app/src/main/res/values-ga/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ga/strings.xml rename to jami-android/app/src/main/res/values-ga/strings.xml diff --git a/ring-android/app/src/main/res/values-ga/strings_call.xml b/jami-android/app/src/main/res/values-ga/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ga/strings_call.xml rename to jami-android/app/src/main/res/values-ga/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ga/strings_preferences.xml b/jami-android/app/src/main/res/values-ga/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ga/strings_preferences.xml rename to jami-android/app/src/main/res/values-ga/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-gl/strings.xml b/jami-android/app/src/main/res/values-gl/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-gl/strings.xml rename to jami-android/app/src/main/res/values-gl/strings.xml diff --git a/ring-android/app/src/main/res/values-gl/strings_account.xml b/jami-android/app/src/main/res/values-gl/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-gl/strings_account.xml rename to jami-android/app/src/main/res/values-gl/strings_account.xml diff --git a/ring-android/app/src/main/res/values-gl/strings_call.xml b/jami-android/app/src/main/res/values-gl/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-gl/strings_call.xml rename to jami-android/app/src/main/res/values-gl/strings_call.xml diff --git a/ring-android/app/src/main/res/values-gl/strings_content_description.xml b/jami-android/app/src/main/res/values-gl/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-gl/strings_content_description.xml rename to jami-android/app/src/main/res/values-gl/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-gl/strings_preferences.xml b/jami-android/app/src/main/res/values-gl/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-gl/strings_preferences.xml rename to jami-android/app/src/main/res/values-gl/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-gu/strings.xml b/jami-android/app/src/main/res/values-gu/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-gu/strings.xml rename to jami-android/app/src/main/res/values-gu/strings.xml diff --git a/ring-android/app/src/main/res/values-gu/strings_call.xml b/jami-android/app/src/main/res/values-gu/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-gu/strings_call.xml rename to jami-android/app/src/main/res/values-gu/strings_call.xml diff --git a/ring-android/app/src/main/res/values-gu/strings_preferences.xml b/jami-android/app/src/main/res/values-gu/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-gu/strings_preferences.xml rename to jami-android/app/src/main/res/values-gu/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-h500dp-land/dimens.xml b/jami-android/app/src/main/res/values-h500dp-land/dimens.xml similarity index 100% rename from ring-android/app/src/main/res/values-h500dp-land/dimens.xml rename to jami-android/app/src/main/res/values-h500dp-land/dimens.xml diff --git a/ring-android/app/src/main/res/values-he/strings.xml b/jami-android/app/src/main/res/values-he/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-he/strings.xml rename to jami-android/app/src/main/res/values-he/strings.xml diff --git a/ring-android/app/src/main/res/values-he/strings_account.xml b/jami-android/app/src/main/res/values-he/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-he/strings_account.xml rename to jami-android/app/src/main/res/values-he/strings_account.xml diff --git a/ring-android/app/src/main/res/values-he/strings_call.xml b/jami-android/app/src/main/res/values-he/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-he/strings_call.xml rename to jami-android/app/src/main/res/values-he/strings_call.xml diff --git a/ring-android/app/src/main/res/values-he/strings_content_description.xml b/jami-android/app/src/main/res/values-he/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-he/strings_content_description.xml rename to jami-android/app/src/main/res/values-he/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-he/strings_preferences.xml b/jami-android/app/src/main/res/values-he/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-he/strings_preferences.xml rename to jami-android/app/src/main/res/values-he/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-hi-rIN/strings.xml b/jami-android/app/src/main/res/values-hi-rIN/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-hi-rIN/strings.xml rename to jami-android/app/src/main/res/values-hi-rIN/strings.xml diff --git a/ring-android/app/src/main/res/values-hi-rIN/strings_account.xml b/jami-android/app/src/main/res/values-hi-rIN/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-hi-rIN/strings_account.xml rename to jami-android/app/src/main/res/values-hi-rIN/strings_account.xml diff --git a/ring-android/app/src/main/res/values-hi-rIN/strings_call.xml b/jami-android/app/src/main/res/values-hi-rIN/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-hi-rIN/strings_call.xml rename to jami-android/app/src/main/res/values-hi-rIN/strings_call.xml diff --git a/ring-android/app/src/main/res/values-hi-rIN/strings_preferences.xml b/jami-android/app/src/main/res/values-hi-rIN/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-hi-rIN/strings_preferences.xml rename to jami-android/app/src/main/res/values-hi-rIN/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-hi/strings.xml b/jami-android/app/src/main/res/values-hi/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-hi/strings.xml rename to jami-android/app/src/main/res/values-hi/strings.xml diff --git a/ring-android/app/src/main/res/values-hi/strings_account.xml b/jami-android/app/src/main/res/values-hi/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-hi/strings_account.xml rename to jami-android/app/src/main/res/values-hi/strings_account.xml diff --git a/ring-android/app/src/main/res/values-hi/strings_call.xml b/jami-android/app/src/main/res/values-hi/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-hi/strings_call.xml rename to jami-android/app/src/main/res/values-hi/strings_call.xml diff --git a/ring-android/app/src/main/res/values-hi/strings_preferences.xml b/jami-android/app/src/main/res/values-hi/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-hi/strings_preferences.xml rename to jami-android/app/src/main/res/values-hi/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-hr-rHR/strings.xml b/jami-android/app/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-hr-rHR/strings.xml rename to jami-android/app/src/main/res/values-hr-rHR/strings.xml diff --git a/ring-android/app/src/main/res/values-hr-rHR/strings_account.xml b/jami-android/app/src/main/res/values-hr-rHR/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-hr-rHR/strings_account.xml rename to jami-android/app/src/main/res/values-hr-rHR/strings_account.xml diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/jami-android/app/src/main/res/values-hr/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-hr/strings.xml rename to jami-android/app/src/main/res/values-hr/strings.xml diff --git a/ring-android/app/src/main/res/values-hr/strings_account.xml b/jami-android/app/src/main/res/values-hr/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-hr/strings_account.xml rename to jami-android/app/src/main/res/values-hr/strings_account.xml diff --git a/ring-android/app/src/main/res/values-hr/strings_call.xml b/jami-android/app/src/main/res/values-hr/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-hr/strings_call.xml rename to jami-android/app/src/main/res/values-hr/strings_call.xml diff --git a/ring-android/app/src/main/res/values-hr/strings_content_description.xml b/jami-android/app/src/main/res/values-hr/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-hr/strings_content_description.xml rename to jami-android/app/src/main/res/values-hr/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-hr/strings_preferences.xml b/jami-android/app/src/main/res/values-hr/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-hr/strings_preferences.xml rename to jami-android/app/src/main/res/values-hr/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/jami-android/app/src/main/res/values-hu/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-hu/strings.xml rename to jami-android/app/src/main/res/values-hu/strings.xml diff --git a/ring-android/app/src/main/res/values-hu/strings_account.xml b/jami-android/app/src/main/res/values-hu/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-hu/strings_account.xml rename to jami-android/app/src/main/res/values-hu/strings_account.xml diff --git a/ring-android/app/src/main/res/values-hu/strings_call.xml b/jami-android/app/src/main/res/values-hu/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-hu/strings_call.xml rename to jami-android/app/src/main/res/values-hu/strings_call.xml diff --git a/ring-android/app/src/main/res/values-hu/strings_content_description.xml b/jami-android/app/src/main/res/values-hu/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-hu/strings_content_description.xml rename to jami-android/app/src/main/res/values-hu/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-hu/strings_preferences.xml b/jami-android/app/src/main/res/values-hu/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-hu/strings_preferences.xml rename to jami-android/app/src/main/res/values-hu/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-id/strings.xml b/jami-android/app/src/main/res/values-id/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-id/strings.xml rename to jami-android/app/src/main/res/values-id/strings.xml diff --git a/ring-android/app/src/main/res/values-id/strings_account.xml b/jami-android/app/src/main/res/values-id/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-id/strings_account.xml rename to jami-android/app/src/main/res/values-id/strings_account.xml diff --git a/ring-android/app/src/main/res/values-id/strings_call.xml b/jami-android/app/src/main/res/values-id/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-id/strings_call.xml rename to jami-android/app/src/main/res/values-id/strings_call.xml diff --git a/ring-android/app/src/main/res/values-id/strings_content_description.xml b/jami-android/app/src/main/res/values-id/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-id/strings_content_description.xml rename to jami-android/app/src/main/res/values-id/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-id/strings_preferences.xml b/jami-android/app/src/main/res/values-id/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-id/strings_preferences.xml rename to jami-android/app/src/main/res/values-id/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ig/strings.xml b/jami-android/app/src/main/res/values-ig/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ig/strings.xml rename to jami-android/app/src/main/res/values-ig/strings.xml diff --git a/ring-android/app/src/main/res/values-ig/strings_call.xml b/jami-android/app/src/main/res/values-ig/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ig/strings_call.xml rename to jami-android/app/src/main/res/values-ig/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ig/strings_preferences.xml b/jami-android/app/src/main/res/values-ig/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ig/strings_preferences.xml rename to jami-android/app/src/main/res/values-ig/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/jami-android/app/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-it-rIT/strings.xml rename to jami-android/app/src/main/res/values-it-rIT/strings.xml diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/jami-android/app/src/main/res/values-it-rIT/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-it-rIT/strings_account.xml rename to jami-android/app/src/main/res/values-it-rIT/strings_account.xml diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_call.xml b/jami-android/app/src/main/res/values-it-rIT/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-it-rIT/strings_call.xml rename to jami-android/app/src/main/res/values-it-rIT/strings_call.xml diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_content_description.xml b/jami-android/app/src/main/res/values-it-rIT/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-it-rIT/strings_content_description.xml rename to jami-android/app/src/main/res/values-it-rIT/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml b/jami-android/app/src/main/res/values-it-rIT/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml rename to jami-android/app/src/main/res/values-it-rIT/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/jami-android/app/src/main/res/values-it/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-it/strings.xml rename to jami-android/app/src/main/res/values-it/strings.xml diff --git a/ring-android/app/src/main/res/values-it/strings_account.xml b/jami-android/app/src/main/res/values-it/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-it/strings_account.xml rename to jami-android/app/src/main/res/values-it/strings_account.xml diff --git a/ring-android/app/src/main/res/values-it/strings_call.xml b/jami-android/app/src/main/res/values-it/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-it/strings_call.xml rename to jami-android/app/src/main/res/values-it/strings_call.xml diff --git a/ring-android/app/src/main/res/values-it/strings_content_description.xml b/jami-android/app/src/main/res/values-it/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-it/strings_content_description.xml rename to jami-android/app/src/main/res/values-it/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-it/strings_preferences.xml b/jami-android/app/src/main/res/values-it/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-it/strings_preferences.xml rename to jami-android/app/src/main/res/values-it/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ja/strings.xml b/jami-android/app/src/main/res/values-ja/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ja/strings.xml rename to jami-android/app/src/main/res/values-ja/strings.xml diff --git a/ring-android/app/src/main/res/values-ja/strings_account.xml b/jami-android/app/src/main/res/values-ja/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ja/strings_account.xml rename to jami-android/app/src/main/res/values-ja/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ja/strings_call.xml b/jami-android/app/src/main/res/values-ja/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ja/strings_call.xml rename to jami-android/app/src/main/res/values-ja/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ja/strings_content_description.xml b/jami-android/app/src/main/res/values-ja/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-ja/strings_content_description.xml rename to jami-android/app/src/main/res/values-ja/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-ja/strings_preferences.xml b/jami-android/app/src/main/res/values-ja/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ja/strings_preferences.xml rename to jami-android/app/src/main/res/values-ja/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-kbd/strings_account.xml b/jami-android/app/src/main/res/values-kbd/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-kbd/strings_account.xml rename to jami-android/app/src/main/res/values-kbd/strings_account.xml diff --git a/ring-android/app/src/main/res/values-kbd/strings_preferences.xml b/jami-android/app/src/main/res/values-kbd/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-kbd/strings_preferences.xml rename to jami-android/app/src/main/res/values-kbd/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-kk/strings.xml b/jami-android/app/src/main/res/values-kk/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-kk/strings.xml rename to jami-android/app/src/main/res/values-kk/strings.xml diff --git a/ring-android/app/src/main/res/values-kk/strings_call.xml b/jami-android/app/src/main/res/values-kk/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-kk/strings_call.xml rename to jami-android/app/src/main/res/values-kk/strings_call.xml diff --git a/ring-android/app/src/main/res/values-kk/strings_preferences.xml b/jami-android/app/src/main/res/values-kk/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-kk/strings_preferences.xml rename to jami-android/app/src/main/res/values-kk/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-kn/strings.xml b/jami-android/app/src/main/res/values-kn/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-kn/strings.xml rename to jami-android/app/src/main/res/values-kn/strings.xml diff --git a/ring-android/app/src/main/res/values-kn/strings_call.xml b/jami-android/app/src/main/res/values-kn/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-kn/strings_call.xml rename to jami-android/app/src/main/res/values-kn/strings_call.xml diff --git a/ring-android/app/src/main/res/values-kn/strings_preferences.xml b/jami-android/app/src/main/res/values-kn/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-kn/strings_preferences.xml rename to jami-android/app/src/main/res/values-kn/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings.xml b/jami-android/app/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ko-rKR/strings.xml rename to jami-android/app/src/main/res/values-ko-rKR/strings.xml diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml b/jami-android/app/src/main/res/values-ko-rKR/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ko-rKR/strings_account.xml rename to jami-android/app/src/main/res/values-ko-rKR/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings_call.xml b/jami-android/app/src/main/res/values-ko-rKR/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ko-rKR/strings_call.xml rename to jami-android/app/src/main/res/values-ko-rKR/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings_preferences.xml b/jami-android/app/src/main/res/values-ko-rKR/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ko-rKR/strings_preferences.xml rename to jami-android/app/src/main/res/values-ko-rKR/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ko/strings.xml b/jami-android/app/src/main/res/values-ko/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ko/strings.xml rename to jami-android/app/src/main/res/values-ko/strings.xml diff --git a/ring-android/app/src/main/res/values-ko/strings_account.xml b/jami-android/app/src/main/res/values-ko/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ko/strings_account.xml rename to jami-android/app/src/main/res/values-ko/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ko/strings_call.xml b/jami-android/app/src/main/res/values-ko/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ko/strings_call.xml rename to jami-android/app/src/main/res/values-ko/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ko/strings_preferences.xml b/jami-android/app/src/main/res/values-ko/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ko/strings_preferences.xml rename to jami-android/app/src/main/res/values-ko/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/jami-android/app/src/main/res/values-lt/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-lt/strings.xml rename to jami-android/app/src/main/res/values-lt/strings.xml diff --git a/ring-android/app/src/main/res/values-lt/strings_account.xml b/jami-android/app/src/main/res/values-lt/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-lt/strings_account.xml rename to jami-android/app/src/main/res/values-lt/strings_account.xml diff --git a/ring-android/app/src/main/res/values-lt/strings_call.xml b/jami-android/app/src/main/res/values-lt/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-lt/strings_call.xml rename to jami-android/app/src/main/res/values-lt/strings_call.xml diff --git a/ring-android/app/src/main/res/values-lt/strings_content_description.xml b/jami-android/app/src/main/res/values-lt/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-lt/strings_content_description.xml rename to jami-android/app/src/main/res/values-lt/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-lt/strings_preferences.xml b/jami-android/app/src/main/res/values-lt/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-lt/strings_preferences.xml rename to jami-android/app/src/main/res/values-lt/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ml/strings.xml b/jami-android/app/src/main/res/values-ml/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ml/strings.xml rename to jami-android/app/src/main/res/values-ml/strings.xml diff --git a/ring-android/app/src/main/res/values-ml/strings_call.xml b/jami-android/app/src/main/res/values-ml/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ml/strings_call.xml rename to jami-android/app/src/main/res/values-ml/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ml/strings_preferences.xml b/jami-android/app/src/main/res/values-ml/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ml/strings_preferences.xml rename to jami-android/app/src/main/res/values-ml/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-mn-rMN/strings.xml b/jami-android/app/src/main/res/values-mn-rMN/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-mn-rMN/strings.xml rename to jami-android/app/src/main/res/values-mn-rMN/strings.xml diff --git a/ring-android/app/src/main/res/values-mn-rMN/strings_call.xml b/jami-android/app/src/main/res/values-mn-rMN/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-mn-rMN/strings_call.xml rename to jami-android/app/src/main/res/values-mn-rMN/strings_call.xml diff --git a/ring-android/app/src/main/res/values-mn-rMN/strings_preferences.xml b/jami-android/app/src/main/res/values-mn-rMN/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-mn-rMN/strings_preferences.xml rename to jami-android/app/src/main/res/values-mn-rMN/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-mr/strings.xml b/jami-android/app/src/main/res/values-mr/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-mr/strings.xml rename to jami-android/app/src/main/res/values-mr/strings.xml diff --git a/ring-android/app/src/main/res/values-mr/strings_account.xml b/jami-android/app/src/main/res/values-mr/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-mr/strings_account.xml rename to jami-android/app/src/main/res/values-mr/strings_account.xml diff --git a/ring-android/app/src/main/res/values-mr/strings_call.xml b/jami-android/app/src/main/res/values-mr/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-mr/strings_call.xml rename to jami-android/app/src/main/res/values-mr/strings_call.xml diff --git a/ring-android/app/src/main/res/values-mr/strings_preferences.xml b/jami-android/app/src/main/res/values-mr/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-mr/strings_preferences.xml rename to jami-android/app/src/main/res/values-mr/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ms/strings.xml b/jami-android/app/src/main/res/values-ms/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ms/strings.xml rename to jami-android/app/src/main/res/values-ms/strings.xml diff --git a/ring-android/app/src/main/res/values-ms/strings_account.xml b/jami-android/app/src/main/res/values-ms/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ms/strings_account.xml rename to jami-android/app/src/main/res/values-ms/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ms/strings_call.xml b/jami-android/app/src/main/res/values-ms/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ms/strings_call.xml rename to jami-android/app/src/main/res/values-ms/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ms/strings_content_description.xml b/jami-android/app/src/main/res/values-ms/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-ms/strings_content_description.xml rename to jami-android/app/src/main/res/values-ms/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-ms/strings_preferences.xml b/jami-android/app/src/main/res/values-ms/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ms/strings_preferences.xml rename to jami-android/app/src/main/res/values-ms/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/jami-android/app/src/main/res/values-nb/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-nb/strings.xml rename to jami-android/app/src/main/res/values-nb/strings.xml diff --git a/ring-android/app/src/main/res/values-nb/strings_account.xml b/jami-android/app/src/main/res/values-nb/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-nb/strings_account.xml rename to jami-android/app/src/main/res/values-nb/strings_account.xml diff --git a/ring-android/app/src/main/res/values-nb/strings_call.xml b/jami-android/app/src/main/res/values-nb/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-nb/strings_call.xml rename to jami-android/app/src/main/res/values-nb/strings_call.xml diff --git a/ring-android/app/src/main/res/values-nb/strings_content_description.xml b/jami-android/app/src/main/res/values-nb/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-nb/strings_content_description.xml rename to jami-android/app/src/main/res/values-nb/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-nb/strings_preferences.xml b/jami-android/app/src/main/res/values-nb/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-nb/strings_preferences.xml rename to jami-android/app/src/main/res/values-nb/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ne/strings.xml b/jami-android/app/src/main/res/values-ne/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ne/strings.xml rename to jami-android/app/src/main/res/values-ne/strings.xml diff --git a/ring-android/app/src/main/res/values-ne/strings_call.xml b/jami-android/app/src/main/res/values-ne/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ne/strings_call.xml rename to jami-android/app/src/main/res/values-ne/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ne/strings_preferences.xml b/jami-android/app/src/main/res/values-ne/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ne/strings_preferences.xml rename to jami-android/app/src/main/res/values-ne/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-night/colors.xml b/jami-android/app/src/main/res/values-night/colors.xml similarity index 100% rename from ring-android/app/src/main/res/values-night/colors.xml rename to jami-android/app/src/main/res/values-night/colors.xml diff --git a/ring-android/app/src/main/res/values-night/styles.xml b/jami-android/app/src/main/res/values-night/styles.xml similarity index 100% rename from ring-android/app/src/main/res/values-night/styles.xml rename to jami-android/app/src/main/res/values-night/styles.xml diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings.xml b/jami-android/app/src/main/res/values-nl-rBE/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl-rBE/strings.xml rename to jami-android/app/src/main/res/values-nl-rBE/strings.xml diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml b/jami-android/app/src/main/res/values-nl-rBE/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl-rBE/strings_account.xml rename to jami-android/app/src/main/res/values-nl-rBE/strings_account.xml diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_call.xml b/jami-android/app/src/main/res/values-nl-rBE/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl-rBE/strings_call.xml rename to jami-android/app/src/main/res/values-nl-rBE/strings_call.xml diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_content_description.xml b/jami-android/app/src/main/res/values-nl-rBE/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl-rBE/strings_content_description.xml rename to jami-android/app/src/main/res/values-nl-rBE/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml b/jami-android/app/src/main/res/values-nl-rBE/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml rename to jami-android/app/src/main/res/values-nl-rBE/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/jami-android/app/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl-rNL/strings.xml rename to jami-android/app/src/main/res/values-nl-rNL/strings.xml diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml b/jami-android/app/src/main/res/values-nl-rNL/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl-rNL/strings_account.xml rename to jami-android/app/src/main/res/values-nl-rNL/strings_account.xml diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_call.xml b/jami-android/app/src/main/res/values-nl-rNL/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl-rNL/strings_call.xml rename to jami-android/app/src/main/res/values-nl-rNL/strings_call.xml diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_content_description.xml b/jami-android/app/src/main/res/values-nl-rNL/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl-rNL/strings_content_description.xml rename to jami-android/app/src/main/res/values-nl-rNL/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_preferences.xml b/jami-android/app/src/main/res/values-nl-rNL/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl-rNL/strings_preferences.xml rename to jami-android/app/src/main/res/values-nl-rNL/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/jami-android/app/src/main/res/values-nl/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl/strings.xml rename to jami-android/app/src/main/res/values-nl/strings.xml diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/jami-android/app/src/main/res/values-nl/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl/strings_account.xml rename to jami-android/app/src/main/res/values-nl/strings_account.xml diff --git a/ring-android/app/src/main/res/values-nl/strings_call.xml b/jami-android/app/src/main/res/values-nl/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl/strings_call.xml rename to jami-android/app/src/main/res/values-nl/strings_call.xml diff --git a/ring-android/app/src/main/res/values-nl/strings_content_description.xml b/jami-android/app/src/main/res/values-nl/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl/strings_content_description.xml rename to jami-android/app/src/main/res/values-nl/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-nl/strings_preferences.xml b/jami-android/app/src/main/res/values-nl/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-nl/strings_preferences.xml rename to jami-android/app/src/main/res/values-nl/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-nn/strings.xml b/jami-android/app/src/main/res/values-nn/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-nn/strings.xml rename to jami-android/app/src/main/res/values-nn/strings.xml diff --git a/ring-android/app/src/main/res/values-nn/strings_call.xml b/jami-android/app/src/main/res/values-nn/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-nn/strings_call.xml rename to jami-android/app/src/main/res/values-nn/strings_call.xml diff --git a/ring-android/app/src/main/res/values-nn/strings_preferences.xml b/jami-android/app/src/main/res/values-nn/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-nn/strings_preferences.xml rename to jami-android/app/src/main/res/values-nn/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-oc/strings.xml b/jami-android/app/src/main/res/values-oc/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-oc/strings.xml rename to jami-android/app/src/main/res/values-oc/strings.xml diff --git a/ring-android/app/src/main/res/values-oc/strings_account.xml b/jami-android/app/src/main/res/values-oc/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-oc/strings_account.xml rename to jami-android/app/src/main/res/values-oc/strings_account.xml diff --git a/ring-android/app/src/main/res/values-oc/strings_call.xml b/jami-android/app/src/main/res/values-oc/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-oc/strings_call.xml rename to jami-android/app/src/main/res/values-oc/strings_call.xml diff --git a/ring-android/app/src/main/res/values-oc/strings_preferences.xml b/jami-android/app/src/main/res/values-oc/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-oc/strings_preferences.xml rename to jami-android/app/src/main/res/values-oc/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-pa/strings.xml b/jami-android/app/src/main/res/values-pa/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-pa/strings.xml rename to jami-android/app/src/main/res/values-pa/strings.xml diff --git a/ring-android/app/src/main/res/values-pa/strings_account.xml b/jami-android/app/src/main/res/values-pa/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-pa/strings_account.xml rename to jami-android/app/src/main/res/values-pa/strings_account.xml diff --git a/ring-android/app/src/main/res/values-pa/strings_call.xml b/jami-android/app/src/main/res/values-pa/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-pa/strings_call.xml rename to jami-android/app/src/main/res/values-pa/strings_call.xml diff --git a/ring-android/app/src/main/res/values-pa/strings_content_description.xml b/jami-android/app/src/main/res/values-pa/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-pa/strings_content_description.xml rename to jami-android/app/src/main/res/values-pa/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-pa/strings_preferences.xml b/jami-android/app/src/main/res/values-pa/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-pa/strings_preferences.xml rename to jami-android/app/src/main/res/values-pa/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/jami-android/app/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-pl-rPL/strings.xml rename to jami-android/app/src/main/res/values-pl-rPL/strings.xml diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml b/jami-android/app/src/main/res/values-pl-rPL/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-pl-rPL/strings_account.xml rename to jami-android/app/src/main/res/values-pl-rPL/strings_account.xml diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_call.xml b/jami-android/app/src/main/res/values-pl-rPL/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-pl-rPL/strings_call.xml rename to jami-android/app/src/main/res/values-pl-rPL/strings_call.xml diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_content_description.xml b/jami-android/app/src/main/res/values-pl-rPL/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-pl-rPL/strings_content_description.xml rename to jami-android/app/src/main/res/values-pl-rPL/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml b/jami-android/app/src/main/res/values-pl-rPL/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml rename to jami-android/app/src/main/res/values-pl-rPL/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/jami-android/app/src/main/res/values-pl/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-pl/strings.xml rename to jami-android/app/src/main/res/values-pl/strings.xml diff --git a/ring-android/app/src/main/res/values-pl/strings_account.xml b/jami-android/app/src/main/res/values-pl/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-pl/strings_account.xml rename to jami-android/app/src/main/res/values-pl/strings_account.xml diff --git a/ring-android/app/src/main/res/values-pl/strings_call.xml b/jami-android/app/src/main/res/values-pl/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-pl/strings_call.xml rename to jami-android/app/src/main/res/values-pl/strings_call.xml diff --git a/ring-android/app/src/main/res/values-pl/strings_content_description.xml b/jami-android/app/src/main/res/values-pl/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-pl/strings_content_description.xml rename to jami-android/app/src/main/res/values-pl/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-pl/strings_preferences.xml b/jami-android/app/src/main/res/values-pl/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-pl/strings_preferences.xml rename to jami-android/app/src/main/res/values-pl/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/jami-android/app/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt-rBR/strings.xml rename to jami-android/app/src/main/res/values-pt-rBR/strings.xml diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/jami-android/app/src/main/res/values-pt-rBR/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt-rBR/strings_account.xml rename to jami-android/app/src/main/res/values-pt-rBR/strings_account.xml diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml b/jami-android/app/src/main/res/values-pt-rBR/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt-rBR/strings_call.xml rename to jami-android/app/src/main/res/values-pt-rBR/strings_call.xml diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_content_description.xml b/jami-android/app/src/main/res/values-pt-rBR/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt-rBR/strings_content_description.xml rename to jami-android/app/src/main/res/values-pt-rBR/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml b/jami-android/app/src/main/res/values-pt-rBR/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml rename to jami-android/app/src/main/res/values-pt-rBR/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings.xml b/jami-android/app/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt-rPT/strings.xml rename to jami-android/app/src/main/res/values-pt-rPT/strings.xml diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml b/jami-android/app/src/main/res/values-pt-rPT/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt-rPT/strings_account.xml rename to jami-android/app/src/main/res/values-pt-rPT/strings_account.xml diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_call.xml b/jami-android/app/src/main/res/values-pt-rPT/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt-rPT/strings_call.xml rename to jami-android/app/src/main/res/values-pt-rPT/strings_call.xml diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_content_description.xml b/jami-android/app/src/main/res/values-pt-rPT/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt-rPT/strings_content_description.xml rename to jami-android/app/src/main/res/values-pt-rPT/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml b/jami-android/app/src/main/res/values-pt-rPT/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml rename to jami-android/app/src/main/res/values-pt-rPT/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-pt/strings.xml b/jami-android/app/src/main/res/values-pt/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt/strings.xml rename to jami-android/app/src/main/res/values-pt/strings.xml diff --git a/ring-android/app/src/main/res/values-pt/strings_account.xml b/jami-android/app/src/main/res/values-pt/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt/strings_account.xml rename to jami-android/app/src/main/res/values-pt/strings_account.xml diff --git a/ring-android/app/src/main/res/values-pt/strings_call.xml b/jami-android/app/src/main/res/values-pt/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt/strings_call.xml rename to jami-android/app/src/main/res/values-pt/strings_call.xml diff --git a/ring-android/app/src/main/res/values-pt/strings_content_description.xml b/jami-android/app/src/main/res/values-pt/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt/strings_content_description.xml rename to jami-android/app/src/main/res/values-pt/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-pt/strings_preferences.xml b/jami-android/app/src/main/res/values-pt/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-pt/strings_preferences.xml rename to jami-android/app/src/main/res/values-pt/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings.xml b/jami-android/app/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ro-rRO/strings.xml rename to jami-android/app/src/main/res/values-ro-rRO/strings.xml diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml b/jami-android/app/src/main/res/values-ro-rRO/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ro-rRO/strings_account.xml rename to jami-android/app/src/main/res/values-ro-rRO/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_call.xml b/jami-android/app/src/main/res/values-ro-rRO/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ro-rRO/strings_call.xml rename to jami-android/app/src/main/res/values-ro-rRO/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_content_description.xml b/jami-android/app/src/main/res/values-ro-rRO/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-ro-rRO/strings_content_description.xml rename to jami-android/app/src/main/res/values-ro-rRO/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml b/jami-android/app/src/main/res/values-ro-rRO/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml rename to jami-android/app/src/main/res/values-ro-rRO/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ro/strings.xml b/jami-android/app/src/main/res/values-ro/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ro/strings.xml rename to jami-android/app/src/main/res/values-ro/strings.xml diff --git a/ring-android/app/src/main/res/values-ro/strings_account.xml b/jami-android/app/src/main/res/values-ro/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ro/strings_account.xml rename to jami-android/app/src/main/res/values-ro/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ro/strings_call.xml b/jami-android/app/src/main/res/values-ro/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ro/strings_call.xml rename to jami-android/app/src/main/res/values-ro/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ro/strings_content_description.xml b/jami-android/app/src/main/res/values-ro/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-ro/strings_content_description.xml rename to jami-android/app/src/main/res/values-ro/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-ro/strings_preferences.xml b/jami-android/app/src/main/res/values-ro/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ro/strings_preferences.xml rename to jami-android/app/src/main/res/values-ro/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/jami-android/app/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ru-rRU/strings.xml rename to jami-android/app/src/main/res/values-ru-rRU/strings.xml diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml b/jami-android/app/src/main/res/values-ru-rRU/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ru-rRU/strings_account.xml rename to jami-android/app/src/main/res/values-ru-rRU/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml b/jami-android/app/src/main/res/values-ru-rRU/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ru-rRU/strings_call.xml rename to jami-android/app/src/main/res/values-ru-rRU/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_content_description.xml b/jami-android/app/src/main/res/values-ru-rRU/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-ru-rRU/strings_content_description.xml rename to jami-android/app/src/main/res/values-ru-rRU/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_preferences.xml b/jami-android/app/src/main/res/values-ru-rRU/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ru-rRU/strings_preferences.xml rename to jami-android/app/src/main/res/values-ru-rRU/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/jami-android/app/src/main/res/values-ru/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ru/strings.xml rename to jami-android/app/src/main/res/values-ru/strings.xml diff --git a/ring-android/app/src/main/res/values-ru/strings_account.xml b/jami-android/app/src/main/res/values-ru/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ru/strings_account.xml rename to jami-android/app/src/main/res/values-ru/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ru/strings_call.xml b/jami-android/app/src/main/res/values-ru/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-ru/strings_call.xml rename to jami-android/app/src/main/res/values-ru/strings_call.xml diff --git a/ring-android/app/src/main/res/values-ru/strings_content_description.xml b/jami-android/app/src/main/res/values-ru/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-ru/strings_content_description.xml rename to jami-android/app/src/main/res/values-ru/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-ru/strings_preferences.xml b/jami-android/app/src/main/res/values-ru/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ru/strings_preferences.xml rename to jami-android/app/src/main/res/values-ru/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-si/strings.xml b/jami-android/app/src/main/res/values-si/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-si/strings.xml rename to jami-android/app/src/main/res/values-si/strings.xml diff --git a/ring-android/app/src/main/res/values-si/strings_preferences.xml b/jami-android/app/src/main/res/values-si/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-si/strings_preferences.xml rename to jami-android/app/src/main/res/values-si/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings.xml b/jami-android/app/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-sk-rSK/strings.xml rename to jami-android/app/src/main/res/values-sk-rSK/strings.xml diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml b/jami-android/app/src/main/res/values-sk-rSK/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-sk-rSK/strings_account.xml rename to jami-android/app/src/main/res/values-sk-rSK/strings_account.xml diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_call.xml b/jami-android/app/src/main/res/values-sk-rSK/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-sk-rSK/strings_call.xml rename to jami-android/app/src/main/res/values-sk-rSK/strings_call.xml diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_content_description.xml b/jami-android/app/src/main/res/values-sk-rSK/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-sk-rSK/strings_content_description.xml rename to jami-android/app/src/main/res/values-sk-rSK/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml b/jami-android/app/src/main/res/values-sk-rSK/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml rename to jami-android/app/src/main/res/values-sk-rSK/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-sk/strings.xml b/jami-android/app/src/main/res/values-sk/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-sk/strings.xml rename to jami-android/app/src/main/res/values-sk/strings.xml diff --git a/ring-android/app/src/main/res/values-sk/strings_account.xml b/jami-android/app/src/main/res/values-sk/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-sk/strings_account.xml rename to jami-android/app/src/main/res/values-sk/strings_account.xml diff --git a/ring-android/app/src/main/res/values-sk/strings_call.xml b/jami-android/app/src/main/res/values-sk/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-sk/strings_call.xml rename to jami-android/app/src/main/res/values-sk/strings_call.xml diff --git a/ring-android/app/src/main/res/values-sk/strings_content_description.xml b/jami-android/app/src/main/res/values-sk/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-sk/strings_content_description.xml rename to jami-android/app/src/main/res/values-sk/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-sk/strings_preferences.xml b/jami-android/app/src/main/res/values-sk/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-sk/strings_preferences.xml rename to jami-android/app/src/main/res/values-sk/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/jami-android/app/src/main/res/values-sl/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-sl/strings.xml rename to jami-android/app/src/main/res/values-sl/strings.xml diff --git a/ring-android/app/src/main/res/values-sl/strings_account.xml b/jami-android/app/src/main/res/values-sl/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-sl/strings_account.xml rename to jami-android/app/src/main/res/values-sl/strings_account.xml diff --git a/ring-android/app/src/main/res/values-sl/strings_call.xml b/jami-android/app/src/main/res/values-sl/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-sl/strings_call.xml rename to jami-android/app/src/main/res/values-sl/strings_call.xml diff --git a/ring-android/app/src/main/res/values-sl/strings_content_description.xml b/jami-android/app/src/main/res/values-sl/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-sl/strings_content_description.xml rename to jami-android/app/src/main/res/values-sl/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-sl/strings_preferences.xml b/jami-android/app/src/main/res/values-sl/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-sl/strings_preferences.xml rename to jami-android/app/src/main/res/values-sl/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/jami-android/app/src/main/res/values-sq-rAL/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-sq-rAL/strings.xml rename to jami-android/app/src/main/res/values-sq-rAL/strings.xml diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml b/jami-android/app/src/main/res/values-sq-rAL/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-sq-rAL/strings_account.xml rename to jami-android/app/src/main/res/values-sq-rAL/strings_account.xml diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_call.xml b/jami-android/app/src/main/res/values-sq-rAL/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-sq-rAL/strings_call.xml rename to jami-android/app/src/main/res/values-sq-rAL/strings_call.xml diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_content_description.xml b/jami-android/app/src/main/res/values-sq-rAL/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-sq-rAL/strings_content_description.xml rename to jami-android/app/src/main/res/values-sq-rAL/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml b/jami-android/app/src/main/res/values-sq-rAL/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml rename to jami-android/app/src/main/res/values-sq-rAL/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-sr/strings.xml b/jami-android/app/src/main/res/values-sr/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-sr/strings.xml rename to jami-android/app/src/main/res/values-sr/strings.xml diff --git a/ring-android/app/src/main/res/values-sr/strings_account.xml b/jami-android/app/src/main/res/values-sr/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-sr/strings_account.xml rename to jami-android/app/src/main/res/values-sr/strings_account.xml diff --git a/ring-android/app/src/main/res/values-sr/strings_call.xml b/jami-android/app/src/main/res/values-sr/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-sr/strings_call.xml rename to jami-android/app/src/main/res/values-sr/strings_call.xml diff --git a/ring-android/app/src/main/res/values-sr/strings_preferences.xml b/jami-android/app/src/main/res/values-sr/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-sr/strings_preferences.xml rename to jami-android/app/src/main/res/values-sr/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/jami-android/app/src/main/res/values-sv/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-sv/strings.xml rename to jami-android/app/src/main/res/values-sv/strings.xml diff --git a/ring-android/app/src/main/res/values-sv/strings_account.xml b/jami-android/app/src/main/res/values-sv/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-sv/strings_account.xml rename to jami-android/app/src/main/res/values-sv/strings_account.xml diff --git a/ring-android/app/src/main/res/values-sv/strings_call.xml b/jami-android/app/src/main/res/values-sv/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-sv/strings_call.xml rename to jami-android/app/src/main/res/values-sv/strings_call.xml diff --git a/ring-android/app/src/main/res/values-sv/strings_content_description.xml b/jami-android/app/src/main/res/values-sv/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-sv/strings_content_description.xml rename to jami-android/app/src/main/res/values-sv/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-sv/strings_preferences.xml b/jami-android/app/src/main/res/values-sv/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-sv/strings_preferences.xml rename to jami-android/app/src/main/res/values-sv/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-sw/strings_preferences.xml b/jami-android/app/src/main/res/values-sw/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-sw/strings_preferences.xml rename to jami-android/app/src/main/res/values-sw/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-sw600dp/attrs.xml b/jami-android/app/src/main/res/values-sw600dp/attrs.xml similarity index 100% rename from ring-android/app/src/main/res/values-sw600dp/attrs.xml rename to jami-android/app/src/main/res/values-sw600dp/attrs.xml diff --git a/ring-android/app/src/main/res/values-ta/strings.xml b/jami-android/app/src/main/res/values-ta/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-ta/strings.xml rename to jami-android/app/src/main/res/values-ta/strings.xml diff --git a/ring-android/app/src/main/res/values-ta/strings_account.xml b/jami-android/app/src/main/res/values-ta/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-ta/strings_account.xml rename to jami-android/app/src/main/res/values-ta/strings_account.xml diff --git a/ring-android/app/src/main/res/values-ta/strings_preferences.xml b/jami-android/app/src/main/res/values-ta/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-ta/strings_preferences.xml rename to jami-android/app/src/main/res/values-ta/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-te/strings.xml b/jami-android/app/src/main/res/values-te/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-te/strings.xml rename to jami-android/app/src/main/res/values-te/strings.xml diff --git a/ring-android/app/src/main/res/values-te/strings_preferences.xml b/jami-android/app/src/main/res/values-te/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-te/strings_preferences.xml rename to jami-android/app/src/main/res/values-te/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-th/strings.xml b/jami-android/app/src/main/res/values-th/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-th/strings.xml rename to jami-android/app/src/main/res/values-th/strings.xml diff --git a/ring-android/app/src/main/res/values-th/strings_account.xml b/jami-android/app/src/main/res/values-th/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-th/strings_account.xml rename to jami-android/app/src/main/res/values-th/strings_account.xml diff --git a/ring-android/app/src/main/res/values-th/strings_call.xml b/jami-android/app/src/main/res/values-th/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-th/strings_call.xml rename to jami-android/app/src/main/res/values-th/strings_call.xml diff --git a/ring-android/app/src/main/res/values-th/strings_content_description.xml b/jami-android/app/src/main/res/values-th/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-th/strings_content_description.xml rename to jami-android/app/src/main/res/values-th/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-th/strings_preferences.xml b/jami-android/app/src/main/res/values-th/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-th/strings_preferences.xml rename to jami-android/app/src/main/res/values-th/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-tr-rTR/strings.xml b/jami-android/app/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-tr-rTR/strings.xml rename to jami-android/app/src/main/res/values-tr-rTR/strings.xml diff --git a/ring-android/app/src/main/res/values-tr-rTR/strings_account.xml b/jami-android/app/src/main/res/values-tr-rTR/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-tr-rTR/strings_account.xml rename to jami-android/app/src/main/res/values-tr-rTR/strings_account.xml diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/jami-android/app/src/main/res/values-tr/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-tr/strings.xml rename to jami-android/app/src/main/res/values-tr/strings.xml diff --git a/ring-android/app/src/main/res/values-tr/strings_account.xml b/jami-android/app/src/main/res/values-tr/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-tr/strings_account.xml rename to jami-android/app/src/main/res/values-tr/strings_account.xml diff --git a/ring-android/app/src/main/res/values-tr/strings_call.xml b/jami-android/app/src/main/res/values-tr/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-tr/strings_call.xml rename to jami-android/app/src/main/res/values-tr/strings_call.xml diff --git a/ring-android/app/src/main/res/values-tr/strings_content_description.xml b/jami-android/app/src/main/res/values-tr/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-tr/strings_content_description.xml rename to jami-android/app/src/main/res/values-tr/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-tr/strings_preferences.xml b/jami-android/app/src/main/res/values-tr/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-tr/strings_preferences.xml rename to jami-android/app/src/main/res/values-tr/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-tt/strings.xml b/jami-android/app/src/main/res/values-tt/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-tt/strings.xml rename to jami-android/app/src/main/res/values-tt/strings.xml diff --git a/ring-android/app/src/main/res/values-tt/strings_preferences.xml b/jami-android/app/src/main/res/values-tt/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-tt/strings_preferences.xml rename to jami-android/app/src/main/res/values-tt/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/jami-android/app/src/main/res/values-uk/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-uk/strings.xml rename to jami-android/app/src/main/res/values-uk/strings.xml diff --git a/ring-android/app/src/main/res/values-uk/strings_account.xml b/jami-android/app/src/main/res/values-uk/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-uk/strings_account.xml rename to jami-android/app/src/main/res/values-uk/strings_account.xml diff --git a/ring-android/app/src/main/res/values-uk/strings_call.xml b/jami-android/app/src/main/res/values-uk/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-uk/strings_call.xml rename to jami-android/app/src/main/res/values-uk/strings_call.xml diff --git a/ring-android/app/src/main/res/values-uk/strings_content_description.xml b/jami-android/app/src/main/res/values-uk/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-uk/strings_content_description.xml rename to jami-android/app/src/main/res/values-uk/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-uk/strings_preferences.xml b/jami-android/app/src/main/res/values-uk/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-uk/strings_preferences.xml rename to jami-android/app/src/main/res/values-uk/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-v23/styles.xml b/jami-android/app/src/main/res/values-v23/styles.xml similarity index 100% rename from ring-android/app/src/main/res/values-v23/styles.xml rename to jami-android/app/src/main/res/values-v23/styles.xml diff --git a/ring-android/app/src/main/res/values-v27/styles.xml b/jami-android/app/src/main/res/values-v27/styles.xml similarity index 100% rename from ring-android/app/src/main/res/values-v27/styles.xml rename to jami-android/app/src/main/res/values-v27/styles.xml diff --git a/ring-android/app/src/main/res/values-v29/styles.xml b/jami-android/app/src/main/res/values-v29/styles.xml similarity index 100% rename from ring-android/app/src/main/res/values-v29/styles.xml rename to jami-android/app/src/main/res/values-v29/styles.xml diff --git a/ring-android/app/src/main/res/values-vi/strings.xml b/jami-android/app/src/main/res/values-vi/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-vi/strings.xml rename to jami-android/app/src/main/res/values-vi/strings.xml diff --git a/ring-android/app/src/main/res/values-vi/strings_account.xml b/jami-android/app/src/main/res/values-vi/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-vi/strings_account.xml rename to jami-android/app/src/main/res/values-vi/strings_account.xml diff --git a/ring-android/app/src/main/res/values-vi/strings_content_description.xml b/jami-android/app/src/main/res/values-vi/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-vi/strings_content_description.xml rename to jami-android/app/src/main/res/values-vi/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-vi/strings_preferences.xml b/jami-android/app/src/main/res/values-vi/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-vi/strings_preferences.xml rename to jami-android/app/src/main/res/values-vi/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-w820dp/dimens.xml b/jami-android/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from ring-android/app/src/main/res/values-w820dp/dimens.xml rename to jami-android/app/src/main/res/values-w820dp/dimens.xml diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/jami-android/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rCN/strings.xml rename to jami-android/app/src/main/res/values-zh-rCN/strings.xml diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/jami-android/app/src/main/res/values-zh-rCN/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rCN/strings_account.xml rename to jami-android/app/src/main/res/values-zh-rCN/strings_account.xml diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_call.xml b/jami-android/app/src/main/res/values-zh-rCN/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rCN/strings_call.xml rename to jami-android/app/src/main/res/values-zh-rCN/strings_call.xml diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_content_description.xml b/jami-android/app/src/main/res/values-zh-rCN/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rCN/strings_content_description.xml rename to jami-android/app/src/main/res/values-zh-rCN/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml b/jami-android/app/src/main/res/values-zh-rCN/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml rename to jami-android/app/src/main/res/values-zh-rCN/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-zh-rHK/strings.xml b/jami-android/app/src/main/res/values-zh-rHK/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rHK/strings.xml rename to jami-android/app/src/main/res/values-zh-rHK/strings.xml diff --git a/ring-android/app/src/main/res/values-zh-rHK/strings_account.xml b/jami-android/app/src/main/res/values-zh-rHK/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rHK/strings_account.xml rename to jami-android/app/src/main/res/values-zh-rHK/strings_account.xml diff --git a/ring-android/app/src/main/res/values-zh-rHK/strings_call.xml b/jami-android/app/src/main/res/values-zh-rHK/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rHK/strings_call.xml rename to jami-android/app/src/main/res/values-zh-rHK/strings_call.xml diff --git a/ring-android/app/src/main/res/values-zh-rHK/strings_content_description.xml b/jami-android/app/src/main/res/values-zh-rHK/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rHK/strings_content_description.xml rename to jami-android/app/src/main/res/values-zh-rHK/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-zh-rHK/strings_preferences.xml b/jami-android/app/src/main/res/values-zh-rHK/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rHK/strings_preferences.xml rename to jami-android/app/src/main/res/values-zh-rHK/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/jami-android/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rTW/strings.xml rename to jami-android/app/src/main/res/values-zh-rTW/strings.xml diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml b/jami-android/app/src/main/res/values-zh-rTW/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rTW/strings_account.xml rename to jami-android/app/src/main/res/values-zh-rTW/strings_account.xml diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml b/jami-android/app/src/main/res/values-zh-rTW/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rTW/strings_call.xml rename to jami-android/app/src/main/res/values-zh-rTW/strings_call.xml diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_content_description.xml b/jami-android/app/src/main/res/values-zh-rTW/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rTW/strings_content_description.xml rename to jami-android/app/src/main/res/values-zh-rTW/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml b/jami-android/app/src/main/res/values-zh-rTW/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml rename to jami-android/app/src/main/res/values-zh-rTW/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values-zh/strings.xml b/jami-android/app/src/main/res/values-zh/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh/strings.xml rename to jami-android/app/src/main/res/values-zh/strings.xml diff --git a/ring-android/app/src/main/res/values-zh/strings_account.xml b/jami-android/app/src/main/res/values-zh/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh/strings_account.xml rename to jami-android/app/src/main/res/values-zh/strings_account.xml diff --git a/ring-android/app/src/main/res/values-zh/strings_call.xml b/jami-android/app/src/main/res/values-zh/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh/strings_call.xml rename to jami-android/app/src/main/res/values-zh/strings_call.xml diff --git a/ring-android/app/src/main/res/values-zh/strings_content_description.xml b/jami-android/app/src/main/res/values-zh/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh/strings_content_description.xml rename to jami-android/app/src/main/res/values-zh/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values-zh/strings_preferences.xml b/jami-android/app/src/main/res/values-zh/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values-zh/strings_preferences.xml rename to jami-android/app/src/main/res/values-zh/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values/anims.xml b/jami-android/app/src/main/res/values/anims.xml similarity index 100% rename from ring-android/app/src/main/res/values/anims.xml rename to jami-android/app/src/main/res/values/anims.xml diff --git a/ring-android/app/src/main/res/values/app_colors.xml b/jami-android/app/src/main/res/values/app_colors.xml similarity index 100% rename from ring-android/app/src/main/res/values/app_colors.xml rename to jami-android/app/src/main/res/values/app_colors.xml diff --git a/ring-android/app/src/main/res/values/arrays.xml b/jami-android/app/src/main/res/values/arrays.xml similarity index 100% rename from ring-android/app/src/main/res/values/arrays.xml rename to jami-android/app/src/main/res/values/arrays.xml diff --git a/ring-android/app/src/main/res/values/attrs.xml b/jami-android/app/src/main/res/values/attrs.xml similarity index 100% rename from ring-android/app/src/main/res/values/attrs.xml rename to jami-android/app/src/main/res/values/attrs.xml diff --git a/ring-android/app/src/main/res/values/colors.xml b/jami-android/app/src/main/res/values/colors.xml similarity index 100% rename from ring-android/app/src/main/res/values/colors.xml rename to jami-android/app/src/main/res/values/colors.xml diff --git a/ring-android/app/src/main/res/values/dimens.xml b/jami-android/app/src/main/res/values/dimens.xml similarity index 100% rename from ring-android/app/src/main/res/values/dimens.xml rename to jami-android/app/src/main/res/values/dimens.xml diff --git a/ring-android/app/src/main/res/values/ic_launcher_background.xml b/jami-android/app/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from ring-android/app/src/main/res/values/ic_launcher_background.xml rename to jami-android/app/src/main/res/values/ic_launcher_background.xml diff --git a/ring-android/app/src/main/res/values/ids.xml b/jami-android/app/src/main/res/values/ids.xml similarity index 100% rename from ring-android/app/src/main/res/values/ids.xml rename to jami-android/app/src/main/res/values/ids.xml diff --git a/ring-android/app/src/main/res/values/material_colors.xml b/jami-android/app/src/main/res/values/material_colors.xml similarity index 100% rename from ring-android/app/src/main/res/values/material_colors.xml rename to jami-android/app/src/main/res/values/material_colors.xml diff --git a/ring-android/app/src/main/res/values/strings.xml b/jami-android/app/src/main/res/values/strings.xml similarity index 100% rename from ring-android/app/src/main/res/values/strings.xml rename to jami-android/app/src/main/res/values/strings.xml diff --git a/ring-android/app/src/main/res/values/strings_account.xml b/jami-android/app/src/main/res/values/strings_account.xml similarity index 100% rename from ring-android/app/src/main/res/values/strings_account.xml rename to jami-android/app/src/main/res/values/strings_account.xml diff --git a/ring-android/app/src/main/res/values/strings_call.xml b/jami-android/app/src/main/res/values/strings_call.xml similarity index 100% rename from ring-android/app/src/main/res/values/strings_call.xml rename to jami-android/app/src/main/res/values/strings_call.xml diff --git a/ring-android/app/src/main/res/values/strings_content_description.xml b/jami-android/app/src/main/res/values/strings_content_description.xml similarity index 100% rename from ring-android/app/src/main/res/values/strings_content_description.xml rename to jami-android/app/src/main/res/values/strings_content_description.xml diff --git a/ring-android/app/src/main/res/values/strings_preferences.xml b/jami-android/app/src/main/res/values/strings_preferences.xml similarity index 100% rename from ring-android/app/src/main/res/values/strings_preferences.xml rename to jami-android/app/src/main/res/values/strings_preferences.xml diff --git a/ring-android/app/src/main/res/values/styleables.xml b/jami-android/app/src/main/res/values/styleables.xml similarity index 100% rename from ring-android/app/src/main/res/values/styleables.xml rename to jami-android/app/src/main/res/values/styleables.xml diff --git a/ring-android/app/src/main/res/values/styles.xml b/jami-android/app/src/main/res/values/styles.xml similarity index 100% rename from ring-android/app/src/main/res/values/styles.xml rename to jami-android/app/src/main/res/values/styles.xml diff --git a/ring-android/app/src/main/res/xml/account_advanced_prefs.xml b/jami-android/app/src/main/res/xml/account_advanced_prefs.xml similarity index 100% rename from ring-android/app/src/main/res/xml/account_advanced_prefs.xml rename to jami-android/app/src/main/res/xml/account_advanced_prefs.xml diff --git a/ring-android/app/src/main/res/xml/account_general_prefs.xml b/jami-android/app/src/main/res/xml/account_general_prefs.xml similarity index 100% rename from ring-android/app/src/main/res/xml/account_general_prefs.xml rename to jami-android/app/src/main/res/xml/account_general_prefs.xml diff --git a/ring-android/app/src/main/res/xml/account_media_prefs.xml b/jami-android/app/src/main/res/xml/account_media_prefs.xml similarity index 100% rename from ring-android/app/src/main/res/xml/account_media_prefs.xml rename to jami-android/app/src/main/res/xml/account_media_prefs.xml diff --git a/ring-android/app/src/main/res/xml/account_prefs_jami.xml b/jami-android/app/src/main/res/xml/account_prefs_jami.xml similarity index 100% rename from ring-android/app/src/main/res/xml/account_prefs_jami.xml rename to jami-android/app/src/main/res/xml/account_prefs_jami.xml diff --git a/ring-android/app/src/main/res/xml/account_security_prefs.xml b/jami-android/app/src/main/res/xml/account_security_prefs.xml similarity index 100% rename from ring-android/app/src/main/res/xml/account_security_prefs.xml rename to jami-android/app/src/main/res/xml/account_security_prefs.xml diff --git a/ring-android/app/src/main/res/xml/automotive_app_desc.xml b/jami-android/app/src/main/res/xml/automotive_app_desc.xml similarity index 100% rename from ring-android/app/src/main/res/xml/automotive_app_desc.xml rename to jami-android/app/src/main/res/xml/automotive_app_desc.xml diff --git a/ring-android/app/src/main/res/xml/file_paths.xml b/jami-android/app/src/main/res/xml/file_paths.xml similarity index 100% rename from ring-android/app/src/main/res/xml/file_paths.xml rename to jami-android/app/src/main/res/xml/file_paths.xml diff --git a/ring-android/app/src/main/res/xml/searchable.xml b/jami-android/app/src/main/res/xml/searchable.xml similarity index 100% rename from ring-android/app/src/main/res/xml/searchable.xml rename to jami-android/app/src/main/res/xml/searchable.xml diff --git a/ring-android/app/src/main/res/xml/shortcuts.xml b/jami-android/app/src/main/res/xml/shortcuts.xml similarity index 100% rename from ring-android/app/src/main/res/xml/shortcuts.xml rename to jami-android/app/src/main/res/xml/shortcuts.xml diff --git a/ring-android/app/src/main/res/xml/tv_about_pref.xml b/jami-android/app/src/main/res/xml/tv_about_pref.xml similarity index 100% rename from ring-android/app/src/main/res/xml/tv_about_pref.xml rename to jami-android/app/src/main/res/xml/tv_about_pref.xml diff --git a/ring-android/app/src/main/res/xml/tv_account_general_pref.xml b/jami-android/app/src/main/res/xml/tv_account_general_pref.xml similarity index 100% rename from ring-android/app/src/main/res/xml/tv_account_general_pref.xml rename to jami-android/app/src/main/res/xml/tv_account_general_pref.xml diff --git a/ring-android/app/src/main/res/xml/tv_contact_more_pref.xml b/jami-android/app/src/main/res/xml/tv_contact_more_pref.xml similarity index 100% rename from ring-android/app/src/main/res/xml/tv_contact_more_pref.xml rename to jami-android/app/src/main/res/xml/tv_contact_more_pref.xml diff --git a/ring-android/app/src/main/res/xml/video_prefs.xml b/jami-android/app/src/main/res/xml/video_prefs.xml similarity index 100% rename from ring-android/app/src/main/res/xml/video_prefs.xml rename to jami-android/app/src/main/res/xml/video_prefs.xml diff --git a/ring-android/app/src/noPush/AndroidManifest.xml b/jami-android/app/src/noPush/AndroidManifest.xml similarity index 100% rename from ring-android/app/src/noPush/AndroidManifest.xml rename to jami-android/app/src/noPush/AndroidManifest.xml diff --git a/ring-android/app/src/noPush/java/cx/ring/application/JamiApplicationNoPush.java b/jami-android/app/src/noPush/java/cx/ring/application/JamiApplicationNoPush.java similarity index 100% rename from ring-android/app/src/noPush/java/cx/ring/application/JamiApplicationNoPush.java rename to jami-android/app/src/noPush/java/cx/ring/application/JamiApplicationNoPush.java diff --git a/ring-android/app/src/withFirebase/AndroidManifest.xml b/jami-android/app/src/withFirebase/AndroidManifest.xml similarity index 100% rename from ring-android/app/src/withFirebase/AndroidManifest.xml rename to jami-android/app/src/withFirebase/AndroidManifest.xml diff --git a/ring-android/app/src/withFirebase/java/cx/ring/application/JamiApplicationFirebase.kt b/jami-android/app/src/withFirebase/java/cx/ring/application/JamiApplicationFirebase.kt similarity index 100% rename from ring-android/app/src/withFirebase/java/cx/ring/application/JamiApplicationFirebase.kt rename to jami-android/app/src/withFirebase/java/cx/ring/application/JamiApplicationFirebase.kt diff --git a/ring-android/app/src/withFirebase/java/cx/ring/services/JamiFirebaseMessagingService.kt b/jami-android/app/src/withFirebase/java/cx/ring/services/JamiFirebaseMessagingService.kt similarity index 100% rename from ring-android/app/src/withFirebase/java/cx/ring/services/JamiFirebaseMessagingService.kt rename to jami-android/app/src/withFirebase/java/cx/ring/services/JamiFirebaseMessagingService.kt diff --git a/ring-android/build.gradle.kts b/jami-android/build.gradle.kts similarity index 100% rename from ring-android/build.gradle.kts rename to jami-android/build.gradle.kts diff --git a/ring-android/build.xml b/jami-android/build.xml similarity index 100% rename from ring-android/build.xml rename to jami-android/build.xml diff --git a/ring-android/fastlane/.gitignore b/jami-android/fastlane/.gitignore similarity index 100% rename from ring-android/fastlane/.gitignore rename to jami-android/fastlane/.gitignore diff --git a/ring-android/fastlane/Appfile b/jami-android/fastlane/Appfile similarity index 100% rename from ring-android/fastlane/Appfile rename to jami-android/fastlane/Appfile diff --git a/ring-android/fastlane/Fastfile b/jami-android/fastlane/Fastfile similarity index 100% rename from ring-android/fastlane/Fastfile rename to jami-android/fastlane/Fastfile diff --git a/ring-android/fastlane/README.md b/jami-android/fastlane/README.md similarity index 100% rename from ring-android/fastlane/README.md rename to jami-android/fastlane/README.md diff --git a/ring-android/fastlane/actions/sign_apk.rb b/jami-android/fastlane/actions/sign_apk.rb similarity index 100% rename from ring-android/fastlane/actions/sign_apk.rb rename to jami-android/fastlane/actions/sign_apk.rb diff --git a/ring-android/fastlane/actions/zipalign.rb b/jami-android/fastlane/actions/zipalign.rb similarity index 100% rename from ring-android/fastlane/actions/zipalign.rb rename to jami-android/fastlane/actions/zipalign.rb diff --git a/ring-android/fastlane/metadata/android/ca/full_description.txt b/jami-android/fastlane/metadata/android/ca/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/ca/full_description.txt rename to jami-android/fastlane/metadata/android/ca/full_description.txt diff --git a/ring-android/fastlane/metadata/android/ca/short_description.txt b/jami-android/fastlane/metadata/android/ca/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/ca/short_description.txt rename to jami-android/fastlane/metadata/android/ca/short_description.txt diff --git a/ring-android/fastlane/metadata/android/ca/title.txt b/jami-android/fastlane/metadata/android/ca/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/ca/title.txt rename to jami-android/fastlane/metadata/android/ca/title.txt diff --git a/ring-android/fastlane/metadata/android/cs-CZ/full_description.txt b/jami-android/fastlane/metadata/android/cs-CZ/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/cs-CZ/full_description.txt rename to jami-android/fastlane/metadata/android/cs-CZ/full_description.txt diff --git a/ring-android/fastlane/metadata/android/cs-CZ/short_description.txt b/jami-android/fastlane/metadata/android/cs-CZ/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/cs-CZ/short_description.txt rename to jami-android/fastlane/metadata/android/cs-CZ/short_description.txt diff --git a/ring-android/fastlane/metadata/android/cs-CZ/title.txt b/jami-android/fastlane/metadata/android/cs-CZ/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/cs-CZ/title.txt rename to jami-android/fastlane/metadata/android/cs-CZ/title.txt diff --git a/ring-android/fastlane/metadata/android/da-DK/full_description.txt b/jami-android/fastlane/metadata/android/da-DK/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/da-DK/full_description.txt rename to jami-android/fastlane/metadata/android/da-DK/full_description.txt diff --git a/ring-android/fastlane/metadata/android/da-DK/short_description.txt b/jami-android/fastlane/metadata/android/da-DK/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/da-DK/short_description.txt rename to jami-android/fastlane/metadata/android/da-DK/short_description.txt diff --git a/ring-android/fastlane/metadata/android/da-DK/title.txt b/jami-android/fastlane/metadata/android/da-DK/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/da-DK/title.txt rename to jami-android/fastlane/metadata/android/da-DK/title.txt diff --git a/ring-android/fastlane/metadata/android/de-DE/full_description.txt b/jami-android/fastlane/metadata/android/de-DE/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/de-DE/full_description.txt rename to jami-android/fastlane/metadata/android/de-DE/full_description.txt diff --git a/ring-android/fastlane/metadata/android/de-DE/short_description.txt b/jami-android/fastlane/metadata/android/de-DE/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/de-DE/short_description.txt rename to jami-android/fastlane/metadata/android/de-DE/short_description.txt diff --git a/ring-android/fastlane/metadata/android/de-DE/title.txt b/jami-android/fastlane/metadata/android/de-DE/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/de-DE/title.txt rename to jami-android/fastlane/metadata/android/de-DE/title.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/105.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/105.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/105.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/105.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/106.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/106.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/106.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/106.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/107.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/107.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/107.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/107.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/108.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/108.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/108.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/108.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/109.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/109.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/109.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/109.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/113.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/113.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/113.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/113.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/114.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/114.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/114.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/114.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/117.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/117.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/117.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/117.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/119.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/119.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/119.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/119.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/125.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/125.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/125.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/125.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/126.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/126.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/126.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/126.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/127.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/127.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/127.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/127.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/131.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/131.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/131.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/131.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/137.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/137.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/137.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/137.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/138.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/138.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/138.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/138.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/139.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/139.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/139.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/139.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/19.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/19.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/19.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/19.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/20.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/20.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/20.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/20.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/21.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/21.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/21.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/21.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/23.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/23.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/23.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/23.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/24.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/24.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/24.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/24.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/26.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/26.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/26.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/26.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/27.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/27.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/27.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/27.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/28.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/28.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/28.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/28.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/29.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/29.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/29.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/29.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/30.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/30.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/30.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/30.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/31.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/31.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/31.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/31.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/32.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/32.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/32.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/32.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/34.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/34.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/34.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/34.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/35.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/35.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/35.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/35.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/36.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/36.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/36.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/36.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/37.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/37.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/37.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/37.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/38.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/38.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/38.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/38.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/39.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/39.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/39.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/39.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/40.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/40.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/40.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/40.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/41.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/41.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/41.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/41.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/42.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/42.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/42.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/42.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/43.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/43.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/43.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/43.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/45.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/45.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/45.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/45.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/47.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/47.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/47.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/47.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/49.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/49.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/49.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/49.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/50.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/50.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/50.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/50.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/52.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/52.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/52.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/52.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/53.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/53.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/53.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/53.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/54.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/54.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/54.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/54.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/55.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/55.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/55.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/55.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/56.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/56.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/56.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/56.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/57.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/57.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/57.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/57.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/58.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/58.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/58.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/58.txt diff --git a/ring-android/fastlane/metadata/android/en-US/changelogs/59.txt b/jami-android/fastlane/metadata/android/en-US/changelogs/59.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/changelogs/59.txt rename to jami-android/fastlane/metadata/android/en-US/changelogs/59.txt diff --git a/ring-android/fastlane/metadata/android/en-US/full_description.txt b/jami-android/fastlane/metadata/android/en-US/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/full_description.txt rename to jami-android/fastlane/metadata/android/en-US/full_description.txt diff --git a/ring-android/fastlane/metadata/android/en-US/images/icon.png b/jami-android/fastlane/metadata/android/en-US/images/icon.png similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/images/icon.png rename to jami-android/fastlane/metadata/android/en-US/images/icon.png diff --git a/ring-android/fastlane/metadata/android/en-US/short_description.txt b/jami-android/fastlane/metadata/android/en-US/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/short_description.txt rename to jami-android/fastlane/metadata/android/en-US/short_description.txt diff --git a/ring-android/fastlane/metadata/android/en-US/title.txt b/jami-android/fastlane/metadata/android/en-US/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/title.txt rename to jami-android/fastlane/metadata/android/en-US/title.txt diff --git a/ring-android/fastlane/metadata/android/en-US/video.txt b/jami-android/fastlane/metadata/android/en-US/video.txt similarity index 100% rename from ring-android/fastlane/metadata/android/en-US/video.txt rename to jami-android/fastlane/metadata/android/en-US/video.txt diff --git a/ring-android/fastlane/metadata/android/es-ES/short_description.txt b/jami-android/fastlane/metadata/android/es-ES/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/es-ES/short_description.txt rename to jami-android/fastlane/metadata/android/es-ES/short_description.txt diff --git a/ring-android/fastlane/metadata/android/es-ES/title.txt b/jami-android/fastlane/metadata/android/es-ES/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/es-ES/title.txt rename to jami-android/fastlane/metadata/android/es-ES/title.txt diff --git a/ring-android/fastlane/metadata/android/fa/full_description.txt b/jami-android/fastlane/metadata/android/fa/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/fa/full_description.txt rename to jami-android/fastlane/metadata/android/fa/full_description.txt diff --git a/ring-android/fastlane/metadata/android/fa/short_description.txt b/jami-android/fastlane/metadata/android/fa/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/fa/short_description.txt rename to jami-android/fastlane/metadata/android/fa/short_description.txt diff --git a/ring-android/fastlane/metadata/android/fa/title.txt b/jami-android/fastlane/metadata/android/fa/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/fa/title.txt rename to jami-android/fastlane/metadata/android/fa/title.txt diff --git a/ring-android/fastlane/metadata/android/fr-FR/full_description.txt b/jami-android/fastlane/metadata/android/fr-FR/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/fr-FR/full_description.txt rename to jami-android/fastlane/metadata/android/fr-FR/full_description.txt diff --git a/ring-android/fastlane/metadata/android/fr-FR/short_description.txt b/jami-android/fastlane/metadata/android/fr-FR/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/fr-FR/short_description.txt rename to jami-android/fastlane/metadata/android/fr-FR/short_description.txt diff --git a/ring-android/fastlane/metadata/android/fr-FR/title.txt b/jami-android/fastlane/metadata/android/fr-FR/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/fr-FR/title.txt rename to jami-android/fastlane/metadata/android/fr-FR/title.txt diff --git a/ring-android/fastlane/metadata/android/fr-FR/video.txt b/jami-android/fastlane/metadata/android/fr-FR/video.txt similarity index 100% rename from ring-android/fastlane/metadata/android/fr-FR/video.txt rename to jami-android/fastlane/metadata/android/fr-FR/video.txt diff --git a/ring-android/fastlane/metadata/android/hu-HU/full_description.txt b/jami-android/fastlane/metadata/android/hu-HU/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/hu-HU/full_description.txt rename to jami-android/fastlane/metadata/android/hu-HU/full_description.txt diff --git a/ring-android/fastlane/metadata/android/hu-HU/short_description.txt b/jami-android/fastlane/metadata/android/hu-HU/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/hu-HU/short_description.txt rename to jami-android/fastlane/metadata/android/hu-HU/short_description.txt diff --git a/ring-android/fastlane/metadata/android/hu-HU/title.txt b/jami-android/fastlane/metadata/android/hu-HU/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/hu-HU/title.txt rename to jami-android/fastlane/metadata/android/hu-HU/title.txt diff --git a/ring-android/fastlane/metadata/android/it-IT/full_description.txt b/jami-android/fastlane/metadata/android/it-IT/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/it-IT/full_description.txt rename to jami-android/fastlane/metadata/android/it-IT/full_description.txt diff --git a/ring-android/fastlane/metadata/android/it-IT/short_description.txt b/jami-android/fastlane/metadata/android/it-IT/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/it-IT/short_description.txt rename to jami-android/fastlane/metadata/android/it-IT/short_description.txt diff --git a/ring-android/fastlane/metadata/android/it-IT/title.txt b/jami-android/fastlane/metadata/android/it-IT/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/it-IT/title.txt rename to jami-android/fastlane/metadata/android/it-IT/title.txt diff --git a/ring-android/fastlane/metadata/android/lt/full_description.txt b/jami-android/fastlane/metadata/android/lt/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/lt/full_description.txt rename to jami-android/fastlane/metadata/android/lt/full_description.txt diff --git a/ring-android/fastlane/metadata/android/lt/short_description.txt b/jami-android/fastlane/metadata/android/lt/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/lt/short_description.txt rename to jami-android/fastlane/metadata/android/lt/short_description.txt diff --git a/ring-android/fastlane/metadata/android/lt/title.txt b/jami-android/fastlane/metadata/android/lt/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/lt/title.txt rename to jami-android/fastlane/metadata/android/lt/title.txt diff --git a/ring-android/fastlane/metadata/android/nl-NL/full_description.txt b/jami-android/fastlane/metadata/android/nl-NL/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/nl-NL/full_description.txt rename to jami-android/fastlane/metadata/android/nl-NL/full_description.txt diff --git a/ring-android/fastlane/metadata/android/nl-NL/short_description.txt b/jami-android/fastlane/metadata/android/nl-NL/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/nl-NL/short_description.txt rename to jami-android/fastlane/metadata/android/nl-NL/short_description.txt diff --git a/ring-android/fastlane/metadata/android/nl-NL/title.txt b/jami-android/fastlane/metadata/android/nl-NL/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/nl-NL/title.txt rename to jami-android/fastlane/metadata/android/nl-NL/title.txt diff --git a/ring-android/fastlane/metadata/android/pl-PL/full_description.txt b/jami-android/fastlane/metadata/android/pl-PL/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/pl-PL/full_description.txt rename to jami-android/fastlane/metadata/android/pl-PL/full_description.txt diff --git a/ring-android/fastlane/metadata/android/pl-PL/short_description.txt b/jami-android/fastlane/metadata/android/pl-PL/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/pl-PL/short_description.txt rename to jami-android/fastlane/metadata/android/pl-PL/short_description.txt diff --git a/ring-android/fastlane/metadata/android/pl-PL/title.txt b/jami-android/fastlane/metadata/android/pl-PL/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/pl-PL/title.txt rename to jami-android/fastlane/metadata/android/pl-PL/title.txt diff --git a/ring-android/fastlane/metadata/android/pt-BR/full_description.txt b/jami-android/fastlane/metadata/android/pt-BR/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/pt-BR/full_description.txt rename to jami-android/fastlane/metadata/android/pt-BR/full_description.txt diff --git a/ring-android/fastlane/metadata/android/pt-BR/short_description.txt b/jami-android/fastlane/metadata/android/pt-BR/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/pt-BR/short_description.txt rename to jami-android/fastlane/metadata/android/pt-BR/short_description.txt diff --git a/ring-android/fastlane/metadata/android/pt-BR/title.txt b/jami-android/fastlane/metadata/android/pt-BR/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/pt-BR/title.txt rename to jami-android/fastlane/metadata/android/pt-BR/title.txt diff --git a/ring-android/fastlane/metadata/android/ru-RU/full_description.txt b/jami-android/fastlane/metadata/android/ru-RU/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/ru-RU/full_description.txt rename to jami-android/fastlane/metadata/android/ru-RU/full_description.txt diff --git a/ring-android/fastlane/metadata/android/ru-RU/short_description.txt b/jami-android/fastlane/metadata/android/ru-RU/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/ru-RU/short_description.txt rename to jami-android/fastlane/metadata/android/ru-RU/short_description.txt diff --git a/ring-android/fastlane/metadata/android/ru-RU/title.txt b/jami-android/fastlane/metadata/android/ru-RU/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/ru-RU/title.txt rename to jami-android/fastlane/metadata/android/ru-RU/title.txt diff --git a/ring-android/fastlane/metadata/android/sv-SE/full_description.txt b/jami-android/fastlane/metadata/android/sv-SE/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/sv-SE/full_description.txt rename to jami-android/fastlane/metadata/android/sv-SE/full_description.txt diff --git a/ring-android/fastlane/metadata/android/sv-SE/short_description.txt b/jami-android/fastlane/metadata/android/sv-SE/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/sv-SE/short_description.txt rename to jami-android/fastlane/metadata/android/sv-SE/short_description.txt diff --git a/ring-android/fastlane/metadata/android/sv-SE/title.txt b/jami-android/fastlane/metadata/android/sv-SE/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/sv-SE/title.txt rename to jami-android/fastlane/metadata/android/sv-SE/title.txt diff --git a/ring-android/fastlane/metadata/android/tr-TR/full_description.txt b/jami-android/fastlane/metadata/android/tr-TR/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/tr-TR/full_description.txt rename to jami-android/fastlane/metadata/android/tr-TR/full_description.txt diff --git a/ring-android/fastlane/metadata/android/tr-TR/short_description.txt b/jami-android/fastlane/metadata/android/tr-TR/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/tr-TR/short_description.txt rename to jami-android/fastlane/metadata/android/tr-TR/short_description.txt diff --git a/ring-android/fastlane/metadata/android/tr-TR/title.txt b/jami-android/fastlane/metadata/android/tr-TR/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/tr-TR/title.txt rename to jami-android/fastlane/metadata/android/tr-TR/title.txt diff --git a/ring-android/fastlane/metadata/android/zh-TW/full_description.txt b/jami-android/fastlane/metadata/android/zh-TW/full_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/zh-TW/full_description.txt rename to jami-android/fastlane/metadata/android/zh-TW/full_description.txt diff --git a/ring-android/fastlane/metadata/android/zh-TW/short_description.txt b/jami-android/fastlane/metadata/android/zh-TW/short_description.txt similarity index 100% rename from ring-android/fastlane/metadata/android/zh-TW/short_description.txt rename to jami-android/fastlane/metadata/android/zh-TW/short_description.txt diff --git a/ring-android/fastlane/metadata/android/zh-TW/title.txt b/jami-android/fastlane/metadata/android/zh-TW/title.txt similarity index 100% rename from ring-android/fastlane/metadata/android/zh-TW/title.txt rename to jami-android/fastlane/metadata/android/zh-TW/title.txt diff --git a/ring-android/gradle.properties b/jami-android/gradle.properties similarity index 100% rename from ring-android/gradle.properties rename to jami-android/gradle.properties diff --git a/ring-android/gradle/wrapper/gradle-wrapper.jar b/jami-android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from ring-android/gradle/wrapper/gradle-wrapper.jar rename to jami-android/gradle/wrapper/gradle-wrapper.jar diff --git a/ring-android/gradle/wrapper/gradle-wrapper.properties b/jami-android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from ring-android/gradle/wrapper/gradle-wrapper.properties rename to jami-android/gradle/wrapper/gradle-wrapper.properties diff --git a/ring-android/gradlew b/jami-android/gradlew similarity index 100% rename from ring-android/gradlew rename to jami-android/gradlew diff --git a/ring-android/gradlew.bat b/jami-android/gradlew.bat similarity index 100% rename from ring-android/gradlew.bat rename to jami-android/gradlew.bat diff --git a/ring-android/libjamiclient/.gitignore b/jami-android/libjamiclient/.gitignore similarity index 100% rename from ring-android/libjamiclient/.gitignore rename to jami-android/libjamiclient/.gitignore diff --git a/ring-android/libjamiclient/build.gradle.kts b/jami-android/libjamiclient/build.gradle.kts similarity index 100% rename from ring-android/libjamiclient/build.gradle.kts rename to jami-android/libjamiclient/build.gradle.kts diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/AccountEditionPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/AccountEditionPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/AccountEditionPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/AccountEditionPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/AccountEditionView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/AccountEditionView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/AccountEditionView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/AccountEditionView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/AccountWizardPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/AccountWizardPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/AccountWizardPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/AccountWizardPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/AccountWizardView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/AccountWizardView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/AccountWizardView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/AccountWizardView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/HomeAccountCreationPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/HomeAccountCreationPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/HomeAccountCreationPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/HomeAccountCreationPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/HomeAccountCreationView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/HomeAccountCreationView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/HomeAccountCreationView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/HomeAccountCreationView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountConnectPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountConnectPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountConnectPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountConnectPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountSummaryView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiConnectAccountView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiConnectAccountView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiConnectAccountView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiConnectAccountView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiLinkAccountPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiLinkAccountPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiLinkAccountPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiLinkAccountPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiLinkAccountView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiLinkAccountView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiLinkAccountView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/JamiLinkAccountView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/LinkDevicePresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/LinkDevicePresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/LinkDevicePresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/LinkDevicePresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/LinkDeviceView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/LinkDeviceView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/LinkDeviceView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/LinkDeviceView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/ProfileCreationPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/ProfileCreationPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/ProfileCreationPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/ProfileCreationPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/ProfileCreationView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/ProfileCreationView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/ProfileCreationView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/ProfileCreationView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/SIPCreationPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/SIPCreationPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/SIPCreationPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/SIPCreationPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/SIPCreationView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/SIPCreationView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/SIPCreationView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/SIPCreationView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/SecurityAccountPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/SecurityAccountPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/SecurityAccountPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/SecurityAccountPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/SecurityAccountView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/account/SecurityAccountView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/account/SecurityAccountView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/account/SecurityAccountView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/call/CallPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/call/CallPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/call/CallPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/call/CallPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/call/CallView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/call/CallView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/call/CallView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/call/CallView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/BlockListPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/BlockListPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/BlockListPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/BlockListPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/BlockListView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/BlockListView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/BlockListView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/BlockListView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/ContactRequestsPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/ContactRequestsPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/ContactRequestsPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/ContactRequestsPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/ContactRequestsView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/ContactRequestsView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/ContactRequestsView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/contactrequests/ContactRequestsView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/home/HomePresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/home/HomePresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/home/HomePresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/home/HomePresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/home/HomeView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/home/HomeView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/home/HomeView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/home/HomeView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/AccountConfig.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/AccountConfig.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/AccountConfig.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/AccountConfig.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/AccountCreationModel.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/AccountCreationModel.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/AccountCreationModel.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/AccountCreationModel.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/AccountCredentials.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/AccountCredentials.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/AccountCredentials.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/AccountCredentials.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Call.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Call.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Call.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Call.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Codec.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Codec.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Codec.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Codec.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Conference.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conference.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Conference.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conference.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/ConfigKey.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/ConfigKey.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/ConfigKey.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/ConfigKey.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Contact.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Contact.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Contact.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Contact.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/ContactEvent.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/ContactEvent.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/ContactEvent.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/ContactEvent.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/ConversationHistory.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/ConversationHistory.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/ConversationHistory.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/ConversationHistory.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/DataTransfer.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/DataTransfer.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/DataTransfer.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/DataTransfer.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/DataTransferError.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/DataTransferError.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/DataTransferError.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/DataTransferError.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Error.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Error.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Error.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Error.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Interaction.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Interaction.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Interaction.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Interaction.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Media.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Media.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Media.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Media.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Phone.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Phone.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Phone.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Phone.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Profile.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Profile.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Profile.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Profile.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Ringtone.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Ringtone.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Ringtone.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Ringtone.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Settings.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Settings.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Settings.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Settings.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/TextMessage.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/TextMessage.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/TextMessage.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/TextMessage.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/TrustRequest.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/TrustRequest.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/TrustRequest.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/TrustRequest.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/model/Uri.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Uri.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/model/Uri.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/model/Uri.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/mvp/GenericView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/mvp/GenericView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/mvp/GenericView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/mvp/GenericView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/mvp/RootPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/mvp/RootPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/mvp/RootPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/mvp/RootPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationViewModel.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationViewModel.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationViewModel.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/navigation/HomeNavigationViewModel.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/ContactService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/ContactService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/ContactService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/ContactService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/ConversationFacade.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/ConversationFacade.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/ConversationFacade.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/ConversationFacade.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/DaemonService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/DaemonService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/DaemonService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/DaemonService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/DeviceRuntimeService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/DeviceRuntimeService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/DeviceRuntimeService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/DeviceRuntimeService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/HardwareService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/HardwareService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/HardwareService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/HardwareService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/HistoryService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/HistoryService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/HistoryService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/HistoryService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/LogService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/LogService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/LogService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/LogService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/NotificationService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/NotificationService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/NotificationService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/NotificationService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/VCardService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/VCardService.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/services/VCardService.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/services/VCardService.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/settings/AdvancedAccountPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/settings/AdvancedAccountPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/settings/AdvancedAccountPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/settings/AdvancedAccountPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/settings/AdvancedAccountView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/settings/AdvancedAccountView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/settings/AdvancedAccountView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/settings/AdvancedAccountView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/settings/GeneralAccountPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/settings/GeneralAccountPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/settings/GeneralAccountPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/settings/GeneralAccountPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/settings/GeneralAccountView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/settings/GeneralAccountView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/settings/GeneralAccountView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/settings/GeneralAccountView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/settings/MediaPreferencePresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/settings/MediaPreferencePresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/settings/MediaPreferencePresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/settings/MediaPreferencePresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/settings/MediaPreferenceView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/settings/MediaPreferenceView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/settings/MediaPreferenceView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/settings/MediaPreferenceView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/settings/SettingsPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/settings/SettingsPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/settings/SettingsPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/settings/SettingsPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/share/SharePresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/share/SharePresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/share/SharePresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/share/SharePresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/share/ShareViewModel.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/share/ShareViewModel.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/share/ShareViewModel.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/share/ShareViewModel.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/smartlist/ConversationItemViewModel.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/smartlist/ConversationItemViewModel.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/smartlist/ConversationItemViewModel.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/smartlist/ConversationItemViewModel.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/smartlist/SmartListPresenter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/smartlist/SmartListPresenter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/smartlist/SmartListPresenter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/smartlist/SmartListPresenter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/smartlist/SmartListView.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/smartlist/SmartListView.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/smartlist/SmartListView.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/smartlist/SmartListView.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/utils/Collections.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/Collections.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/utils/Collections.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/utils/Collections.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/utils/FileUtils.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/FileUtils.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/utils/FileUtils.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/utils/FileUtils.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/utils/HashUtils.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/HashUtils.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/utils/HashUtils.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/utils/HashUtils.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/utils/Log.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/Log.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/utils/Log.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/utils/Log.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/utils/ProfileChunk.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/ProfileChunk.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/utils/ProfileChunk.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/utils/ProfileChunk.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/utils/QRCodeUtils.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/QRCodeUtils.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/utils/QRCodeUtils.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/utils/QRCodeUtils.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/utils/StringUtils.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/StringUtils.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/utils/StringUtils.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/utils/StringUtils.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/utils/SwigNativeConverter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/SwigNativeConverter.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/utils/SwigNativeConverter.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/utils/SwigNativeConverter.kt diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/utils/VCardUtils.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/VCardUtils.kt similarity index 100% rename from ring-android/libjamiclient/src/main/kotlin/net/jami/utils/VCardUtils.kt rename to jami-android/libjamiclient/src/main/kotlin/net/jami/utils/VCardUtils.kt diff --git a/ring-android/libjamiclient/src/test/java/net/jami/model/ConversationTest.kt b/jami-android/libjamiclient/src/test/java/net/jami/model/ConversationTest.kt similarity index 100% rename from ring-android/libjamiclient/src/test/java/net/jami/model/ConversationTest.kt rename to jami-android/libjamiclient/src/test/java/net/jami/model/ConversationTest.kt diff --git a/ring-android/libjamiclient/src/test/java/net/jami/model/UriTest.kt b/jami-android/libjamiclient/src/test/java/net/jami/model/UriTest.kt similarity index 100% rename from ring-android/libjamiclient/src/test/java/net/jami/model/UriTest.kt rename to jami-android/libjamiclient/src/test/java/net/jami/model/UriTest.kt diff --git a/ring-android/libjamiclient/src/test/java/net/jami/utils/VCardUtilsTest.kt b/jami-android/libjamiclient/src/test/java/net/jami/utils/VCardUtilsTest.kt similarity index 100% rename from ring-android/libjamiclient/src/test/java/net/jami/utils/VCardUtilsTest.kt rename to jami-android/libjamiclient/src/test/java/net/jami/utils/VCardUtilsTest.kt diff --git a/ring-android/settings.gradle.kts b/jami-android/settings.gradle.kts similarity index 100% rename from ring-android/settings.gradle.kts rename to jami-android/settings.gradle.kts diff --git a/ring-android/tests/AndroidManifest.xml b/jami-android/tests/AndroidManifest.xml similarity index 100% rename from ring-android/tests/AndroidManifest.xml rename to jami-android/tests/AndroidManifest.xml diff --git a/ring-android/tests/build.xml b/jami-android/tests/build.xml similarity index 100% rename from ring-android/tests/build.xml rename to jami-android/tests/build.xml diff --git a/ring-android/tests/java/cx/ring/client/HomeActivityTest.java b/jami-android/tests/java/cx/ring/client/HomeActivityTest.java similarity index 100% rename from ring-android/tests/java/cx/ring/client/HomeActivityTest.java rename to jami-android/tests/java/cx/ring/client/HomeActivityTest.java diff --git a/ring-android/tests/proguard-project.txt b/jami-android/tests/proguard-project.txt similarity index 100% rename from ring-android/tests/proguard-project.txt rename to jami-android/tests/proguard-project.txt diff --git a/ring-android/tests/project.properties b/jami-android/tests/project.properties similarity index 100% rename from ring-android/tests/project.properties rename to jami-android/tests/project.properties diff --git a/update_version.py b/update_version.py index a8cf21adafe8168dfedd94a863b44f4fe424d9a8..d1601e52defbb190699af41152ba96b451102bb9 100755 --- a/update_version.py +++ b/update_version.py @@ -50,8 +50,8 @@ if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument('--version-name') parser.add_argument('--version-code', type=int) - parser.add_argument('--path', default='ring-android/app/build.gradle.kts') - parser.add_argument('--commit', action='store_true') + parser.add_argument('-p', '--path', default='jami-android/app/build.gradle.kts') + parser.add_argument('-c', '--commit', action='store_true') args = parser.parse_args() new_code, new_name = update_version(args.path, args.version_code, args.version_name)