diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 8c2a65485163ac4a1fb6a361654775c2b4be84d1..165665d7f5641c2ef6663f0ebf2c1a7ef1528cc8 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -75,4 +75,4 @@ native <methods>;
 
 -keep class org.matrix.android.sdk.internal.auth.DefaultAuthenticationService
 -keep class org.matrix.android.sdk.internal.auth.db.PendingSessionData
--keep class com.futo.circles.model.CircleRoomTypeArg
\ No newline at end of file
+-keep class org.futo.circles.model.CircleRoomTypeArg
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/futo/circles/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/futo/circles/ExampleInstrumentedTest.kt
similarity index 86%
rename from app/src/androidTest/java/com/futo/circles/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/org/futo/circles/ExampleInstrumentedTest.kt
index 1b1ae64ca201d55ec6b07c028e53f1f823ed19a1..2da370acd4538ebec595f79e24c896ac7fee68e4 100644
--- a/app/src/androidTest/java/com/futo/circles/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/org/futo/circles/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.futo.circles
+package org.futo.circles
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.futo.circles", appContext.packageName)
+        assertEquals("org.futo.circles", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 866da897551818aca9e8b690ada9a44c10db1bf6..f6d9e5bb26277b5280687b2af220a78c10801477 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.futo.circles">
+    package="org.futo.circles">
 
     <application
-        android:name=".App"
+        android:name="org.futo.circles.App"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -13,7 +13,7 @@
         android:theme="@style/Theme.Circles"
         tools:ignore="DataExtractionRules">
         <activity
-            android:name=".MainActivity"
+            android:name="org.futo.circles.MainActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity">
@@ -38,7 +38,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.futo.circles.provider"
+            android:authorities="org.futo.circles.provider"
             android:exported="false"
             android:grantUriPermissions="true" >
             <meta-data
diff --git a/app/src/main/java/com/futo/circles/MainActivity.kt b/app/src/main/java/com/futo/circles/MainActivity.kt
deleted file mode 100644
index 386877454016e46f57fb6a3c4bbb9719007e8837..0000000000000000000000000000000000000000
--- a/app/src/main/java/com/futo/circles/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.futo.circles
-
-import androidx.appcompat.app.AppCompatActivity
-
-
-class MainActivity : AppCompatActivity(R.layout.main_activity)
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/App.kt b/app/src/main/java/org/futo/circles/App.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/App.kt
rename to app/src/main/java/org/futo/circles/App.kt
index 730870f180407958642b34f92d5aed8a53628c62..6f628b8dbca5865ad873700ef2d80e39e52e0247 100644
--- a/app/src/main/java/com/futo/circles/App.kt
+++ b/app/src/main/java/org/futo/circles/App.kt
@@ -1,8 +1,8 @@
-package com.futo.circles
+package org.futo.circles
 
 import android.app.Application
-import com.futo.circles.di.applicationModules
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.di.applicationModules
+import org.futo.circles.provider.MatrixSessionProvider
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 
diff --git a/app/src/main/java/org/futo/circles/MainActivity.kt b/app/src/main/java/org/futo/circles/MainActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..abd056a883b1cdfabe4efc2fe462c94ebfe1063d
--- /dev/null
+++ b/app/src/main/java/org/futo/circles/MainActivity.kt
@@ -0,0 +1,6 @@
+package org.futo.circles
+
+import androidx.appcompat.app.AppCompatActivity
+
+
+class MainActivity : AppCompatActivity(org.futo.circles.R.layout.main_activity)
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/core/Constants.kt b/app/src/main/java/org/futo/circles/core/Constants.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/core/Constants.kt
rename to app/src/main/java/org/futo/circles/core/Constants.kt
index 1167153d7217af2aad9e82541608ec1b4dd7541c..4d89b60a46546646a3da2c8cb422d138a9e63a34 100644
--- a/app/src/main/java/com/futo/circles/core/Constants.kt
+++ b/app/src/main/java/org/futo/circles/core/Constants.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core
+package org.futo.circles.core
 
 const val FILE_PROVIDER_AUTHORITY_PREFIX = ".provider"
 
diff --git a/app/src/main/java/com/futo/circles/core/ErrorParser.kt b/app/src/main/java/org/futo/circles/core/ErrorParser.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/core/ErrorParser.kt
rename to app/src/main/java/org/futo/circles/core/ErrorParser.kt
index b017e563edcd5fa7ca2e6f21356d9ddb40507f2f..ecb4f7816a234a8d0a4acfb70be9240e1d807202 100644
--- a/app/src/main/java/com/futo/circles/core/ErrorParser.kt
+++ b/app/src/main/java/org/futo/circles/core/ErrorParser.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core
+package org.futo.circles.core
 
 import org.json.JSONObject
 import org.matrix.android.sdk.api.failure.Failure
diff --git a/app/src/main/java/com/futo/circles/core/ExpandableItemsDataSource.kt b/app/src/main/java/org/futo/circles/core/ExpandableItemsDataSource.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/core/ExpandableItemsDataSource.kt
rename to app/src/main/java/org/futo/circles/core/ExpandableItemsDataSource.kt
index d2582a6f3014731c2e5822c9e2ad62157ec7f8b8..1b7df4ae5d9dd51cf0e777046cd7eb4ec227fe24 100644
--- a/app/src/main/java/com/futo/circles/core/ExpandableItemsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/core/ExpandableItemsDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core
+package org.futo.circles.core
 
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
diff --git a/app/src/main/java/com/futo/circles/core/ImageUtils.kt b/app/src/main/java/org/futo/circles/core/ImageUtils.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/core/ImageUtils.kt
rename to app/src/main/java/org/futo/circles/core/ImageUtils.kt
index 00d8e7552493ffcd7686fcb4eb491b5a7cf9d56a..c8c22c1f9f36125828bbe50054a077e959f336af 100644
--- a/app/src/main/java/com/futo/circles/core/ImageUtils.kt
+++ b/app/src/main/java/org/futo/circles/core/ImageUtils.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core
+package org.futo.circles.core
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/app/src/main/java/com/futo/circles/core/SingleEventLiveData.kt b/app/src/main/java/org/futo/circles/core/SingleEventLiveData.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/core/SingleEventLiveData.kt
rename to app/src/main/java/org/futo/circles/core/SingleEventLiveData.kt
index 876a30340b69dbf2b457e5cf658f03d96c715f2a..784d1ae76a9a4a63ce372e3c35d104c1a069ee53 100644
--- a/app/src/main/java/com/futo/circles/core/SingleEventLiveData.kt
+++ b/app/src/main/java/org/futo/circles/core/SingleEventLiveData.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core
+package org.futo.circles.core
 
 import androidx.annotation.MainThread
 import androidx.lifecycle.LifecycleOwner
diff --git a/app/src/main/java/com/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt b/app/src/main/java/org/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt
rename to app/src/main/java/org/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt
index 7868e235fa0a2ce0b22882bb905e9d2fd2419f56..9d9fb3e37ee0e5096deb228cf21bf92278cffb71 100644
--- a/app/src/main/java/com/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.fragment
+package org.futo.circles.core.fragment
 
 
 import android.os.Bundle
@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.viewbinding.ViewBinding
-import com.futo.circles.R
+import org.futo.circles.R
 
 
 abstract class BaseFullscreenDialogFragment(
diff --git a/app/src/main/java/com/futo/circles/core/fragment/HasLoadingState.kt b/app/src/main/java/org/futo/circles/core/fragment/HasLoadingState.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/core/fragment/HasLoadingState.kt
rename to app/src/main/java/org/futo/circles/core/fragment/HasLoadingState.kt
index eb670085bcb9a479f73f726e6cbeb1ad028ba92f..4bdd3710cb4e735d48d8ee95b4cf4de2b1a6ae52 100644
--- a/app/src/main/java/com/futo/circles/core/fragment/HasLoadingState.kt
+++ b/app/src/main/java/org/futo/circles/core/fragment/HasLoadingState.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.core.fragment
+package org.futo.circles.core.fragment
 
 import android.view.View
 import androidx.fragment.app.Fragment
-import com.futo.circles.extensions.setEnabledViews
-import com.futo.circles.view.LoadingButton
+import org.futo.circles.extensions.setEnabledViews
+import org.futo.circles.view.LoadingButton
 
 interface HasLoadingState {
 
diff --git a/app/src/main/java/com/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt b/app/src/main/java/org/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt
rename to app/src/main/java/org/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt
index af6323f4ce7dacb563664a98b8088b4bca72b997..e2cad2cc8d9290ea2eaa2fe19fcaa7815e3c6f23 100644
--- a/app/src/main/java/com/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt
+++ b/app/src/main/java/org/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.fragment
+package org.futo.circles.core.fragment
 
 import android.content.Context
 import androidx.activity.OnBackPressedCallback
diff --git a/app/src/main/java/com/futo/circles/core/image_picker/ImagePickerHelper.kt b/app/src/main/java/org/futo/circles/core/image_picker/ImagePickerHelper.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/core/image_picker/ImagePickerHelper.kt
rename to app/src/main/java/org/futo/circles/core/image_picker/ImagePickerHelper.kt
index 3907ab01f037c5028b0b3da6d167441208ea17cc..e8422001987288e52b36b0e4afb3210a4e9a4dfe 100644
--- a/app/src/main/java/com/futo/circles/core/image_picker/ImagePickerHelper.kt
+++ b/app/src/main/java/org/futo/circles/core/image_picker/ImagePickerHelper.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.core.image_picker
+package org.futo.circles.core.image_picker
 
 import android.app.Activity
 import android.net.Uri
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
-import com.futo.circles.R
-import com.futo.circles.extensions.getContentUriForFileUri
-import com.futo.circles.extensions.showError
+import org.futo.circles.R
+import org.futo.circles.extensions.getContentUriForFileUri
+import org.futo.circles.extensions.showError
 import com.github.dhaval2404.imagepicker.ImagePicker
 
 class ImagePickerHelper(private val fragment: Fragment) : PickImageDialogListener {
diff --git a/app/src/main/java/com/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt b/app/src/main/java/org/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt
rename to app/src/main/java/org/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt
index 35670a667f381559d02949d6a207fcad867b6cae..cfbcd7765926c0f7cdff51a7ef75cfc035261d57 100644
--- a/app/src/main/java/com/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.image_picker
+package org.futo.circles.core.image_picker
 
 import android.app.Dialog
 import android.net.Uri
@@ -6,11 +6,11 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.os.bundleOf
 import androidx.fragment.app.setFragmentResult
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.databinding.PickGalleryImageDialogFragmentBinding
-import com.futo.circles.feature.photos.PhotosFragment
-import com.futo.circles.feature.photos.gallery.GalleryFragment
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.databinding.PickGalleryImageDialogFragmentBinding
+import org.futo.circles.feature.photos.PhotosFragment
+import org.futo.circles.feature.photos.gallery.GalleryFragment
 
 interface PickGalleryListener {
     fun onGalleryChosen(id: String)
diff --git a/app/src/main/java/com/futo/circles/core/image_picker/PickImageDialog.kt b/app/src/main/java/org/futo/circles/core/image_picker/PickImageDialog.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/core/image_picker/PickImageDialog.kt
rename to app/src/main/java/org/futo/circles/core/image_picker/PickImageDialog.kt
index 3fd3c2955e46b9d58bdebe3efb93d315e0728758..c3c3983f0f1082da5f496a162e2b11a886e6dfa3 100644
--- a/app/src/main/java/com/futo/circles/core/image_picker/PickImageDialog.kt
+++ b/app/src/main/java/org/futo/circles/core/image_picker/PickImageDialog.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.core.image_picker
+package org.futo.circles.core.image_picker
 
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatDialog
-import com.futo.circles.databinding.PickImageDialogBinding
+import org.futo.circles.databinding.PickImageDialogBinding
 
 
 enum class PickImageMethod { Camera, Gallery, Device }
diff --git a/app/src/main/java/com/futo/circles/core/list/BaseRecycleViewDecoration.kt b/app/src/main/java/org/futo/circles/core/list/BaseRecycleViewDecoration.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/core/list/BaseRecycleViewDecoration.kt
rename to app/src/main/java/org/futo/circles/core/list/BaseRecycleViewDecoration.kt
index db67dde0d155238afc65dfb24630bbf173dbb0b9..002723a5c60062170a9a1e023bae09f89283bc32 100644
--- a/app/src/main/java/com/futo/circles/core/list/BaseRecycleViewDecoration.kt
+++ b/app/src/main/java/org/futo/circles/core/list/BaseRecycleViewDecoration.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.list
+package org.futo.circles.core.list
 
 import android.graphics.Canvas
 import android.graphics.Rect
diff --git a/app/src/main/java/com/futo/circles/core/list/BaseRecyclerView.kt b/app/src/main/java/org/futo/circles/core/list/BaseRecyclerView.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/core/list/BaseRecyclerView.kt
rename to app/src/main/java/org/futo/circles/core/list/BaseRecyclerView.kt
index b7a7e82182422137741153c151beef676d86a1ed..dbc8c603f601a0be58253c20cfa24635a5e08e81 100644
--- a/app/src/main/java/com/futo/circles/core/list/BaseRecyclerView.kt
+++ b/app/src/main/java/org/futo/circles/core/list/BaseRecyclerView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.list
+package org.futo.circles.core.list
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/com/futo/circles/core/list/ChipItemViewHolder.kt b/app/src/main/java/org/futo/circles/core/list/ChipItemViewHolder.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/core/list/ChipItemViewHolder.kt
rename to app/src/main/java/org/futo/circles/core/list/ChipItemViewHolder.kt
index d18b83b6ab05d5dad944b2ae9aceab8f585ca81b..30f1f4d54827f459c99eb95c5911a3f1926c5f89 100644
--- a/app/src/main/java/com/futo/circles/core/list/ChipItemViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/core/list/ChipItemViewHolder.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.core.list
+package org.futo.circles.core.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.databinding.ChipListItemBinding
+import org.futo.circles.databinding.ChipListItemBinding
 
 class ChipItemViewHolder(
     parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/core/list/IdEntity.kt b/app/src/main/java/org/futo/circles/core/list/IdEntity.kt
similarity index 61%
rename from app/src/main/java/com/futo/circles/core/list/IdEntity.kt
rename to app/src/main/java/org/futo/circles/core/list/IdEntity.kt
index b4b428a562180b34b88b45a3dc8e07f3c902295a..10b2548cc8dbf881d64dddc91a54ade201f7cf79 100644
--- a/app/src/main/java/com/futo/circles/core/list/IdEntity.kt
+++ b/app/src/main/java/org/futo/circles/core/list/IdEntity.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.list
+package org.futo.circles.core.list
 
 interface IdEntity<out IdClass> {
     val id: IdClass
diff --git a/app/src/main/java/com/futo/circles/core/list/RoomsDividerDecoration.kt b/app/src/main/java/org/futo/circles/core/list/RoomsDividerDecoration.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/core/list/RoomsDividerDecoration.kt
rename to app/src/main/java/org/futo/circles/core/list/RoomsDividerDecoration.kt
index 9f420a2eb725e3b13ac8cef3b0182e356d1db400..581e8095782726ae8abdf7c8c5d680ba69634c80 100644
--- a/app/src/main/java/com/futo/circles/core/list/RoomsDividerDecoration.kt
+++ b/app/src/main/java/org/futo/circles/core/list/RoomsDividerDecoration.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.list
+package org.futo.circles.core.list
 
 import android.content.Context
 import android.graphics.Canvas
diff --git a/app/src/main/java/com/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt b/app/src/main/java/org/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt
rename to app/src/main/java/org/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt
index 4da054049e7cc6a223edcc6f48c0ec41b298fd29..598076af9e47ae543556aa191fa23a4cf2cb4576 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.core.matrix.auth
+package org.futo.circles.core.matrix.auth
 
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.auth.UserPasswordAuth
diff --git a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt
rename to app/src/main/java/org/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt
index d278448e2703b82782c74cf0d6326758c2cd4f2d..21340bf6f7a71bd8013fe2f8ab6e8c9267536acd 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.core.matrix.pass_phrase
+package org.futo.circles.core.matrix.pass_phrase
 
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatDialog
-import com.futo.circles.databinding.LoadingDialogBinding
-import com.futo.circles.model.LoadingData
+import org.futo.circles.databinding.LoadingDialogBinding
+import org.futo.circles.model.LoadingData
 
 
 class LoadingDialog(context: Context) : AppCompatDialog(context) {
diff --git a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt
rename to app/src/main/java/org/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt
index 17d8a4aeae1a3ba5a92017bc11b6b8a0534fef3a..904f002d4a0ac8d0942bc8541a12a44725bcc8a6 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.core.matrix.pass_phrase.create
+package org.futo.circles.core.matrix.pass_phrase.create
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.model.LoadingData
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.model.LoadingData
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupLastVersionResult
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysVersion
diff --git a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt
rename to app/src/main/java/org/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt
index 13619c37c73c6724b7bb00bfd3ed11d681107c66..343754af01d9d80dec136477807da5d9e74ae2a7 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.core.matrix.pass_phrase.restore
+package org.futo.circles.core.matrix.pass_phrase.restore
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.model.LoadingData
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.model.LoadingData
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.listeners.StepProgressListener
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupLastVersionResult
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
diff --git a/app/src/main/java/com/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt b/app/src/main/java/org/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt
rename to app/src/main/java/org/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt
index 60fe5169df668154bccfc20898c1a4d01f22025c..31cfdfc949a8faa6431f9e81220ea0fb52c57143 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.core.matrix.room
+package org.futo.circles.core.matrix.room
 
 import android.content.Context
-import com.futo.circles.R
-import com.futo.circles.model.*
+import org.futo.circles.R
+import org.futo.circles.model.*
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
diff --git a/app/src/main/java/com/futo/circles/core/matrix/room/CreateRoomDataSource.kt b/app/src/main/java/org/futo/circles/core/matrix/room/CreateRoomDataSource.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/core/matrix/room/CreateRoomDataSource.kt
rename to app/src/main/java/org/futo/circles/core/matrix/room/CreateRoomDataSource.kt
index 1aaff65305c85fb3e7be980a9cedb673f200ce7d..b4c9de2aaa77953c8bd09ecb1f3bdfafec0ca6cd 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/room/CreateRoomDataSource.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/room/CreateRoomDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.core.matrix.room
+package org.futo.circles.core.matrix.room
 
 import android.content.Context
 import android.net.Uri
-import com.futo.circles.model.Circle
-import com.futo.circles.model.CirclesRoom
-import com.futo.circles.model.Timeline
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.model.Circle
+import org.futo.circles.model.CirclesRoom
+import org.futo.circles.model.Timeline
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
diff --git a/app/src/main/java/com/futo/circles/core/matrix/room/RoomRelationsBuilder.kt b/app/src/main/java/org/futo/circles/core/matrix/room/RoomRelationsBuilder.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/core/matrix/room/RoomRelationsBuilder.kt
rename to app/src/main/java/org/futo/circles/core/matrix/room/RoomRelationsBuilder.kt
index 62f473380d12d44bad9fc29c416d752c4bd41342..b82e9e5efdf7ffe5ff6799a0943768e2cb1f4a75 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/room/RoomRelationsBuilder.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/room/RoomRelationsBuilder.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.core.matrix.room
+package org.futo.circles.core.matrix.room
 
-import com.futo.circles.BuildConfig
-import com.futo.circles.model.Group
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.BuildConfig
+import org.futo.circles.model.Group
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
@@ -54,7 +54,7 @@ class RoomRelationsBuilder {
         return roomWithTagId?.let { session?.getRoom(it) }
     }
 
-    private fun getHomeServerDomain() = BuildConfig.MATRIX_HOME_SERVER_URL
+    private fun getHomeServerDomain() = org.futo.circles.BuildConfig.MATRIX_HOME_SERVER_URL
         .substringAfter("//").replace("/", "")
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/core/rooms/RoomsFragment.kt b/app/src/main/java/org/futo/circles/core/rooms/RoomsFragment.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/core/rooms/RoomsFragment.kt
rename to app/src/main/java/org/futo/circles/core/rooms/RoomsFragment.kt
index 28d8501e9cca3e5c8e0374a9c8ee8c38bdc29024..f417880d31e8b4662f4ca5c106bbec97fe901a78 100644
--- a/app/src/main/java/com/futo/circles/core/rooms/RoomsFragment.kt
+++ b/app/src/main/java/org/futo/circles/core/rooms/RoomsFragment.kt
@@ -1,21 +1,21 @@
-package com.futo.circles.core.rooms
+package org.futo.circles.core.rooms
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DividerItemDecoration
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.list.BaseRvDecoration
-import com.futo.circles.core.list.RoomsDividerDecoration
-import com.futo.circles.core.rooms.list.GalleryViewHolder
-import com.futo.circles.core.rooms.list.RoomListItemViewType
-import com.futo.circles.core.rooms.list.RoomsListAdapter
-import com.futo.circles.databinding.RoomsFragmentBinding
-import com.futo.circles.extensions.bindToFab
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.R
+import org.futo.circles.core.list.BaseRvDecoration
+import org.futo.circles.core.list.RoomsDividerDecoration
+import org.futo.circles.core.rooms.list.GalleryViewHolder
+import org.futo.circles.core.rooms.list.RoomListItemViewType
+import org.futo.circles.core.rooms.list.RoomsListAdapter
+import org.futo.circles.databinding.RoomsFragmentBinding
+import org.futo.circles.extensions.bindToFab
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.model.RoomListItem
 
 interface HasInvites {
     fun onAcceptInviteClicked(room: RoomListItem)
diff --git a/app/src/main/java/com/futo/circles/core/rooms/RoomsViewModel.kt b/app/src/main/java/org/futo/circles/core/rooms/RoomsViewModel.kt
similarity index 60%
rename from app/src/main/java/com/futo/circles/core/rooms/RoomsViewModel.kt
rename to app/src/main/java/org/futo/circles/core/rooms/RoomsViewModel.kt
index e4869ab49def68f13d6c9374b9e59ea00bbafb31..187a5dc2e9db6346af28c6a62014221ec76a77cd 100644
--- a/app/src/main/java/com/futo/circles/core/rooms/RoomsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/core/rooms/RoomsViewModel.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.core.rooms
+package org.futo.circles.core.rooms
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.core.rooms.data_source.RoomsDataSource
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.core.rooms.data_source.RoomsDataSource
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.model.RoomListItem
 
 
 abstract class RoomsViewModel(
diff --git a/app/src/main/java/com/futo/circles/core/rooms/data_source/RoomsDataSource.kt b/app/src/main/java/org/futo/circles/core/rooms/data_source/RoomsDataSource.kt
similarity index 65%
rename from app/src/main/java/com/futo/circles/core/rooms/data_source/RoomsDataSource.kt
rename to app/src/main/java/org/futo/circles/core/rooms/data_source/RoomsDataSource.kt
index 1c2f08a9b375ba206fa2f8f5e327a277f883cae4..aedcf179309cbbf346e8733e2716a39c2afc3401 100644
--- a/app/src/main/java/com/futo/circles/core/rooms/data_source/RoomsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/core/rooms/data_source/RoomsDataSource.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.core.rooms.data_source
+package org.futo.circles.core.rooms.data_source
 
-import com.futo.circles.extensions.createResult
-import com.futo.circles.model.RoomListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.createResult
+import org.futo.circles.model.RoomListItem
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 abstract class RoomsDataSource {
diff --git a/app/src/main/java/com/futo/circles/core/rooms/list/RoomViewHolder.kt b/app/src/main/java/org/futo/circles/core/rooms/list/RoomViewHolder.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/core/rooms/list/RoomViewHolder.kt
rename to app/src/main/java/org/futo/circles/core/rooms/list/RoomViewHolder.kt
index 0beda9af0beadc7138b5ffc8354c86dc52dba3c7..dd06cf13245bd2cfe927498b0b169cfa0e44a6e6 100644
--- a/app/src/main/java/com/futo/circles/core/rooms/list/RoomViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/core/rooms/list/RoomViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.rooms.list
+package org.futo.circles.core.rooms.list
 
 import android.text.format.DateUtils
 import android.view.View
@@ -6,14 +6,14 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.*
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setIsEncryptedIcon
-import com.futo.circles.model.*
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.*
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setIsEncryptedIcon
+import org.futo.circles.model.*
 
 abstract class RoomViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     abstract fun bind(data: RoomListItem)
diff --git a/app/src/main/java/com/futo/circles/core/rooms/list/RoomsListAdapter.kt b/app/src/main/java/org/futo/circles/core/rooms/list/RoomsListAdapter.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/core/rooms/list/RoomsListAdapter.kt
rename to app/src/main/java/org/futo/circles/core/rooms/list/RoomsListAdapter.kt
index ea6fdfe1e274131639560f558735ca4feaa8637e..96e0e771fe7f22aa2fa7d332befcb6eff29c4e83 100644
--- a/app/src/main/java/com/futo/circles/core/rooms/list/RoomsListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/core/rooms/list/RoomsListAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.core.rooms.list
+package org.futo.circles.core.rooms.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.*
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.*
 
 enum class RoomListItemViewType { JoinedGroup, JoinedCircle, InvitedGroup, InvitedCircle, Gallery }
 
diff --git a/app/src/main/java/com/futo/circles/di/DataSourceModule.kt b/app/src/main/java/org/futo/circles/di/DataSourceModule.kt
similarity index 51%
rename from app/src/main/java/com/futo/circles/di/DataSourceModule.kt
rename to app/src/main/java/org/futo/circles/di/DataSourceModule.kt
index aa4d53883e5266f0d0c1c0e5ff634ca4b932d9c7..b8935b10819205645820783e5237c83aa46c74e6 100644
--- a/app/src/main/java/com/futo/circles/di/DataSourceModule.kt
+++ b/app/src/main/java/org/futo/circles/di/DataSourceModule.kt
@@ -1,47 +1,47 @@
-package com.futo.circles.di
+package org.futo.circles.di
 
-import com.futo.circles.core.matrix.auth.AuthConfirmationProvider
-import com.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
-import com.futo.circles.core.matrix.pass_phrase.restore.RestorePassPhraseDataSource
-import com.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
-import com.futo.circles.core.matrix.room.CreateRoomDataSource
-import com.futo.circles.core.matrix.room.RoomRelationsBuilder
-import com.futo.circles.feature.circles.CirclesDataSource
-import com.futo.circles.feature.circles.accept_invite.AcceptCircleInviteDataSource
-import com.futo.circles.feature.circles.following.FollowingDataSource
-import com.futo.circles.feature.groups.GroupsDataSource
-import com.futo.circles.feature.log_in.LoginDataSource
-import com.futo.circles.feature.people.PeopleDataSource
-import com.futo.circles.feature.people.UserOptionsDataSource
-import com.futo.circles.feature.people.user.UserDataSource
-import com.futo.circles.feature.photos.PhotosDataSource
-import com.futo.circles.feature.photos.preview.GalleryImageDataSource
-import com.futo.circles.feature.photos.save.SelectGalleryDataSource
-import com.futo.circles.feature.room.LeaveRoomDataSource
-import com.futo.circles.feature.room.invite.InviteMembersDataSource
-import com.futo.circles.feature.room.manage_members.ManageMembersDataSource
-import com.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelDataSource
-import com.futo.circles.feature.room.select_users.SelectUsersDataSource
-import com.futo.circles.feature.room.update_room.UpdateRoomDataSource
-import com.futo.circles.feature.settings.SettingsDataSource
-import com.futo.circles.feature.settings.active_sessions.ActiveSessionsDataSource
-import com.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionDataSource
-import com.futo.circles.feature.settings.change_password.ChangePasswordDataSource
-import com.futo.circles.feature.settings.deactivate.DeactivateAccountDataSource
-import com.futo.circles.feature.sign_up.SignUpDataSource
-import com.futo.circles.feature.sign_up.setup_circles.SetupCirclesDataSource
-import com.futo.circles.feature.sign_up.setup_profile.SetupProfileDataSource
-import com.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeDataSource
-import com.futo.circles.feature.sign_up.terms.AcceptTermsDataSource
-import com.futo.circles.feature.sign_up.validate_email.ValidateEmailDataSource
-import com.futo.circles.feature.sign_up.validate_token.ValidateTokenDataSource
-import com.futo.circles.feature.timeline.data_source.SendMessageDataSource
-import com.futo.circles.feature.timeline.data_source.TimelineBuilder
-import com.futo.circles.feature.timeline.data_source.TimelineDataSource
-import com.futo.circles.feature.timeline.post.PostOptionsDataSource
-import com.futo.circles.feature.timeline.post.emoji.EmojiDataSource
-import com.futo.circles.feature.timeline.post.report.ReportDataSource
-import com.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.core.matrix.auth.AuthConfirmationProvider
+import org.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
+import org.futo.circles.core.matrix.pass_phrase.restore.RestorePassPhraseDataSource
+import org.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
+import org.futo.circles.core.matrix.room.CreateRoomDataSource
+import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.feature.circles.CirclesDataSource
+import org.futo.circles.feature.circles.accept_invite.AcceptCircleInviteDataSource
+import org.futo.circles.feature.circles.following.FollowingDataSource
+import org.futo.circles.feature.groups.GroupsDataSource
+import org.futo.circles.feature.log_in.LoginDataSource
+import org.futo.circles.feature.people.PeopleDataSource
+import org.futo.circles.feature.people.UserOptionsDataSource
+import org.futo.circles.feature.people.user.UserDataSource
+import org.futo.circles.feature.photos.PhotosDataSource
+import org.futo.circles.feature.photos.preview.GalleryImageDataSource
+import org.futo.circles.feature.photos.save.SelectGalleryDataSource
+import org.futo.circles.feature.room.LeaveRoomDataSource
+import org.futo.circles.feature.room.invite.InviteMembersDataSource
+import org.futo.circles.feature.room.manage_members.ManageMembersDataSource
+import org.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelDataSource
+import org.futo.circles.feature.room.select_users.SelectUsersDataSource
+import org.futo.circles.feature.room.update_room.UpdateRoomDataSource
+import org.futo.circles.feature.settings.SettingsDataSource
+import org.futo.circles.feature.settings.active_sessions.ActiveSessionsDataSource
+import org.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionDataSource
+import org.futo.circles.feature.settings.change_password.ChangePasswordDataSource
+import org.futo.circles.feature.settings.deactivate.DeactivateAccountDataSource
+import org.futo.circles.feature.sign_up.SignUpDataSource
+import org.futo.circles.feature.sign_up.setup_circles.SetupCirclesDataSource
+import org.futo.circles.feature.sign_up.setup_profile.SetupProfileDataSource
+import org.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeDataSource
+import org.futo.circles.feature.sign_up.terms.AcceptTermsDataSource
+import org.futo.circles.feature.sign_up.validate_email.ValidateEmailDataSource
+import org.futo.circles.feature.sign_up.validate_token.ValidateTokenDataSource
+import org.futo.circles.feature.timeline.data_source.SendMessageDataSource
+import org.futo.circles.feature.timeline.data_source.TimelineBuilder
+import org.futo.circles.feature.timeline.data_source.TimelineDataSource
+import org.futo.circles.feature.timeline.post.PostOptionsDataSource
+import org.futo.circles.feature.timeline.post.emoji.EmojiDataSource
+import org.futo.circles.feature.timeline.post.report.ReportDataSource
+import org.futo.circles.model.CircleRoomTypeArg
 import org.koin.dsl.module
 
 val dataSourceModule = module {
diff --git a/app/src/main/java/com/futo/circles/di/Modules.kt b/app/src/main/java/org/futo/circles/di/Modules.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/di/Modules.kt
rename to app/src/main/java/org/futo/circles/di/Modules.kt
index d7324146b4b59a42da41d2f7fb12a8fc6514a004..3c41617b3f743163b62aea0a5f76b917152c99e0 100644
--- a/app/src/main/java/com/futo/circles/di/Modules.kt
+++ b/app/src/main/java/org/futo/circles/di/Modules.kt
@@ -1,3 +1,3 @@
-package com.futo.circles.di
+package org.futo.circles.di
 
 val applicationModules = listOf(uiModule, dataSourceModule)
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/di/UiModule.kt b/app/src/main/java/org/futo/circles/di/UiModule.kt
similarity index 58%
rename from app/src/main/java/com/futo/circles/di/UiModule.kt
rename to app/src/main/java/org/futo/circles/di/UiModule.kt
index b51e004dacd497326de530fd3189aa4cc6228848..732215794690a409080fbf818fb6b7e7a3d8a48e 100644
--- a/app/src/main/java/com/futo/circles/di/UiModule.kt
+++ b/app/src/main/java/org/futo/circles/di/UiModule.kt
@@ -1,39 +1,39 @@
-package com.futo.circles.di
+package org.futo.circles.di
 
-import com.futo.circles.feature.circles.CirclesViewModel
-import com.futo.circles.feature.circles.accept_invite.AcceptCircleInviteViewModel
-import com.futo.circles.feature.circles.following.FollowingViewModel
-import com.futo.circles.feature.groups.GroupsViewModel
-import com.futo.circles.feature.log_in.LogInViewModel
-import com.futo.circles.feature.people.PeopleViewModel
-import com.futo.circles.feature.people.user.UserViewModel
-import com.futo.circles.feature.photos.PhotosViewModel
-import com.futo.circles.feature.photos.gallery.GalleryViewModel
-import com.futo.circles.feature.photos.preview.GalleryImageViewModel
-import com.futo.circles.feature.photos.save.SaveToGalleryViewModel
-import com.futo.circles.feature.room.create_room.CreateRoomViewModel
-import com.futo.circles.feature.room.invite.InviteMembersViewModel
-import com.futo.circles.feature.room.manage_members.ManageMembersViewModel
-import com.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelViewModel
-import com.futo.circles.feature.room.select_users.SelectUsersViewModel
-import com.futo.circles.feature.room.update_room.UpdateRoomViewModel
-import com.futo.circles.feature.settings.SettingsViewModel
-import com.futo.circles.feature.settings.active_sessions.ActiveSessionsViewModel
-import com.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionViewModel
-import com.futo.circles.feature.settings.change_password.ChangePasswordViewModel
-import com.futo.circles.feature.settings.deactivate.DeactivateAccountViewModel
-import com.futo.circles.feature.settings.edit_profile.EditProfileViewModel
-import com.futo.circles.feature.sign_up.SignUpViewModel
-import com.futo.circles.feature.sign_up.setup_circles.SetupCirclesViewModel
-import com.futo.circles.feature.sign_up.setup_profile.SetupProfileViewModel
-import com.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeViewModel
-import com.futo.circles.feature.sign_up.terms.AcceptTermsViewModel
-import com.futo.circles.feature.sign_up.validate_email.ValidateEmailViewModel
-import com.futo.circles.feature.sign_up.validate_token.ValidateTokenViewModel
-import com.futo.circles.feature.timeline.TimelineViewModel
-import com.futo.circles.feature.timeline.post.emoji.EmojiViewModel
-import com.futo.circles.feature.timeline.post.report.ReportViewModel
-import com.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.feature.circles.CirclesViewModel
+import org.futo.circles.feature.circles.accept_invite.AcceptCircleInviteViewModel
+import org.futo.circles.feature.circles.following.FollowingViewModel
+import org.futo.circles.feature.groups.GroupsViewModel
+import org.futo.circles.feature.log_in.LogInViewModel
+import org.futo.circles.feature.people.PeopleViewModel
+import org.futo.circles.feature.people.user.UserViewModel
+import org.futo.circles.feature.photos.PhotosViewModel
+import org.futo.circles.feature.photos.gallery.GalleryViewModel
+import org.futo.circles.feature.photos.preview.GalleryImageViewModel
+import org.futo.circles.feature.photos.save.SaveToGalleryViewModel
+import org.futo.circles.feature.room.create_room.CreateRoomViewModel
+import org.futo.circles.feature.room.invite.InviteMembersViewModel
+import org.futo.circles.feature.room.manage_members.ManageMembersViewModel
+import org.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelViewModel
+import org.futo.circles.feature.room.select_users.SelectUsersViewModel
+import org.futo.circles.feature.room.update_room.UpdateRoomViewModel
+import org.futo.circles.feature.settings.SettingsViewModel
+import org.futo.circles.feature.settings.active_sessions.ActiveSessionsViewModel
+import org.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionViewModel
+import org.futo.circles.feature.settings.change_password.ChangePasswordViewModel
+import org.futo.circles.feature.settings.deactivate.DeactivateAccountViewModel
+import org.futo.circles.feature.settings.edit_profile.EditProfileViewModel
+import org.futo.circles.feature.sign_up.SignUpViewModel
+import org.futo.circles.feature.sign_up.setup_circles.SetupCirclesViewModel
+import org.futo.circles.feature.sign_up.setup_profile.SetupProfileViewModel
+import org.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeViewModel
+import org.futo.circles.feature.sign_up.terms.AcceptTermsViewModel
+import org.futo.circles.feature.sign_up.validate_email.ValidateEmailViewModel
+import org.futo.circles.feature.sign_up.validate_token.ValidateTokenViewModel
+import org.futo.circles.feature.timeline.TimelineViewModel
+import org.futo.circles.feature.timeline.post.emoji.EmojiViewModel
+import org.futo.circles.feature.timeline.post.report.ReportViewModel
+import org.futo.circles.model.CircleRoomTypeArg
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.parameter.parametersOf
 import org.koin.dsl.module
diff --git a/app/src/main/java/com/futo/circles/extensions/BitmapExtensions.kt b/app/src/main/java/org/futo/circles/extensions/BitmapExtensions.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/extensions/BitmapExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/BitmapExtensions.kt
index 41e0aaf64812cff00a292b04dadaa66ce0bfd51a..8d5974f49e26c773ef07e55291f3903f01527ff9 100644
--- a/app/src/main/java/com/futo/circles/extensions/BitmapExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/BitmapExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/app/src/main/java/com/futo/circles/extensions/ContextExtensions.kt b/app/src/main/java/org/futo/circles/extensions/ContextExtensions.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/extensions/ContextExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/ContextExtensions.kt
index 3301c864e4a83c6436a047a2ac11c31f2dd5c219..601355a47b4951e33eb3bd1957ad86cc2b62368a 100644
--- a/app/src/main/java/com/futo/circles/extensions/ContextExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/ContextExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import android.content.Context
 import androidx.annotation.DimenRes
diff --git a/app/src/main/java/com/futo/circles/extensions/CoroutinesExtensions.kt b/app/src/main/java/org/futo/circles/extensions/CoroutinesExtensions.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/extensions/CoroutinesExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/CoroutinesExtensions.kt
index 62fa8327c069ff319a4c25fa7a3bc33448e906f9..02745e79b6ce77c88f0dd2f04e07cccb9e330a7c 100644
--- a/app/src/main/java/com/futo/circles/extensions/CoroutinesExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/CoroutinesExtensions.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
-import com.futo.circles.extensions.DispatcherHolder.BG
-import com.futo.circles.extensions.DispatcherHolder.UI
+import org.futo.circles.extensions.DispatcherHolder.BG
+import org.futo.circles.extensions.DispatcherHolder.UI
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/futo/circles/extensions/FileExtensions.kt b/app/src/main/java/org/futo/circles/extensions/FileExtensions.kt
similarity index 73%
rename from app/src/main/java/com/futo/circles/extensions/FileExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/FileExtensions.kt
index 76aacd5657d3cfda4b269e5b30569c768bf1130c..a67b83e060af753111e0a8e54e8a1373229ef5f6 100644
--- a/app/src/main/java/com/futo/circles/extensions/FileExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/FileExtensions.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import android.content.Context
 import android.net.Uri
 import androidx.core.content.FileProvider
-import com.futo.circles.core.FILE_PROVIDER_AUTHORITY_PREFIX
+import org.futo.circles.core.FILE_PROVIDER_AUTHORITY_PREFIX
 import java.io.File
 
 fun File.getUri(context: Context): Uri = FileProvider.getUriForFile(
diff --git a/app/src/main/java/com/futo/circles/extensions/FragmentExtensions.kt b/app/src/main/java/org/futo/circles/extensions/FragmentExtensions.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/extensions/FragmentExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/FragmentExtensions.kt
index 27d097d8095d67a527ad84192053ab9a8f0c91e8..c16aa70131ca16c316371b110f2266e601e88135 100644
--- a/app/src/main/java/com/futo/circles/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/FragmentExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import android.annotation.SuppressLint
 import android.graphics.Color
@@ -14,7 +14,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
-import com.futo.circles.R
+import org.futo.circles.R
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 
diff --git a/app/src/main/java/com/futo/circles/extensions/GalleryImageItemExtensions.kt b/app/src/main/java/org/futo/circles/extensions/GalleryImageItemExtensions.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/extensions/GalleryImageItemExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/GalleryImageItemExtensions.kt
index 8aec47aa9e2b8e2ed452d49d1270aa9f6a2fd0d5..ee0c3b85be2845b4780711c57dcc458dfc05d366 100644
--- a/app/src/main/java/com/futo/circles/extensions/GalleryImageItemExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/GalleryImageItemExtensions.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import android.util.Size
 import android.widget.ImageView
-import com.futo.circles.R
-import com.futo.circles.model.GalleryImageListItem
+import org.futo.circles.R
+import org.futo.circles.model.GalleryImageListItem
 
 fun GalleryImageListItem.loadInto(imageView: ImageView) {
     if (imageContent.fileUrl.startsWith(UriContentScheme)) {
diff --git a/app/src/main/java/com/futo/circles/extensions/ImageViewExtensions.kt b/app/src/main/java/org/futo/circles/extensions/ImageViewExtensions.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/extensions/ImageViewExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/ImageViewExtensions.kt
index 62a3947118cf8b8771b8e59978bbc18ee9ebb114..ce7d840e2b3e67b4b437ad410b2d49c038283ed6 100644
--- a/app/src/main/java/com/futo/circles/extensions/ImageViewExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/ImageViewExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -9,10 +9,10 @@ import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.target.Target
-import com.futo.circles.R
-import com.futo.circles.glide.GlideApp
-import com.futo.circles.model.ImageContent
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.glide.GlideApp
+import org.futo.circles.model.ImageContent
+import org.futo.circles.provider.MatrixSessionProvider
 
 
 fun ImageView.loadImage(
@@ -38,7 +38,7 @@ fun ImageView.loadEncryptedImage(
     val loadHeight = if (loadOriginalSize) Target.SIZE_ORIGINAL else preferredSize?.height ?: height
 
     content.elementToDecrypt?.let {
-        GlideApp
+        org.futo.circles.glide.GlideApp
             .with(context)
             .load(content)
             .transition(DrawableTransitionOptions.withCrossFade())
diff --git a/app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt b/app/src/main/java/org/futo/circles/extensions/LiveDataExtensions.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/LiveDataExtensions.kt
index b7c79b20622cb2a2ca62380343cd56aac1d943b9..921d7a541a4fe0321cfe17010152cabe097c3f11 100644
--- a/app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/LiveDataExtensions.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LiveData
-import com.futo.circles.core.ErrorParser
-import com.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.ErrorParser
+import org.futo.circles.core.fragment.HasLoadingState
 
 fun <T> LiveData<Response<T>>.observeResponse(
     fragment: Fragment,
diff --git a/app/src/main/java/com/futo/circles/extensions/MatrixRoomExtensions.kt b/app/src/main/java/org/futo/circles/extensions/MatrixRoomExtensions.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/extensions/MatrixRoomExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/MatrixRoomExtensions.kt
index 227d92b8a5af8ce121485f4312a90a5326c3b14b..ae9523ea709bb7f92f36d3af75ec6c9af669bf45 100644
--- a/app/src/main/java/com/futo/circles/extensions/MatrixRoomExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/MatrixRoomExtensions.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
-import com.futo.circles.model.TIMELINE_TAG
-import com.futo.circles.model.TIMELINE_TYPE
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.model.TIMELINE_TAG
+import org.futo.circles.model.TIMELINE_TYPE
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
 
diff --git a/app/src/main/java/com/futo/circles/extensions/MatrixSessionExtensions.kt b/app/src/main/java/org/futo/circles/extensions/MatrixSessionExtensions.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/extensions/MatrixSessionExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/MatrixSessionExtensions.kt
index dab47c28ffb4f2b0313de8e595f2b6c7ee0ef3e1..4fca3e34870f3b38cc07be0eaaf5e2f0f5ded89f 100644
--- a/app/src/main/java/com/futo/circles/extensions/MatrixSessionExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/MatrixSessionExtensions.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import android.util.Size
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.provider.MatrixSessionProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
diff --git a/app/src/main/java/com/futo/circles/extensions/MatrixTermsExtension.kt b/app/src/main/java/org/futo/circles/extensions/MatrixTermsExtension.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/extensions/MatrixTermsExtension.kt
rename to app/src/main/java/org/futo/circles/extensions/MatrixTermsExtension.kt
index 66edd7671e236d3e7c1e2ebaada913bf626c9fa4..9a2810c0fdd5d5b7dc9e691a85bbce89594ef0a6 100644
--- a/app/src/main/java/com/futo/circles/extensions/MatrixTermsExtension.kt
+++ b/app/src/main/java/org/futo/circles/extensions/MatrixTermsExtension.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 
-import com.futo.circles.model.TermsListItem
+import org.futo.circles.model.TermsListItem
 import org.matrix.android.sdk.api.auth.registration.TermPolicies
 import org.matrix.android.sdk.api.auth.toLocalizedLoginTerms
 
diff --git a/app/src/main/java/com/futo/circles/extensions/MatrixUserRoleExtensions.kt b/app/src/main/java/org/futo/circles/extensions/MatrixUserRoleExtensions.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/extensions/MatrixUserRoleExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/MatrixUserRoleExtensions.kt
index 6bd5e651e39ea5e33cb5cb9361bc5cfd305bf360..897cb54dd00cd869e79afce51f712f63a2933bcc 100644
--- a/app/src/main/java/com/futo/circles/extensions/MatrixUserRoleExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/MatrixUserRoleExtensions.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
-import com.futo.circles.R
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.getRoom
diff --git a/app/src/main/java/com/futo/circles/extensions/RecyclerViewExtensions.kt b/app/src/main/java/org/futo/circles/extensions/RecyclerViewExtensions.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/extensions/RecyclerViewExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/RecyclerViewExtensions.kt
index 7a375c134bb8dc862ecf74ae14b1f0c54406d0c0..9c8481c440b9918426249d49a4e68d1305e13c7b 100644
--- a/app/src/main/java/com/futo/circles/extensions/RecyclerViewExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/RecyclerViewExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 
 import android.view.View
diff --git a/app/src/main/java/com/futo/circles/extensions/SearchViewExtensions.kt b/app/src/main/java/org/futo/circles/extensions/SearchViewExtensions.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/extensions/SearchViewExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/SearchViewExtensions.kt
index a76978cbb59f59bf2124d69eee4945cc5b20d611..cd54968a356514703b997369456721a1bfb703ea 100644
--- a/app/src/main/java/com/futo/circles/extensions/SearchViewExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/SearchViewExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import androidx.appcompat.widget.SearchView
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/app/src/main/java/com/futo/circles/extensions/StringExtensions.kt b/app/src/main/java/org/futo/circles/extensions/StringExtensions.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/extensions/StringExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/StringExtensions.kt
index 9921841e9aadeb628f37b6b53ffe2ccd91ac4014..48661963de9b54d23ab8bbf9e314d900a1c40420 100644
--- a/app/src/main/java/com/futo/circles/extensions/StringExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/StringExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import android.util.Patterns
 
diff --git a/app/src/main/java/com/futo/circles/extensions/TextInputLayoutExtensions.kt b/app/src/main/java/org/futo/circles/extensions/TextInputLayoutExtensions.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/extensions/TextInputLayoutExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/TextInputLayoutExtensions.kt
index 30162211b122d6a1ca5f3d30c84a9795585cabdb..df10742839980457533cdcec178e6b6423003937 100644
--- a/app/src/main/java/com/futo/circles/extensions/TextInputLayoutExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/TextInputLayoutExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import com.google.android.material.textfield.TextInputLayout
 
diff --git a/app/src/main/java/com/futo/circles/extensions/UriExtensions.kt b/app/src/main/java/org/futo/circles/extensions/UriExtensions.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/extensions/UriExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/UriExtensions.kt
index ece2b8803fb241760437a757ec8d8a9896de7d0e..672f0276494c6c4d9908fa48a4e35cfddfa8559f 100644
--- a/app/src/main/java/com/futo/circles/extensions/UriExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/UriExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import android.content.Context
 import android.net.Uri
@@ -6,7 +6,7 @@ import android.provider.MediaStore
 import android.provider.OpenableColumns
 import androidx.core.database.getLongOrNull
 import androidx.core.database.getStringOrNull
-import com.futo.circles.core.ImageUtils
+import org.futo.circles.core.ImageUtils
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import java.io.File
 
diff --git a/app/src/main/java/com/futo/circles/extensions/ViewExtensions.kt b/app/src/main/java/org/futo/circles/extensions/ViewExtensions.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/extensions/ViewExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/ViewExtensions.kt
index 5aee98b65098c361d7c055db52c3b487acb2da6a..6376a9da9d60bda39b3933555e0ffd834596e976 100644
--- a/app/src/main/java/com/futo/circles/extensions/ViewExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/ViewExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import android.R
 import android.content.res.TypedArray
diff --git a/app/src/main/java/com/futo/circles/extensions/ViewModelExtensions.kt b/app/src/main/java/org/futo/circles/extensions/ViewModelExtensions.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/extensions/ViewModelExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/ViewModelExtensions.kt
index 89597ca97498ceb1969d425509ca22c84b1dbc62..b3c3dd1f8525d285c1c4b15b9a7321d1c2932458 100644
--- a/app/src/main/java/com/futo/circles/extensions/ViewModelExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/ViewModelExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/java/com/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt b/app/src/main/java/org/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
rename to app/src/main/java/org/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
index c0b55b3d3dfbaa5452aa9f7a56b003ea64fcef44..ffe6501346f0b9548aa198cde323395472ad04fe 100644
--- a/app/src/main/java/com/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.bottom_navigation
+package org.futo.circles.feature.bottom_navigation
 
 import android.os.Bundle
 import android.view.View
@@ -8,9 +8,9 @@ import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.databinding.BottomNavigationFragmentBinding
-import com.futo.circles.extensions.setSupportActionBar
+import org.futo.circles.R
+import org.futo.circles.databinding.BottomNavigationFragmentBinding
+import org.futo.circles.extensions.setSupportActionBar
 
 class BottomNavigationFragment : Fragment(R.layout.bottom_navigation_fragment) {
 
diff --git a/app/src/main/java/com/futo/circles/feature/circles/CirclesDataSource.kt b/app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/feature/circles/CirclesDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt
index c1212d5acfd57c90aaa4d32fbfbff0a4ffe21995..338ae1e28ed9125344227bb6d309f1a81b655395 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/CirclesDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.circles
+package org.futo.circles.feature.circles
 
-import com.futo.circles.core.rooms.data_source.RoomsDataSource
-import com.futo.circles.mapping.toInviteCircleListItem
-import com.futo.circles.mapping.toJoinedCircleListItem
-import com.futo.circles.model.CIRCLE_TAG
-import com.futo.circles.model.RoomListItem
-import com.futo.circles.model.TIMELINE_TYPE
+import org.futo.circles.core.rooms.data_source.RoomsDataSource
+import org.futo.circles.mapping.toInviteCircleListItem
+import org.futo.circles.mapping.toJoinedCircleListItem
+import org.futo.circles.model.CIRCLE_TAG
+import org.futo.circles.model.RoomListItem
+import org.futo.circles.model.TIMELINE_TYPE
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
diff --git a/app/src/main/java/com/futo/circles/feature/circles/CirclesFragment.kt b/app/src/main/java/org/futo/circles/feature/circles/CirclesFragment.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/circles/CirclesFragment.kt
rename to app/src/main/java/org/futo/circles/feature/circles/CirclesFragment.kt
index d2b56341a9f6fb04503bb80a1b44a9ea88a73ba3..77ffb50ae8adb5cc46fdb33959625c403ebe7893 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/CirclesFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/CirclesFragment.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.circles
+package org.futo.circles.feature.circles
 
 import androidx.navigation.fragment.findNavController
-import com.futo.circles.core.rooms.HasInvites
-import com.futo.circles.core.rooms.RoomsFragment
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.rooms.HasInvites
+import org.futo.circles.core.rooms.RoomsFragment
+import org.futo.circles.model.RoomListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class CirclesFragment : RoomsFragment(), HasInvites {
diff --git a/app/src/main/java/com/futo/circles/feature/circles/CirclesViewModel.kt b/app/src/main/java/org/futo/circles/feature/circles/CirclesViewModel.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/circles/CirclesViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/circles/CirclesViewModel.kt
index 08372083c185c7f02167884661a2b8e9e8b9dd42..20ba889ea0ee7821ec0e074d9faa89899b26cc43 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/CirclesViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/CirclesViewModel.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.circles
+package org.futo.circles.feature.circles
 
 import androidx.lifecycle.map
-import com.futo.circles.core.rooms.RoomsViewModel
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.rooms.RoomsViewModel
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 
 class CirclesViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt
index fc929945e26415025655892199804a18c3a4f526..a386d5e19063f82b75594063d0feeb7ee3927519 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.circles.accept_invite
+package org.futo.circles.feature.circles.accept_invite
 
 import androidx.lifecycle.MutableLiveData
-import com.futo.circles.core.matrix.room.RoomRelationsBuilder
-import com.futo.circles.extensions.createResult
-import com.futo.circles.mapping.toSelectableRoomListItem
-import com.futo.circles.model.CIRCLE_TAG
-import com.futo.circles.model.SelectableRoomListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.extensions.createResult
+import org.futo.circles.mapping.toSelectableRoomListItem
+import org.futo.circles.model.CIRCLE_TAG
+import org.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt
index 818f009508e260f9561964a0590a370650f50e53..8f7930b1b6cd7957a64f8b5a46d0137c69006a21 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.circles.accept_invite
+package org.futo.circles.feature.circles.accept_invite
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DividerItemDecoration
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.AcceptCircleInviteDialogFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.feature.circles.accept_invite.list.CirclesInviteAdapter
-import com.futo.circles.feature.circles.accept_invite.list.selected.SelectedCirclesAdapter
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.AcceptCircleInviteDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.feature.circles.accept_invite.list.CirclesInviteAdapter
+import org.futo.circles.feature.circles.accept_invite.list.selected.SelectedCirclesAdapter
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt
index ef0b39f889a7434712d9819adcb7412d6d2f7655..cef5628679b62c51bb84d691b7920180b280721b 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.circles.accept_invite
+package org.futo.circles.feature.circles.accept_invite
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.model.SelectableRoomListItem
 
 class AcceptCircleInviteViewModel(
     private val dataSource: AcceptCircleInviteDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt
index d5648900b329e9a62cdebd8a8fc7cb2629fb80d3..6221145a97ea7d82422bb2f4fc7cbd9610155c04 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.circles.accept_invite.list
+package org.futo.circles.feature.circles.accept_invite.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.RoomListItem
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.RoomListItem
+import org.futo.circles.model.SelectableRoomListItem
 
 class CirclesInviteAdapter(
     private val onCircleSelected: (SelectableRoomListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt
index 1c8352453b1229ca1c200bf4b0465b4cfc491542..a52d6981e9c34912998b5f8dffe910301b607085 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt
@@ -1,15 +1,15 @@
-package com.futo.circles.feature.circles.accept_invite.list
+package org.futo.circles.feature.circles.accept_invite.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.AcceptCircleInviteListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setSelectableItemBackground
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.AcceptCircleInviteListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setSelectableItemBackground
+import org.futo.circles.model.SelectableRoomListItem
 
 class CirclesInviteViewHolder(
     parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt
index 858b62c96fdc82f9a46aadd2d249c72f8985e48e..76c4879dfa6d8f76c455a6946c46539044c3deb1 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.circles.accept_invite.list.selected
+package org.futo.circles.feature.circles.accept_invite.list.selected
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.core.list.ChipItemViewHolder
-import com.futo.circles.model.RoomListItem
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.core.list.ChipItemViewHolder
+import org.futo.circles.model.RoomListItem
+import org.futo.circles.model.SelectableRoomListItem
 
 class SelectedCirclesAdapter(
     private val onCircleDeselected: (SelectableRoomListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingDataSource.kt b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingDataSource.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/circles/following/FollowingDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/FollowingDataSource.kt
index 458c55ca9b02b84668cd027329d238df84542c92..1da63b2bd2fc7e8dce5d02141572ff46159436e1 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.circles.following
+package org.futo.circles.feature.circles.following
 
 import android.content.Context
 import androidx.lifecycle.map
-import com.futo.circles.R
-import com.futo.circles.core.matrix.room.RoomRelationsBuilder
-import com.futo.circles.extensions.createResult
-import com.futo.circles.mapping.toFollowingListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.extensions.createResult
+import org.futo.circles.mapping.toFollowingListItem
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getRoom
 
 class FollowingDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingDialogFragment.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/circles/following/FollowingDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/FollowingDialogFragment.kt
index 98dbf36e6c8c36bb34e7f0566af99f9d0c6c5e99..32b926085884fe6438cd83727af5844050c2c395 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingDialogFragment.kt
@@ -1,15 +1,15 @@
-package com.futo.circles.feature.circles.following
+package org.futo.circles.feature.circles.following
 
 import android.os.Bundle
 import android.view.View
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DividerItemDecoration
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.databinding.FollowingDialogFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.feature.circles.following.list.FollowingAdapter
-import com.futo.circles.model.FollowingListItem
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.databinding.FollowingDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.feature.circles.following.list.FollowingAdapter
+import org.futo.circles.model.FollowingListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingViewModel.kt b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingViewModel.kt
similarity index 77%
rename from app/src/main/java/com/futo/circles/feature/circles/following/FollowingViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/FollowingViewModel.kt
index e482cd08bba9a6aadae3ae9508bf19a1a6238aec..554ef93a27070f3100c9f1fb40be933c2ab3daf8 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.circles.following
+package org.futo.circles.feature.circles.following
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 
 class FollowingViewModel(
     private val dataSource: FollowingDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/RemoveFollowingDialog.kt b/app/src/main/java/org/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
index e8abbfd54c3a67af3d218e48057e59c120348e70..96f92f88f420e497a9cc547febfce9d5e214d550 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.circles.following
+package org.futo.circles.feature.circles.following
 
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatDialog
-import com.futo.circles.R
-import com.futo.circles.databinding.RemoveFollowingDialogBinding
+import org.futo.circles.R
+import org.futo.circles.databinding.RemoveFollowingDialogBinding
 
 interface RemoveFollowingListener {
     fun onRemove(roomId: String)
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingAdapter.kt b/app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingAdapter.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingAdapter.kt
index ad9946930f8d3328f6b4cedf094dff759d86b2ac..f46637c93d6a2488778cbcbeb53534a0beed99bb 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.circles.following.list
+package org.futo.circles.feature.circles.following.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.FollowingListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.FollowingListItem
 
 class FollowingAdapter(
     private val onRemoveClicked: (FollowingListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingViewHolder.kt b/app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
index 219a382b6ba3775862efceadcb59ff5c7b0c08b7..ba26c71f084920fe4e6ae358d455feabacea2502 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.circles.following.list
+package org.futo.circles.feature.circles.following.list
 
 import android.text.format.DateUtils
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.FollowingListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.FollowingListItem
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.FollowingListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.FollowingListItem
 
 class FollowingViewHolder(
     parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/groups/GroupsDataSource.kt b/app/src/main/java/org/futo/circles/feature/groups/GroupsDataSource.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/feature/groups/GroupsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/groups/GroupsDataSource.kt
index 3b363f352d2c4f33f4ea06770c985626e9772521..66e80d0262f1457054e4c51f2eae45d8eb3a35ed 100644
--- a/app/src/main/java/com/futo/circles/feature/groups/GroupsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/groups/GroupsDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.groups
+package org.futo.circles.feature.groups
 
-import com.futo.circles.core.matrix.room.RoomRelationsBuilder
-import com.futo.circles.core.rooms.data_source.RoomsDataSource
-import com.futo.circles.extensions.createResult
-import com.futo.circles.mapping.toInviteGroupListItem
-import com.futo.circles.mapping.toJoinedGroupListItem
-import com.futo.circles.model.GROUP_TYPE
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.core.rooms.data_source.RoomsDataSource
+import org.futo.circles.extensions.createResult
+import org.futo.circles.mapping.toInviteGroupListItem
+import org.futo.circles.mapping.toJoinedGroupListItem
+import org.futo.circles.model.GROUP_TYPE
+import org.futo.circles.model.RoomListItem
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
diff --git a/app/src/main/java/com/futo/circles/feature/groups/GroupsFragment.kt b/app/src/main/java/org/futo/circles/feature/groups/GroupsFragment.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/groups/GroupsFragment.kt
rename to app/src/main/java/org/futo/circles/feature/groups/GroupsFragment.kt
index 1f895be8d4ce5b3955e676aac466e7b0bac10c3a..9b3c40f89d7eec14267f41708be6263d15a4beef 100644
--- a/app/src/main/java/com/futo/circles/feature/groups/GroupsFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/groups/GroupsFragment.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.groups
+package org.futo.circles.feature.groups
 
 import androidx.navigation.fragment.findNavController
-import com.futo.circles.core.rooms.HasInvites
-import com.futo.circles.core.rooms.RoomsFragment
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.rooms.HasInvites
+import org.futo.circles.core.rooms.RoomsFragment
+import org.futo.circles.model.RoomListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class GroupsFragment : RoomsFragment(), HasInvites {
diff --git a/app/src/main/java/com/futo/circles/feature/groups/GroupsViewModel.kt b/app/src/main/java/org/futo/circles/feature/groups/GroupsViewModel.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/feature/groups/GroupsViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/groups/GroupsViewModel.kt
index b550883a744ad239ebb828b9ca20eb322ae54c9d..6c2a516eeda4fae1da039edb0fb7caf405c15e48 100644
--- a/app/src/main/java/com/futo/circles/feature/groups/GroupsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/groups/GroupsViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.groups
+package org.futo.circles.feature.groups
 
 import androidx.lifecycle.map
-import com.futo.circles.core.rooms.RoomsViewModel
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.rooms.RoomsViewModel
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 
 class GroupsViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt b/app/src/main/java/org/futo/circles/feature/log_in/LogInFragment.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt
rename to app/src/main/java/org/futo/circles/feature/log_in/LogInFragment.kt
index 3a72113a09a9cbf84a127d979accb91af29ee711..9b7010324f0c3969e2877310d0008403a17ab79d 100644
--- a/app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/log_in/LogInFragment.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.log_in
+package org.futo.circles.feature.log_in
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.matrix.pass_phrase.LoadingDialog
-import com.futo.circles.databinding.LogInFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showError
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.matrix.pass_phrase.LoadingDialog
+import org.futo.circles.databinding.LogInFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showError
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 
diff --git a/app/src/main/java/com/futo/circles/feature/log_in/LogInViewModel.kt b/app/src/main/java/org/futo/circles/feature/log_in/LogInViewModel.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/log_in/LogInViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/log_in/LogInViewModel.kt
index 6d12eb8786ea7ac96f0c0179dfd573cde7b95b43..8ff34a36f12ef188f397e9399f7ae4a18bf0dfeb 100644
--- a/app/src/main/java/com/futo/circles/feature/log_in/LogInViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/log_in/LogInViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.log_in
+package org.futo.circles.feature.log_in
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 import org.matrix.android.sdk.api.auth.data.LoginFlowResult
 import org.matrix.android.sdk.api.session.Session
 
diff --git a/app/src/main/java/com/futo/circles/feature/log_in/LoginDataSource.kt b/app/src/main/java/org/futo/circles/feature/log_in/LoginDataSource.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/log_in/LoginDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/log_in/LoginDataSource.kt
index 387993348ccb57d1acf9cc30166f2d48111c1d15..3fc9fe1f7f4806a88d1cf19c3eeebbd8ba735e94 100644
--- a/app/src/main/java/com/futo/circles/feature/log_in/LoginDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/log_in/LoginDataSource.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.feature.log_in
+package org.futo.circles.feature.log_in
 
 import android.content.Context
 import android.net.Uri
-import com.futo.circles.BuildConfig
-import com.futo.circles.R
-import com.futo.circles.core.matrix.pass_phrase.restore.RestorePassPhraseDataSource
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixInstanceProvider
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.BuildConfig
+import org.futo.circles.R
+import org.futo.circles.core.matrix.pass_phrase.restore.RestorePassPhraseDataSource
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.session.Session
 
@@ -20,7 +20,7 @@ class LoginDataSource(
     private val homeServerConnectionConfig by lazy {
         HomeServerConnectionConfig
             .Builder()
-            .withHomeServerUri(Uri.parse(BuildConfig.MATRIX_HOME_SERVER_URL))
+            .withHomeServerUri(Uri.parse(org.futo.circles.BuildConfig.MATRIX_HOME_SERVER_URL))
             .build()
     }
 
diff --git a/app/src/main/java/com/futo/circles/feature/people/PeopleDataSource.kt b/app/src/main/java/org/futo/circles/feature/people/PeopleDataSource.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/people/PeopleDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/people/PeopleDataSource.kt
index 6d61d0018b583e6b21a973d3ffa6b8e59b1f9e97..2b4ce1a265241107e55f7fab5f842fd1adfccdcd 100644
--- a/app/src/main/java/com/futo/circles/feature/people/PeopleDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/PeopleDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.people
+package org.futo.circles.feature.people
 
 import androidx.lifecycle.asFlow
-import com.futo.circles.core.DEFAULT_USER_PREFIX
-import com.futo.circles.mapping.toPeopleUserListItem
-import com.futo.circles.model.PeopleHeaderItem
-import com.futo.circles.model.PeopleListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.DEFAULT_USER_PREFIX
+import org.futo.circles.mapping.toPeopleUserListItem
+import org.futo.circles.model.PeopleHeaderItem
+import org.futo.circles.model.PeopleListItem
+import org.futo.circles.provider.MatrixSessionProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import org.matrix.android.sdk.api.session.user.model.User
diff --git a/app/src/main/java/com/futo/circles/feature/people/PeopleFragment.kt b/app/src/main/java/org/futo/circles/feature/people/PeopleFragment.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/people/PeopleFragment.kt
rename to app/src/main/java/org/futo/circles/feature/people/PeopleFragment.kt
index d3e008061590afbadd0539027154bd1a3072586c..9090531527a346801db02ba7e5e9815a6b98e29c 100644
--- a/app/src/main/java/com/futo/circles/feature/people/PeopleFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/PeopleFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.people
+package org.futo.circles.feature.people
 
 import android.os.Bundle
 import android.view.View
@@ -6,13 +6,13 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.databinding.PeopleFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showDialog
-import com.futo.circles.feature.people.list.PeopleAdapter
-import com.futo.circles.model.PeopleUserListItem
+import org.futo.circles.R
+import org.futo.circles.databinding.PeopleFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showDialog
+import org.futo.circles.feature.people.list.PeopleAdapter
+import org.futo.circles.model.PeopleUserListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class PeopleFragment : Fragment(R.layout.people_fragment) {
diff --git a/app/src/main/java/com/futo/circles/feature/people/PeopleViewModel.kt b/app/src/main/java/org/futo/circles/feature/people/PeopleViewModel.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/people/PeopleViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/people/PeopleViewModel.kt
index 670585c4d931189d97c460bde5a3699bf3d95627..754bd60a6451ba8c14a638da0851d091aac644a7 100644
--- a/app/src/main/java/com/futo/circles/feature/people/PeopleViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/PeopleViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.people
+package org.futo.circles.feature.people
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 
 class PeopleViewModel(
     peopleDataSource: PeopleDataSource,
diff --git a/app/src/main/java/com/futo/circles/feature/people/UserOptionsDataSource.kt b/app/src/main/java/org/futo/circles/feature/people/UserOptionsDataSource.kt
similarity index 71%
rename from app/src/main/java/com/futo/circles/feature/people/UserOptionsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/people/UserOptionsDataSource.kt
index fd10ee9a42ebf4aef135dfccea11611931e28b69..06049d30f956d63df6369f3b726dcc49783d3986 100644
--- a/app/src/main/java/com/futo/circles/feature/people/UserOptionsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/UserOptionsDataSource.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.feature.people
+package org.futo.circles.feature.people
 
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixSessionProvider
 
 class UserOptionsDataSource {
 
diff --git a/app/src/main/java/com/futo/circles/feature/people/list/PeopleAdapter.kt b/app/src/main/java/org/futo/circles/feature/people/list/PeopleAdapter.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/people/list/PeopleAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/people/list/PeopleAdapter.kt
index 5e966723c16797fb42874286f361aa09c6da6baa..7babd67b1e4be50976fd3bc77ef13f9757fc9401 100644
--- a/app/src/main/java/com/futo/circles/feature/people/list/PeopleAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/list/PeopleAdapter.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.people.list
+package org.futo.circles.feature.people.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.PeopleHeaderItem
-import com.futo.circles.model.PeopleListItem
-import com.futo.circles.model.PeopleUserListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.PeopleHeaderItem
+import org.futo.circles.model.PeopleListItem
+import org.futo.circles.model.PeopleUserListItem
 
 private enum class PeopleListViewType { Header, User }
 
diff --git a/app/src/main/java/com/futo/circles/feature/people/list/PeopleViewHolder.kt b/app/src/main/java/org/futo/circles/feature/people/list/PeopleViewHolder.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/people/list/PeopleViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/people/list/PeopleViewHolder.kt
index 405321c7a5dc4aff7bf5590fc327faad6a266a53..5cd2b8013a60126560312043881c0dacde77112b 100644
--- a/app/src/main/java/com/futo/circles/feature/people/list/PeopleViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/list/PeopleViewHolder.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.people.list
+package org.futo.circles.feature.people.list
 
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.InviteHeaderListItemBinding
-import com.futo.circles.databinding.PeopleListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.PeopleHeaderItem
-import com.futo.circles.model.PeopleListItem
-import com.futo.circles.model.PeopleUserListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.InviteHeaderListItemBinding
+import org.futo.circles.databinding.PeopleListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.PeopleHeaderItem
+import org.futo.circles.model.PeopleListItem
+import org.futo.circles.model.PeopleUserListItem
 
 abstract class PeopleViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     abstract fun bind(data: PeopleListItem)
diff --git a/app/src/main/java/com/futo/circles/feature/people/user/UserDataSource.kt b/app/src/main/java/org/futo/circles/feature/people/user/UserDataSource.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/people/user/UserDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/people/user/UserDataSource.kt
index 198f9f5d71f89890260ce0865cdf967f7b745b51..0825967a31ea5892f7a99cad9924cc7e807f00b7 100644
--- a/app/src/main/java/com/futo/circles/feature/people/user/UserDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/user/UserDataSource.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.feature.people.user
+package org.futo.circles.feature.people.user
 
 import android.content.Context
 import androidx.lifecycle.map
-import com.futo.circles.R
-import com.futo.circles.extensions.getRoomOwners
-import com.futo.circles.mapping.toJoinedCircleListItem
-import com.futo.circles.model.CIRCLE_TAG
-import com.futo.circles.model.JoinedCircleListItem
-import com.futo.circles.model.TIMELINE_TYPE
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.getRoomOwners
+import org.futo.circles.mapping.toJoinedCircleListItem
+import org.futo.circles.model.CIRCLE_TAG
+import org.futo.circles.model.JoinedCircleListItem
+import org.futo.circles.model.TIMELINE_TYPE
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
diff --git a/app/src/main/java/com/futo/circles/feature/people/user/UserFragment.kt b/app/src/main/java/org/futo/circles/feature/people/user/UserFragment.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/people/user/UserFragment.kt
rename to app/src/main/java/org/futo/circles/feature/people/user/UserFragment.kt
index 0b3a8b2fc49215e8169dc8c3974542b0c1c7bbe5..c1769c3d6b97bfd330ea5d0eca930c8e565bc374 100644
--- a/app/src/main/java/com/futo/circles/feature/people/user/UserFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/user/UserFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.people.user
+package org.futo.circles.feature.people.user
 
 import android.os.Bundle
 import android.view.View
@@ -7,13 +7,13 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DividerItemDecoration
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.databinding.UserFragmentBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.feature.people.user.list.UsersCirclesAdapter
-import com.futo.circles.mapping.notEmptyDisplayName
+import org.futo.circles.R
+import org.futo.circles.databinding.UserFragmentBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.feature.people.user.list.UsersCirclesAdapter
+import org.futo.circles.mapping.notEmptyDisplayName
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.matrix.android.sdk.api.session.user.model.User
diff --git a/app/src/main/java/com/futo/circles/feature/people/user/UserViewModel.kt b/app/src/main/java/org/futo/circles/feature/people/user/UserViewModel.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/people/user/UserViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/people/user/UserViewModel.kt
index aa75fdf4e5f86d68069de2b867f0343714c9980d..58c0561adb1f4ad8cd99392043d0ca9fbafc03b6 100644
--- a/app/src/main/java/com/futo/circles/feature/people/user/UserViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/user/UserViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.people.user
+package org.futo.circles.feature.people.user
 
 import androidx.lifecycle.ViewModel
 
diff --git a/app/src/main/java/com/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt b/app/src/main/java/org/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt
index 076d5bde431857c2309e17224318b5bac171eba0..f2578847d634320dcc39b71abc793ec237e8243d 100644
--- a/app/src/main/java/com/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.people.user.list
+package org.futo.circles.feature.people.user.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.AcceptCircleInviteListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.model.JoinedCircleListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.AcceptCircleInviteListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.model.JoinedCircleListItem
 
 class UsersCircleViewHolder(
     parent: ViewGroup
diff --git a/app/src/main/java/com/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt b/app/src/main/java/org/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt
index e615e42e37f2df88bcfcabe6d66c4f20b153dfc1..1590356378ba047b31d4d6c9e9a4efc5c34147be 100644
--- a/app/src/main/java/com/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.people.user.list
+package org.futo.circles.feature.people.user.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.JoinedCircleListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.JoinedCircleListItem
 
 class UsersCirclesAdapter() :
     BaseRvAdapter<JoinedCircleListItem, UsersCircleViewHolder>(DefaultIdEntityCallback()) {
diff --git a/app/src/main/java/com/futo/circles/feature/photos/PhotosDataSource.kt b/app/src/main/java/org/futo/circles/feature/photos/PhotosDataSource.kt
similarity index 66%
rename from app/src/main/java/com/futo/circles/feature/photos/PhotosDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/photos/PhotosDataSource.kt
index 4b715094ff06f1241f55d936022a2b85d3bef038..9c35b24cd46524682d62ff9147ca080360b411d1 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/PhotosDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/PhotosDataSource.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.photos
+package org.futo.circles.feature.photos
 
-import com.futo.circles.core.rooms.data_source.RoomsDataSource
-import com.futo.circles.mapping.toGalleryListItem
-import com.futo.circles.model.GALLERY_TYPE
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.rooms.data_source.RoomsDataSource
+import org.futo.circles.mapping.toGalleryListItem
+import org.futo.circles.model.GALLERY_TYPE
+import org.futo.circles.model.RoomListItem
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
diff --git a/app/src/main/java/com/futo/circles/feature/photos/PhotosFragment.kt b/app/src/main/java/org/futo/circles/feature/photos/PhotosFragment.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/photos/PhotosFragment.kt
rename to app/src/main/java/org/futo/circles/feature/photos/PhotosFragment.kt
index 3785d7cbeffde2521a0dcf764703e7fa02506bb8..70941cfc398301de5a32a15f87e4bc0172ffe43d 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/PhotosFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/PhotosFragment.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.feature.photos
+package org.futo.circles.feature.photos
 
 import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.navigation.fragment.findNavController
-import com.futo.circles.core.image_picker.PickGalleryListener
-import com.futo.circles.core.rooms.RoomsFragment
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.image_picker.PickGalleryListener
+import org.futo.circles.core.rooms.RoomsFragment
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.RoomListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class PhotosFragment : RoomsFragment() {
diff --git a/app/src/main/java/com/futo/circles/feature/photos/PhotosViewModel.kt b/app/src/main/java/org/futo/circles/feature/photos/PhotosViewModel.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/feature/photos/PhotosViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/photos/PhotosViewModel.kt
index b9912671c98bb412095f9a4f759608b5f9726560..d09b7f914edf3b129448e0fe0ac405d7442c0409 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/PhotosViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/PhotosViewModel.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.photos
+package org.futo.circles.feature.photos
 
 import androidx.lifecycle.map
-import com.futo.circles.core.rooms.RoomsViewModel
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.rooms.RoomsViewModel
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 
 class PhotosViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryFragment.kt b/app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryFragment.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryFragment.kt
rename to app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryFragment.kt
index 1c9f534e6645b09db76a4d83e489b0900c2a9b06..678bc3652d1636abd3a0f2f8dffc2f72afc0311a 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.photos.gallery
+package org.futo.circles.feature.photos.gallery
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -13,15 +13,15 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.core.image_picker.PickGalleryImageListener
-import com.futo.circles.core.list.BaseRvDecoration
-import com.futo.circles.databinding.GalleryFragmentBinding
-import com.futo.circles.extensions.*
-import com.futo.circles.feature.photos.gallery.list.GalleryImageViewHolder
-import com.futo.circles.feature.photos.gallery.list.GalleryImagesAdapter
-import com.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.R
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.core.image_picker.PickGalleryImageListener
+import org.futo.circles.core.list.BaseRvDecoration
+import org.futo.circles.databinding.GalleryFragmentBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.feature.photos.gallery.list.GalleryImageViewHolder
+import org.futo.circles.feature.photos.gallery.list.GalleryImagesAdapter
+import org.futo.circles.model.CircleRoomTypeArg
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryViewModel.kt b/app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryViewModel.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryViewModel.kt
index 9d3bee89454113c050ec8a7cfb25e7dfd8a29d70..785fc9f644c867f6791641673427ab2839006685 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryViewModel.kt
@@ -1,20 +1,20 @@
-package com.futo.circles.feature.photos.gallery
+package org.futo.circles.feature.photos.gallery
 
 import android.content.Context
 import android.net.Uri
 import androidx.lifecycle.map
 import com.bumptech.glide.Glide
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.getUri
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.photos.preview.GalleryImageDataSource
-import com.futo.circles.feature.room.LeaveRoomDataSource
-import com.futo.circles.feature.timeline.BaseTimelineViewModel
-import com.futo.circles.feature.timeline.data_source.SendMessageDataSource
-import com.futo.circles.feature.timeline.data_source.TimelineDataSource
-import com.futo.circles.model.GalleryImageListItem
-import com.futo.circles.model.ImageContent
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.getUri
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.feature.photos.preview.GalleryImageDataSource
+import org.futo.circles.feature.room.LeaveRoomDataSource
+import org.futo.circles.feature.timeline.BaseTimelineViewModel
+import org.futo.circles.feature.timeline.data_source.SendMessageDataSource
+import org.futo.circles.feature.timeline.data_source.TimelineDataSource
+import org.futo.circles.model.GalleryImageListItem
+import org.futo.circles.model.ImageContent
 
 class GalleryViewModel(
     private val roomId: String,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt b/app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt
similarity index 65%
rename from app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt
index 0f79518aa8020cac5934bba60ea2f171400e4396..41b40c077318b9d3d2aac0f41ff9da4823ca64c9 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.photos.gallery.list
+package org.futo.circles.feature.photos.gallery.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.GalleryImageListItemBinding
-import com.futo.circles.extensions.loadInto
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.GalleryImageListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.GalleryImageListItemBinding
+import org.futo.circles.extensions.loadInto
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.GalleryImageListItem
 
 class GalleryImageViewHolder(
     parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt b/app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt
index 25df5a489b2e4473cdd92dd295f3d0fa746ad6c9..881319f242acb90d021a86262d04c723f5a9c236 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.photos.gallery.list
+package org.futo.circles.feature.photos.gallery.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.GalleryImageListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.GalleryImageListItem
 
 class GalleryImagesAdapter(
     private val onGalleryImageClicked: (postId: String) -> Unit,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDataSource.kt b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDataSource.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDataSource.kt
index 36f2187f54baec822ce4019b05c02b9a78fed173..0d9ee3cf0d17d5af9feb5f35c2d72b3f9f971684 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDataSource.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.photos.preview
+package org.futo.circles.feature.photos.preview
 
-import com.futo.circles.mapping.toPost
-import com.futo.circles.model.GalleryImageListItem
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.PostContentType
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.mapping.toPost
+import org.futo.circles.model.GalleryImageListItem
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.PostContentType
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
 
diff --git a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt
index 9b1cefe9c7db2c03d9bfe826aed32c9045d57f24..1f66d9470fd35975b86d49d19bc019307d7e9bf7 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.photos.preview
+package org.futo.circles.feature.photos.preview
 
 import android.annotation.SuppressLint
 import android.graphics.Color
@@ -7,14 +7,14 @@ import android.view.View
 import android.view.WindowManager
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.databinding.GalleryImageDialogFragmentBinding
-import com.futo.circles.extensions.loadInto
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.showDialog
-import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.timeline.post.share.ShareProvider
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.databinding.GalleryImageDialogFragmentBinding
+import org.futo.circles.extensions.loadInto
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.showDialog
+import org.futo.circles.extensions.showSuccess
+import org.futo.circles.feature.timeline.post.share.ShareProvider
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageViewModel.kt b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageViewModel.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageViewModel.kt
index 2a05399e17c40e80f8f0e96aa5625a6f9a40be03..ac262cdef03a65f33469995cd7a07018ae7ecf55 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.photos.preview
+package org.futo.circles.feature.photos.preview
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.timeline.post.PostOptionsDataSource
-import com.futo.circles.feature.timeline.post.share.ShareableContent
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.feature.timeline.post.PostOptionsDataSource
+import org.futo.circles.feature.timeline.post.share.ShareableContent
 
 class GalleryImageViewModel(
     private val roomId: String,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt b/app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt
similarity index 73%
rename from app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt
index 5a272bcccb8afa21bae0176994b9005b545e4cfc..92380677a88fc41fe8ec3c63db9bb813c05a034d 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.photos.save
+package org.futo.circles.feature.photos.save
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.photos.preview.GalleryImageDataSource
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.feature.photos.preview.GalleryImageDataSource
+import org.futo.circles.model.SelectableRoomListItem
 
 class SaveToGalleryViewModel(
     private val galleryImageDataSource: GalleryImageDataSource,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt
index 5052e9077f211c7f096ad4b5065379fc808ad14e..4b36ae83d089603bd64862ae4622f2b3dea0c938 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.photos.save
+package org.futo.circles.feature.photos.save
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.SaveToGalleryDialogFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.photos.save.list.SelectGalleryAdapter
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.SaveToGalleryDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showSuccess
+import org.futo.circles.feature.photos.save.list.SelectGalleryAdapter
+import org.futo.circles.model.SelectableRoomListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/app/src/main/java/com/futo/circles/feature/photos/save/SelectGalleryDataSource.kt b/app/src/main/java/org/futo/circles/feature/photos/save/SelectGalleryDataSource.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/photos/save/SelectGalleryDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/photos/save/SelectGalleryDataSource.kt
index 46da5dd821a535762d7ee0c1116d00aedac8e6c3..d803a4b49ebf995066da2befce3fafeda68310fb 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/save/SelectGalleryDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/save/SelectGalleryDataSource.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.photos.save
+package org.futo.circles.feature.photos.save
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import com.bumptech.glide.Glide
-import com.futo.circles.extensions.getUri
-import com.futo.circles.extensions.onBG
-import com.futo.circles.feature.timeline.data_source.SendMessageDataSource
-import com.futo.circles.mapping.toSelectableRoomListItem
-import com.futo.circles.model.GALLERY_TYPE
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.SelectableRoomListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.getUri
+import org.futo.circles.extensions.onBG
+import org.futo.circles.feature.timeline.data_source.SendMessageDataSource
+import org.futo.circles.mapping.toSelectableRoomListItem
+import org.futo.circles.model.GALLERY_TYPE
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 
diff --git a/app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt b/app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt
index 006487a7462c3ca373d37dcb539b2743019fb2e2..3f6e4f98fdf3c8cc316252c6fe31f680a3c6643b 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.photos.save.list
+package org.futo.circles.feature.photos.save.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.SelectableRoomListItem
 
 class SelectGalleryAdapter(
     private val onGalleryClicked: (SelectableRoomListItem) -> Unit,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt b/app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt
index e86687dfcd1dde407bab006e16b916f64327e11d..a13f0952abeb448056ec6759f412e140bc6b3b08 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.feature.photos.save.list
+package org.futo.circles.feature.photos.save.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.SelectGalleryListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.SelectGalleryListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.SelectableRoomListItem
 
 class SelectGalleryViewHolder(
     parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/room/LeaveRoomDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/LeaveRoomDataSource.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/room/LeaveRoomDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/LeaveRoomDataSource.kt
index 5f122a7ef25d4484df1f366847708f6afc34aa56..9f6691469c7fd6c6eb51cc3161a33c79fb4ccb24 100644
--- a/app/src/main/java/com/futo/circles/feature/room/LeaveRoomDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/LeaveRoomDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room
+package org.futo.circles.feature.room
 
-import com.futo.circles.core.matrix.room.RoomRelationsBuilder
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.getCurrentUserPowerLevel
-import com.futo.circles.extensions.getRoomOwners
-import com.futo.circles.extensions.getTimelineRoomFor
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.getCurrentUserPowerLevel
+import org.futo.circles.extensions.getRoomOwners
+import org.futo.circles.extensions.getTimelineRoomFor
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
 
diff --git a/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
index 325ffae9b9fd70b1abc50e7ca60f67e86ff59dd8..8d11acbda162ebb333d116be04013cc65712c9c4 100644
--- a/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
@@ -1,21 +1,21 @@
-package com.futo.circles.feature.room.create_room
+package org.futo.circles.feature.room.create_room
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.CreateRoomDialogFragmentBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.feature.room.select_users.SelectUsersFragment
-import com.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.R
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.CreateRoomDialogFragmentBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.feature.room.select_users.SelectUsersFragment
+import org.futo.circles.model.CircleRoomTypeArg
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class CreateRoomDialogFragment :
diff --git a/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
index d11426f208018f1058e917bf8c530fdb1633263b..a7efa8f95030920a33e430284475024d84b51c20 100644
--- a/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.room.create_room
+package org.futo.circles.feature.room.create_room
 
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.core.matrix.room.CreateRoomDataSource
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.model.CircleRoomTypeArg
-import com.futo.circles.model.Gallery
-import com.futo.circles.model.Group
-import com.futo.circles.model.UserListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.core.matrix.room.CreateRoomDataSource
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.model.Gallery
+import org.futo.circles.model.Group
+import org.futo.circles.model.UserListItem
 
 class CreateRoomViewModel(
     private val dataSource: CreateRoomDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDataSource.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDataSource.kt
index b80bf2fd8c751efcbaefef385bf2721d5d73e9b2..9905f406c25afbda9fa7b87f84474db5accb6c61 100644
--- a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.invite
+package org.futo.circles.feature.room.invite
 
 import android.content.Context
-import com.futo.circles.R
-import com.futo.circles.extensions.createResult
-import com.futo.circles.mapping.nameOrId
-import com.futo.circles.model.UserListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.createResult
+import org.futo.circles.mapping.nameOrId
+import org.futo.circles.model.UserListItem
+import org.futo.circles.provider.MatrixSessionProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
diff --git a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
similarity index 77%
rename from app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
index 66d4b72bedb928a0efac950b166b534f08593f3b..c345f3eccf38e3f8e654a3116450a7c08d5c5b4f 100644
--- a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
@@ -1,19 +1,19 @@
-package com.futo.circles.feature.room.invite
+package org.futo.circles.feature.room.invite
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.InviteMembersDialogFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.room.select_users.SelectUsersFragment
-import com.futo.circles.feature.room.select_users.SelectUsersListener
-import com.futo.circles.model.UserListItem
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.InviteMembersDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showSuccess
+import org.futo.circles.feature.room.select_users.SelectUsersFragment
+import org.futo.circles.feature.room.select_users.SelectUsersListener
+import org.futo.circles.model.UserListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersViewModel.kt
similarity index 67%
rename from app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersViewModel.kt
index 4bac3ca84046d27f7cb1230c357a6101a2f4df60..da71578766bcbd499ef9a2854bea8b3caad8249d 100644
--- a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.invite
+package org.futo.circles.feature.room.invite
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.model.UserListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.model.UserListItem
 
 class InviteMembersViewModel(
     private val dataSource: InviteMembersDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
index cd0d97c98eb3a83d06ae75fe22194ad46f98c74d..a84723947afadda6cee0423c4a52a31cee55931e 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.room.manage_members
+package org.futo.circles.feature.room.manage_members
 
 
 import android.content.Context
 import androidx.lifecycle.asFlow
-import com.futo.circles.R
-import com.futo.circles.core.ExpandableItemsDataSource
-import com.futo.circles.extensions.createResult
-import com.futo.circles.mapping.nameOrId
-import com.futo.circles.mapping.toGroupMemberListItem
-import com.futo.circles.mapping.toInvitedUserListItem
-import com.futo.circles.model.*
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.ExpandableItemsDataSource
+import org.futo.circles.extensions.createResult
+import org.futo.circles.mapping.nameOrId
+import org.futo.circles.mapping.toGroupMemberListItem
+import org.futo.circles.mapping.toInvitedUserListItem
+import org.futo.circles.model.*
+import org.futo.circles.provider.MatrixSessionProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import org.matrix.android.sdk.api.query.QueryStringValue
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
index 8f910af9b341f072201d6f43f21371e5fe514356..3b15bf70582c3dbb5e729e4623a0d9b864f39a0a 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.room.manage_members
+package org.futo.circles.feature.room.manage_members
 
 
 import android.os.Bundle
@@ -6,13 +6,13 @@ import android.view.View
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DividerItemDecoration
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.databinding.ManageMembersDialogFragmentBinding
-import com.futo.circles.extensions.*
-import com.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelListener
-import com.futo.circles.feature.room.manage_members.list.GroupMembersListAdapter
-import com.futo.circles.view.ManageMembersOptionsListener
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.databinding.ManageMembersDialogFragmentBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelListener
+import org.futo.circles.feature.room.manage_members.list.GroupMembersListAdapter
+import org.futo.circles.view.ManageMembersOptionsListener
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
index ab65f9cff8449e9d5fc5680115f4e4ddac444c87..046faf2802c969196ee078d50836e86f89cbfb53 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.manage_members
+package org.futo.circles.feature.room.manage_members
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 
 class ManageMembersViewModel(
     private val dataSource: ManageMembersDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
index 369cd6cc67ee9d25338944985ba1b99fbcb1038a..22f137fc826f2677a873d488af0a116c1f4a1d6d 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.room.manage_members.change_role
+package org.futo.circles.feature.room.manage_members.change_role
 
 import android.content.Context
 import android.os.Bundle
@@ -8,10 +8,10 @@ import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DividerItemDecoration
-import com.futo.circles.databinding.ChangeAccessLevelBottomSheetBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.feature.room.manage_members.change_role.list.ChangeAccessLevelAdapter
-import com.futo.circles.model.AccessLevelListItem
+import org.futo.circles.databinding.ChangeAccessLevelBottomSheetBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.feature.room.manage_members.change_role.list.ChangeAccessLevelAdapter
+import org.futo.circles.model.AccessLevelListItem
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
similarity index 76%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
index a03071795faf700916fac3d819c367d2fb8af413..7050a8482c06b0ee6986a5a67a928cd8af54f6df 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.feature.room.manage_members.change_role
+package org.futo.circles.feature.room.manage_members.change_role
 
-import com.futo.circles.model.AccessLevel
-import com.futo.circles.model.AccessLevelListItem
+import org.futo.circles.model.AccessLevel
+import org.futo.circles.model.AccessLevelListItem
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
 
 class ChangeAccessLevelDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
similarity index 61%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
index fc1d35bc09af52d3e365a741cfa4a7e67b55d027..9f2c01515f0549db0537ab6023b7210321d1cc40 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.room.manage_members.change_role
+package org.futo.circles.feature.room.manage_members.change_role
 
 interface ChangeAccessLevelListener {
     fun onChangeAccessLevel(userId: String, levelValue: Int)
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
index 480e03703e21b28e650e96936fb3a2ca082bdffc..677e5d97949eff83d804471de47541cdfdd73054 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.room.manage_members.change_role
+package org.futo.circles.feature.room.manage_members.change_role
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
similarity index 67%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
index ac3f381e181b4ef5e17ab2ecb8ae0ee7993210ca..65c6a2269d6d202999fc7ef04ff7c67a1e1190df 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.room.manage_members.change_role.list
+package org.futo.circles.feature.room.manage_members.change_role.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.AccessLevelListItemBinding
-import com.futo.circles.extensions.getRoleNameResId
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.AccessLevelListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.AccessLevelListItemBinding
+import org.futo.circles.extensions.getRoleNameResId
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.AccessLevelListItem
 
 class AccessLevelViewHolder(
     parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
index afebc0001d85c2a063839cb980f5f082c8d8e59b..f3156e398a64d42956f0a3f7768268b03db56e58 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.room.manage_members.change_role.list
+package org.futo.circles.feature.room.manage_members.change_role.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.AccessLevelListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.AccessLevelListItem
 
 class ChangeAccessLevelAdapter(
     private val onLevelClicked: (AccessLevelListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
index 8dc8a7e827621165621a05a829335a8d6bd24a6b..4865fdb3fc2293717afcaf161c7ef873019c10c6 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
@@ -1,20 +1,20 @@
-package com.futo.circles.feature.room.manage_members.list
+package org.futo.circles.feature.room.manage_members.list
 
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.InviteHeaderListItemBinding
-import com.futo.circles.databinding.InvitedUserListItemBinding
-import com.futo.circles.databinding.MemberListItemBinding
-import com.futo.circles.extensions.*
-import com.futo.circles.model.GroupMemberListItem
-import com.futo.circles.model.InvitedUserListItem
-import com.futo.circles.model.ManageMembersHeaderListItem
-import com.futo.circles.model.ManageMembersListItem
-import com.futo.circles.view.ManageMembersOptionsListener
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.InviteHeaderListItemBinding
+import org.futo.circles.databinding.InvitedUserListItemBinding
+import org.futo.circles.databinding.MemberListItemBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.model.GroupMemberListItem
+import org.futo.circles.model.InvitedUserListItem
+import org.futo.circles.model.ManageMembersHeaderListItem
+import org.futo.circles.model.ManageMembersListItem
+import org.futo.circles.view.ManageMembersOptionsListener
 
 abstract class ManageMembersViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     abstract fun bind(data: ManageMembersListItem)
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
index 29d44eb01b4dd5cadc0c469c75e7a1a6a0edfe68..16c845a997fccb8bef9b51a54c68f612a9fc2f52 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.room.manage_members.list
+package org.futo.circles.feature.room.manage_members.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.GroupMemberListItem
-import com.futo.circles.model.InvitedUserListItem
-import com.futo.circles.model.ManageMembersHeaderListItem
-import com.futo.circles.model.ManageMembersListItem
-import com.futo.circles.view.ManageMembersOptionsListener
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.GroupMemberListItem
+import org.futo.circles.model.InvitedUserListItem
+import org.futo.circles.model.ManageMembersHeaderListItem
+import org.futo.circles.model.ManageMembersListItem
+import org.futo.circles.view.ManageMembersOptionsListener
 
 private enum class ManageGroupMembersViewTypes { Header, Member, Invited }
 
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersDataSource.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersDataSource.kt
index c0648e6277c41ee394508798164e8b58bcee7fbf..11d9cb43b091eecdc8b0fb9812eba9f45b2f6f7a 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersDataSource.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.feature.room.select_users
+package org.futo.circles.feature.room.select_users
 
 import androidx.lifecycle.asFlow
-import com.futo.circles.core.DEFAULT_USER_PREFIX
-import com.futo.circles.mapping.toUserListItem
-import com.futo.circles.model.HeaderItem
-import com.futo.circles.model.InviteMemberListItem
-import com.futo.circles.model.NoResultsItem
-import com.futo.circles.model.UserListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.DEFAULT_USER_PREFIX
+import org.futo.circles.mapping.toUserListItem
+import org.futo.circles.model.HeaderItem
+import org.futo.circles.model.InviteMemberListItem
+import org.futo.circles.model.NoResultsItem
+import org.futo.circles.model.UserListItem
+import org.futo.circles.provider.MatrixSessionProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import org.matrix.android.sdk.api.session.getRoom
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersFragment.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersFragment.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersFragment.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersFragment.kt
index 1d103c56ca73e23ea759471eac052ac7dd2c5787..28ee80d8ce9a2f161b7586e9e1ff9d203c2ef4a6 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.room.select_users
+package org.futo.circles.feature.room.select_users
 
 import android.content.Context
 import android.os.Bundle
@@ -6,14 +6,14 @@ import android.view.View
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.databinding.SelectUsersFragmentBinding
-import com.futo.circles.extensions.getQueryTextChangeStateFlow
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.feature.room.select_users.list.search.InviteMembersSearchListAdapter
-import com.futo.circles.feature.room.select_users.list.selected.SelectedUsersListAdapter
-import com.futo.circles.model.UserListItem
+import org.futo.circles.R
+import org.futo.circles.databinding.SelectUsersFragmentBinding
+import org.futo.circles.extensions.getQueryTextChangeStateFlow
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.feature.room.select_users.list.search.InviteMembersSearchListAdapter
+import org.futo.circles.feature.room.select_users.list.selected.SelectedUsersListAdapter
+import org.futo.circles.model.UserListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
index 89666044889e069b05c13f95ba9738fab076d1f4..5be1166465200316781ce34c00f45c12df6b2e89 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.select_users
+package org.futo.circles.feature.room.select_users
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
-import com.futo.circles.extensions.launchUi
-import com.futo.circles.model.InviteMemberListItem
-import com.futo.circles.model.UserListItem
+import org.futo.circles.extensions.launchUi
+import org.futo.circles.model.InviteMemberListItem
+import org.futo.circles.model.UserListItem
 import kotlinx.coroutines.flow.*
 
 class SelectUsersViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
index 7eeebbf41f600eaea1bdc3123af5a944b535bc5a..f426bc199d830217ecf049d3264be26fad334601 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
@@ -1,21 +1,21 @@
-package com.futo.circles.feature.room.select_users.list.search
+package org.futo.circles.feature.room.select_users.list.search
 
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.InviteHeaderListItemBinding
-import com.futo.circles.databinding.NoResultsListItemBinding
-import com.futo.circles.databinding.UserListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setSelectableItemBackground
-import com.futo.circles.model.UserListItem
-import com.futo.circles.model.HeaderItem
-import com.futo.circles.model.InviteMemberListItem
-import com.futo.circles.model.NoResultsItem
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.InviteHeaderListItemBinding
+import org.futo.circles.databinding.NoResultsListItemBinding
+import org.futo.circles.databinding.UserListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setSelectableItemBackground
+import org.futo.circles.model.UserListItem
+import org.futo.circles.model.HeaderItem
+import org.futo.circles.model.InviteMemberListItem
+import org.futo.circles.model.NoResultsItem
 
 abstract class InviteMemberViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     abstract fun bind(data: InviteMemberListItem)
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
index 3f0b2e82899d032ff6cdf849020bd17ee58be882..4dfc4bc8cbbba10e7eab73a9d83eb650d8775945 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.select_users.list.search
+package org.futo.circles.feature.room.select_users.list.search
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.HeaderItem
-import com.futo.circles.model.InviteMemberListItem
-import com.futo.circles.model.NoResultsItem
-import com.futo.circles.model.UserListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.HeaderItem
+import org.futo.circles.model.InviteMemberListItem
+import org.futo.circles.model.NoResultsItem
+import org.futo.circles.model.UserListItem
 
 private enum class InviteListViewType { Header, User, NoResults }
 
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
index 73ca99820a0e3d192b760a722bf105b795a69036..e024829bf8c1f5b21fc14d227034822a3aaf7870 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.room.select_users.list.selected
+package org.futo.circles.feature.room.select_users.list.selected
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.core.list.ChipItemViewHolder
-import com.futo.circles.model.UserListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.core.list.ChipItemViewHolder
+import org.futo.circles.model.UserListItem
 
 class SelectedUsersListAdapter(
     private val onUserDeselected: (UserListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt
index b255c2b51b8401994c94ef332a5365c68243c4ce..41b30dbfbd8b1eb06bcdac7e7ab5eebd855e2ee0 100644
--- a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.room.update_room
+package org.futo.circles.feature.room.update_room
 
 import android.content.Context
 import android.net.Uri
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.getFilename
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.getFilename
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getRoom
 import java.util.*
 
diff --git a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
index 3f3fe0c93a8dbb699bac4d968d9b4931606b84d4..7a2c975f3645d0cf47c5c529e3d468c9594ba538 100644
--- a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.room.update_room
+package org.futo.circles.feature.room.update_room
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.UpdateRoomDialogFragmentBinding
-import com.futo.circles.extensions.*
-import com.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.R
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.UpdateRoomDialogFragmentBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.model.CircleRoomTypeArg
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
diff --git a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
index 3f54216720da65f6037b203b9bfdab362b67ece1..13c5f60ce9f84383d0c7549b6bb8605de1752377 100644
--- a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.update_room
+package org.futo.circles.feature.room.update_room
 
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 
 class UpdateRoomViewModel(
     private val dataSource: UpdateRoomDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/settings/SettingsDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsDataSource.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/settings/SettingsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/settings/SettingsDataSource.kt
index 763406fea3f68826a4d21c1345ba990d45e50a41..cdd7ce95f2ebe1146af973df16ca8291818d0d85 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/SettingsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.settings
+package org.futo.circles.feature.settings
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.extensions.createResult
-import com.futo.circles.model.LoadingData
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.createResult
+import org.futo.circles.model.LoadingData
+import org.futo.circles.provider.MatrixSessionProvider
 
 class SettingsDataSource(context: Context) {
 
diff --git a/app/src/main/java/com/futo/circles/feature/settings/SettingsFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/settings/SettingsFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
index a8bd8ff3b7571fde58fb78843d29dcae124ca953..bf2d8d2d7e1faf1522b40efa00f1c06d0766bd33 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.settings
+package org.futo.circles.feature.settings
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.matrix.pass_phrase.LoadingDialog
-import com.futo.circles.databinding.SettingsFragmentBinding
-import com.futo.circles.extensions.findParentNavController
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showDialog
-import com.futo.circles.feature.bottom_navigation.BottomNavigationFragmentDirections
+import org.futo.circles.R
+import org.futo.circles.core.matrix.pass_phrase.LoadingDialog
+import org.futo.circles.databinding.SettingsFragmentBinding
+import org.futo.circles.extensions.findParentNavController
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showDialog
+import org.futo.circles.feature.bottom_navigation.BottomNavigationFragmentDirections
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SettingsFragment : Fragment(R.layout.settings_fragment) {
diff --git a/app/src/main/java/com/futo/circles/feature/settings/SettingsViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/feature/settings/SettingsViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt
index 0a42ae1c3d5486f221e0cd8265151e743b21b6e3..c659148119468ae1b056ea61f0f4f12ec68bb279 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/SettingsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.settings
+package org.futo.circles.feature.settings
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 
 class SettingsViewModel(
     private val dataSource: SettingsDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt
index a583a0ae30d28e5bb5dc8abd61b645b85c519679..328618597410e0996de4c77dd55b40a5c8346f30 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.feature.settings.active_sessions
+package org.futo.circles.feature.settings.active_sessions
 
 import android.content.Context
 import androidx.lifecycle.asFlow
-import com.futo.circles.R
-import com.futo.circles.core.ExpandableItemsDataSource
-import com.futo.circles.model.ActiveSession
-import com.futo.circles.model.ActiveSessionListItem
-import com.futo.circles.model.SessionHeader
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.ExpandableItemsDataSource
+import org.futo.circles.model.ActiveSession
+import org.futo.circles.model.ActiveSessionListItem
+import org.futo.circles.model.SessionHeader
+import org.futo.circles.provider.MatrixSessionProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt
index dd48559c30f94b4ad927a7e1539226b9b886d956..2b3c4442e09a67dd90c9b4af9f58b5a7ae41e1f8 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.feature.settings.active_sessions
+package org.futo.circles.feature.settings.active_sessions
 
 import android.os.Bundle
 import android.view.View
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.databinding.ActiveSessionsDialogFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.feature.settings.active_sessions.list.ActiveSessionClickListener
-import com.futo.circles.feature.settings.active_sessions.list.ActiveSessionsAdapter
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.databinding.ActiveSessionsDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.feature.settings.active_sessions.list.ActiveSessionClickListener
+import org.futo.circles.feature.settings.active_sessions.list.ActiveSessionsAdapter
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class ActiveSessionsDialogFragment :
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt
index 1a12d0a61434605089e13e0dc5c9f1ff6b5107de..7d4cd836a348e5cfd7fcdf4cc588b1550c6fe7eb 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.settings.active_sessions
+package org.futo.circles.feature.settings.active_sessions
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt
index 6d131b2fdda9d25a77f894f5e45a0910b43a97b6..76b8a8b650980c8b94748ab082513f75089f3c7b 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.settings.active_sessions.list
+package org.futo.circles.feature.settings.active_sessions.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.ActiveSession
-import com.futo.circles.model.ActiveSessionListItem
-import com.futo.circles.model.SessionHeader
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.ActiveSession
+import org.futo.circles.model.ActiveSessionListItem
+import org.futo.circles.model.SessionHeader
 
 interface ActiveSessionClickListener {
     fun onItemClicked(deviceId: String)
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt
index 1a74d42f849105d3a5896c14ae2519a86d80ee11..9312b753165eeada6f3d89894bf6852758a050b8 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.settings.active_sessions.list
+package org.futo.circles.feature.settings.active_sessions.list
 
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.ActiveSessionListItemBinding
-import com.futo.circles.databinding.InviteHeaderListItemBinding
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.ActiveSession
-import com.futo.circles.model.ActiveSessionListItem
-import com.futo.circles.model.SessionHeader
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.ActiveSessionListItemBinding
+import org.futo.circles.databinding.InviteHeaderListItemBinding
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.ActiveSession
+import org.futo.circles.model.ActiveSessionListItem
+import org.futo.circles.model.SessionHeader
 
 abstract class ActiveSessionsViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     abstract fun bind(data: ActiveSessionListItem)
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt
index 90829e93e5f7b4a3ff26214c04dc52a8afde4fc5..f7007dbd6997e89af19103088bc00f8eef370ea4 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.settings.active_sessions.remove_session
+package org.futo.circles.feature.settings.active_sessions.remove_session
 
 import android.content.Context
-import com.futo.circles.R
-import com.futo.circles.core.matrix.auth.AuthConfirmationProvider
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.matrix.auth.AuthConfirmationProvider
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.util.awaitCallback
 
 
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt
index 2b9d14cf8f0daac7142f830d25d52b1d27af9756..e3c5f71882e2bde21db33accf2d43e0d86addb8c 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.settings.active_sessions.remove_session
+package org.futo.circles.feature.settings.active_sessions.remove_session
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.RemoveSessionDialogFragmentBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showError
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.RemoveSessionDialogFragmentBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showError
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt
index 4df5445a0220420b4f521fcafe9f337b85069f23..5355207151bac40131be535b7e0d4eaff8538c33 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.settings.active_sessions.remove_session
+package org.futo.circles.feature.settings.active_sessions.remove_session
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 
 class RemoveSessionViewModel(
     private val dataSource: RemoveSessionDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt
similarity index 61%
rename from app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt
index 37ac507f9eace4a15031a66856112f1a2b0d46fd..c7b0c78f865be2daaba9a736aaefeeeea3b5b2e9 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.feature.settings.change_password
+package org.futo.circles.feature.settings.change_password
 
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixSessionProvider
 
 class ChangePasswordDataSource {
 
diff --git a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt
index 9abf341791fd0c7a41a7973bfad684683339f380..bb09b31216030395fa2d338aac223a2f6a9647cb 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt
@@ -1,15 +1,15 @@
-package com.futo.circles.feature.settings.change_password
+package org.futo.circles.feature.settings.change_password
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.matrix.pass_phrase.LoadingDialog
-import com.futo.circles.databinding.ChangePasswordDialogFragmentBinding
-import com.futo.circles.extensions.*
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.matrix.pass_phrase.LoadingDialog
+import org.futo.circles.databinding.ChangePasswordDialogFragmentBinding
+import org.futo.circles.extensions.*
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class ChangePasswordDialogFragment :
diff --git a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt
similarity index 77%
rename from app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt
index c0be9893cdbb1bb5f7084e54ed81a9e4840e7a4b..fdc2c7a271a0dc2536e55046603aabc09cdfdd2f 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.settings.change_password
+package org.futo.circles.feature.settings.change_password
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.launchBg
 
 class ChangePasswordViewModel(
     private val changePasswordDataSource: ChangePasswordDataSource,
diff --git a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt
similarity index 65%
rename from app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt
index ad8fe9e92fa8acc21df707e08cdfdda42ad9a453..9531c2f222092419f9efc1f82154b215f983b20d 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.settings.deactivate
+package org.futo.circles.feature.settings.deactivate
 
 import android.content.Context
-import com.futo.circles.R
-import com.futo.circles.core.matrix.auth.AuthConfirmationProvider
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.matrix.auth.AuthConfirmationProvider
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixSessionProvider
 
 class DeactivateAccountDataSource(
     context: Context,
diff --git a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt
index c23870cf29fbe205e125e9605558b43a0e67cbc5..b3397e32129d804c762faf516cc532f55787544e 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.settings.deactivate
+package org.futo.circles.feature.settings.deactivate
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.DeactivateAccountDialogFragmentBinding
-import com.futo.circles.extensions.findParentNavController
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showError
-import com.futo.circles.feature.bottom_navigation.BottomNavigationFragmentDirections
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.DeactivateAccountDialogFragmentBinding
+import org.futo.circles.extensions.findParentNavController
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showError
+import org.futo.circles.feature.bottom_navigation.BottomNavigationFragmentDirections
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class DeactivateAccountDialogFragment :
diff --git a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt
index 4411eafac758947dceeab8c725687fbe8c383b44..093e7a630fc2ca087b73285503692da6af9cf7d5 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.settings.deactivate
+package org.futo.circles.feature.settings.deactivate
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 
 class DeactivateAccountViewModel(
     private val dataSource: DeactivateAccountDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
index 5a2ef3dee9f710a4bed7d851f761812fe79e2ed7..76f3dba2035da05541b639b4557781d88bfd0a17 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.settings.edit_profile
+package org.futo.circles.feature.settings.edit_profile
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
-import com.futo.circles.R
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.EditProfileDialogFragmentBinding
-import com.futo.circles.extensions.*
-import com.futo.circles.mapping.notEmptyDisplayName
+import org.futo.circles.R
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.EditProfileDialogFragmentBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.mapping.notEmptyDisplayName
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.matrix.android.sdk.api.session.user.model.User
 
diff --git a/app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
index 750e2da498748c41d2a182f2901f9a5787703890..ee71537465b69544f78890e8b31f6fe661e1f136 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.settings.edit_profile
+package org.futo.circles.feature.settings.edit_profile
 
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.sign_up.setup_profile.SetupProfileDataSource
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.feature.sign_up.setup_profile.SetupProfileDataSource
 
 class EditProfileViewModel(
     private val dataSource: SetupProfileDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpDataSource.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/SignUpDataSource.kt
index 21f8ab6644445080f25446852367712ccee6832e..f532e7a74761806e9b9d1ccf79d1bed19b66e9ff 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpDataSource.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.sign_up
+package org.futo.circles.feature.sign_up
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.core.REGISTRATION_TOKEN_KEY_PREFIX
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
-import com.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixInstanceProvider
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.REGISTRATION_TOKEN_KEY_PREFIX
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
+import org.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.provider.MatrixSessionProvider
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpFragment.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/sign_up/SignUpFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/SignUpFragment.kt
index cdabd03135e541d47cba43234947f9e6d84b683f..4138c330639ed11dbde2058e23631c37c0548fae 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.sign_up
+package org.futo.circles.feature.sign_up
 
 import android.os.Bundle
 import android.view.View
@@ -8,14 +8,14 @@ import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BackPressOwner
-import com.futo.circles.core.matrix.pass_phrase.LoadingDialog
-import com.futo.circles.databinding.SignUpFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showDialog
-import com.futo.circles.extensions.showError
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BackPressOwner
+import org.futo.circles.core.matrix.pass_phrase.LoadingDialog
+import org.futo.circles.databinding.SignUpFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showDialog
+import org.futo.circles.extensions.showError
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SignUpFragment : Fragment(R.layout.sign_up_fragment), BackPressOwner {
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpViewModel.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/feature/sign_up/SignUpViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/SignUpViewModel.kt
index 035eaf5574282af7cc062490506d06a15a5e899e..1bdbd508b80285d74e5f0e1b1e624b56ceca8c1c 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.sign_up
+package org.futo.circles.feature.sign_up
 
 import androidx.lifecycle.ViewModel
 
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt
index c0b0502d348d10d5e9c89a1123623054b3d89add..ca43566cab7fe6dd80d86500ead1c939ab890c5d 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.sign_up.setup_circles
+package org.futo.circles.feature.sign_up.setup_circles
 
 import android.content.Context
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.mapping.notEmptyDisplayName
-import com.futo.circles.model.SetupCircleListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.mapping.notEmptyDisplayName
+import org.futo.circles.model.SetupCircleListItem
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getUser
 
 class SetupCirclesDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
index 95c97b381d61d3b5c527c52f9bc66929175f687a..06807c2b3be59741908e4440528471e3d0ff67db 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.sign_up.setup_circles
+package org.futo.circles.feature.sign_up.setup_circles
 
 import android.os.Bundle
 import android.view.View
@@ -6,15 +6,15 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.databinding.SetupCirclesFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.sign_up.setup_circles.list.SetupCirclesAdapter
-import com.futo.circles.model.SetupCircleListItem
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.databinding.SetupCirclesFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showSuccess
+import org.futo.circles.feature.sign_up.setup_circles.list.SetupCirclesAdapter
+import org.futo.circles.model.SetupCircleListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SetupCirclesFragment : Fragment(R.layout.setup_circles_fragment), HasLoadingState {
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
index af3f71d147c03c42514778fa1eec22758636a509..ea73005e40bcc4f708d6bcfda6a2603081af7dd1 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.sign_up.setup_circles
+package org.futo.circles.feature.sign_up.setup_circles
 
 import android.net.Uri
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.core.matrix.room.CreateRoomDataSource
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.core.matrix.room.CreateRoomDataSource
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.launchBg
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
index 1bf8940586094efd72682da3155dc0e54dbf3568..27c930faf07974bc20887f77a4a2bc7d7b4674ed 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.sign_up.setup_circles.list
+package org.futo.circles.feature.sign_up.setup_circles.list
 
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.SetupCircleListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.SetupCircleListItem
 
 class SetupCirclesAdapter(
     private val onCircleClicked: (SetupCircleListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
similarity index 72%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
index 9f19db8c4b664e63da452881300234646954e246..fc04ac21fa53db75c70d1b9fdf40f273e7b2ca5c 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.sign_up.setup_circles.list
+package org.futo.circles.feature.sign_up.setup_circles.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.SetupCircleListItemBinding
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.SetupCircleListItem
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.SetupCircleListItemBinding
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.SetupCircleListItem
 
 class SetupCirclesViewHolder(
     parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt
index baa5c4df6513ab157ea62a956b9e5c73739bb093..cb69a146ce77f835d9304d3bfc17bcffd4236caa 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.sign_up.setup_profile
+package org.futo.circles.feature.sign_up.setup_profile
 
 import android.content.Context
 import android.net.Uri
-import com.futo.circles.R
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.getFilename
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.getFilename
+import org.futo.circles.provider.MatrixSessionProvider
 import java.util.*
 
 class SetupProfileDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
index 877abe95869cab7626f36666f32e855611b49cd7..ae19ae3350bf3c4f60191b2bb9a1747470fd94f5 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.sign_up.setup_profile
+package org.futo.circles.feature.sign_up.setup_profile
 
 import android.os.Bundle
 import android.view.View
@@ -6,14 +6,14 @@ import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.databinding.SetupProfileFragmentBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showDialog
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.databinding.SetupProfileFragmentBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showDialog
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SetupProfileFragment : Fragment(R.layout.setup_profile_fragment), HasLoadingState {
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
index d2ab165e8ad7bc35c394ce40257a72af2ed3896f..4b8489ce218051344aa4bcdea4aa34f1619fa1f4 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.sign_up.setup_profile
+package org.futo.circles.feature.sign_up.setup_profile
 
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 
 class SetupProfileViewModel(
     private val dataSource: SetupProfileDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
index 26f1d8b081e95fe9fd23dcd70470b80bfa9b8974..d4b82c6a7fabd549929857b24df4b94eed50efb5 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.sign_up.sign_up_type
+package org.futo.circles.feature.sign_up.sign_up_type
 
 import android.content.Context
-import com.futo.circles.R
-import com.futo.circles.extensions.createResult
-import com.futo.circles.feature.sign_up.SignUpDataSource
-import com.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.createResult
+import org.futo.circles.feature.sign_up.SignUpDataSource
+import org.futo.circles.provider.MatrixInstanceProvider
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
 
 class SelectSignUpTypeDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
index a8f44171a18960ca9da0c8b2eec0eef07242f854..1b5fa5c9eaad0921bdf71a78086d971d618baaaf 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
@@ -1,15 +1,15 @@
-package com.futo.circles.feature.sign_up.sign_up_type
+package org.futo.circles.feature.sign_up.sign_up_type
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.SelectSignUpTypeFragmentBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeResponse
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.SelectSignUpTypeFragmentBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeResponse
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SelectSignUpTypeFragment : Fragment(R.layout.select_sign_up_type_fragment), HasLoadingState {
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
similarity index 72%
rename from app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
index c49ad257d07faa9122d8588f8f634a7012646aaf..1c197b9f7e6951e32457fba54d714c6cfc952bfa 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.sign_up.sign_up_type
+package org.futo.circles.feature.sign_up.sign_up_type
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 
 class SelectSignUpTypeViewModel(
     private val dataSource: SelectSignUpTypeDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt
index ce4bbd72ef23783f9f089e4f3e7ed2adf9d9de3e..3a7aeb5091bf790ddfb5ddbb3a012b3911f55b8e 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.sign_up.terms
+package org.futo.circles.feature.sign_up.terms
 
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
-import com.futo.circles.BuildConfig
-import com.futo.circles.R
-import com.futo.circles.core.TERMS_URL_EXTENSION
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.toTermsListItems
-import com.futo.circles.feature.sign_up.SignUpDataSource
-import com.futo.circles.model.TermsListItem
-import com.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.BuildConfig
+import org.futo.circles.R
+import org.futo.circles.core.TERMS_URL_EXTENSION
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.toTermsListItems
+import org.futo.circles.feature.sign_up.SignUpDataSource
+import org.futo.circles.model.TermsListItem
+import org.futo.circles.provider.MatrixInstanceProvider
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
 import org.matrix.android.sdk.api.auth.registration.Stage
 
@@ -45,7 +45,7 @@ class AcceptTermsDataSource(
             ?: listOf(
                 TermsListItem(
                     1, context.getString(R.string.terms_and_conditions),
-                    BuildConfig.MATRIX_HOME_SERVER_URL + TERMS_URL_EXTENSION
+                    org.futo.circles.BuildConfig.MATRIX_HOME_SERVER_URL + TERMS_URL_EXTENSION
                 )
             )
 
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
similarity index 77%
rename from app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
index 7bf3a395c9ba5b11586e802b3cafa01294edb03f..d990712b8741775b39b86f1309930767520986c4 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
@@ -1,19 +1,19 @@
-package com.futo.circles.feature.sign_up.terms
+package org.futo.circles.feature.sign_up.terms
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DividerItemDecoration
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.fragment.ParentBackPressOwnerFragment
-import com.futo.circles.databinding.AcceptTermsFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.openCustomTabUrl
-import com.futo.circles.feature.sign_up.terms.list.TermsListAdapter
-import com.futo.circles.model.TermsListItem
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.fragment.ParentBackPressOwnerFragment
+import org.futo.circles.databinding.AcceptTermsFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.openCustomTabUrl
+import org.futo.circles.feature.sign_up.terms.list.TermsListAdapter
+import org.futo.circles.model.TermsListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class AcceptTermsFragment : ParentBackPressOwnerFragment(R.layout.accept_terms_fragment),
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
index 7f89bd9fc11d9cf2730e074cc223b750c48e7656..8f56fa03a150c566086139d1d11d54f21c937943 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.sign_up.terms
+package org.futo.circles.feature.sign_up.terms
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.model.TermsListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.model.TermsListItem
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
 
 class AcceptTermsViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt b/app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
index b56b08ca38c292ae668680fa894ef42835987843..50d219c059e799492831a53c59288b8fbdbcc45e 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.sign_up.terms.list
+package org.futo.circles.feature.sign_up.terms.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.TermsListItemBinding
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.TermsListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.TermsListItemBinding
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.TermsListItem
 
 class TermsItemViewHolder(
     parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt b/app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
index b216f89b8b783254a7a92d0272fd421652e3ee52..d2517745ed7f95a154314ef25786ded55f588ff3 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.sign_up.terms.list
+package org.futo.circles.feature.sign_up.terms.list
 
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.TermsListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.TermsListItem
 
 class TermsListAdapter(
     private val onViewTerms: (TermsListItem) -> Unit,
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt
similarity index 66%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt
index dd89129919d6580f3472b2b69ff7dc156443642a..cfc7814af5daeb21c060b33ce91d69c27ee96551 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.sign_up.validate_email
+package org.futo.circles.feature.sign_up.validate_email
 
-import com.futo.circles.BuildConfig
-import com.futo.circles.core.VALIDATION_TOKEN_SUBMIT_URL_PREFIX
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.feature.sign_up.SignUpDataSource
-import com.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.BuildConfig
+import org.futo.circles.core.VALIDATION_TOKEN_SUBMIT_URL_PREFIX
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.feature.sign_up.SignUpDataSource
+import org.futo.circles.provider.MatrixInstanceProvider
 import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
 import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationResponse
@@ -26,7 +26,7 @@ class ValidateEmailDataSource(
         val result = createResult {
             wizard.handleValidateThreePid(
                 code,
-                BuildConfig.MATRIX_HOME_SERVER_URL + VALIDATION_TOKEN_SUBMIT_URL_PREFIX
+                org.futo.circles.BuildConfig.MATRIX_HOME_SERVER_URL + VALIDATION_TOKEN_SUBMIT_URL_PREFIX
             )
         }
         (result as? Response.Success)?.let { signUpDataSource.stageCompleted(result.data) }
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
index 9e7c0ace8fc2207a6ae61b4afc6ab5988a5f4ea5..f6956da71f322f7043ef19e28b2823b2dddc064c 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
@@ -1,15 +1,15 @@
-package com.futo.circles.feature.sign_up.validate_email
+package org.futo.circles.feature.sign_up.validate_email
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.fragment.ParentBackPressOwnerFragment
-import com.futo.circles.databinding.ValidateEmailFragmentBinding
-import com.futo.circles.extensions.*
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.fragment.ParentBackPressOwnerFragment
+import org.futo.circles.databinding.ValidateEmailFragmentBinding
+import org.futo.circles.extensions.*
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class ValidateEmailFragment : ParentBackPressOwnerFragment(R.layout.validate_email_fragment),
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
index 59964c1aa67fc9588d006284a7bc9513748b15f4..dab1ef55b84e71845d8a5f36369650e526638901 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.sign_up.validate_email
+package org.futo.circles.feature.sign_up.validate_email
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
 import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationResponse
 
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt
similarity index 76%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt
index 8f08b6fe69c69dd03c6c2b064e6221976a7d003c..43864d482ee842cffa9944e49f29f1e958809508 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.sign_up.validate_token
+package org.futo.circles.feature.sign_up.validate_token
 
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.feature.sign_up.SignUpDataSource
-import com.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.feature.sign_up.SignUpDataSource
+import org.futo.circles.provider.MatrixInstanceProvider
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
 import org.matrix.android.sdk.api.auth.registration.Stage
 
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
similarity index 77%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
index 2b860036de55a031a9294633046a3a2c7e8d2621..89ad81a8fab0b1183d810868fb0b60309c062169 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.sign_up.validate_token
+package org.futo.circles.feature.sign_up.validate_token
 
 import android.os.Bundle
 import android.view.View
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.fragment.ParentBackPressOwnerFragment
-import com.futo.circles.databinding.ValidateTokenFragmentBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showDialog
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.fragment.ParentBackPressOwnerFragment
+import org.futo.circles.databinding.ValidateTokenFragmentBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showDialog
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class ValidateTokenFragment : ParentBackPressOwnerFragment(R.layout.validate_token_fragment),
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
index f8cd9fac10903e350b2eb400fa290e3bfc4cafa1..69082246ad4dffc823e0e9011727eecee4256d54 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.sign_up.validate_token
+package org.futo.circles.feature.sign_up.validate_token
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
 
 class ValidateTokenViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/splash/SplashFragment.kt b/app/src/main/java/org/futo/circles/feature/splash/SplashFragment.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/splash/SplashFragment.kt
rename to app/src/main/java/org/futo/circles/feature/splash/SplashFragment.kt
index cc0fa729f396e8fb4da0f37728baf77bc842f344..adafeba808d26c5951397f57f49657200cb431dd 100644
--- a/app/src/main/java/com/futo/circles/feature/splash/SplashFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/splash/SplashFragment.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.splash
+package org.futo.circles.feature.splash
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
-import com.futo.circles.R
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.provider.MatrixSessionProvider
 
 class SplashFragment : Fragment(R.layout.splash_fragment) {
 
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/BaseTimelineViewModel.kt b/app/src/main/java/org/futo/circles/feature/timeline/BaseTimelineViewModel.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/timeline/BaseTimelineViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/BaseTimelineViewModel.kt
index e68fac54612dc4d6c56a3743922864a3122404d5..440936d99e4447327779dd83b1d33f3b6c67894b 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/BaseTimelineViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/BaseTimelineViewModel.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.feature.timeline
+package org.futo.circles.feature.timeline
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.feature.timeline.data_source.TimelineDataSource
+import org.futo.circles.feature.timeline.data_source.TimelineDataSource
 
 abstract class BaseTimelineViewModel(
     private val timelineDataSource: TimelineDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/TimelineFragment.kt b/app/src/main/java/org/futo/circles/feature/timeline/TimelineFragment.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/feature/timeline/TimelineFragment.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/TimelineFragment.kt
index 1553ee7ec01a2caf3974f3cbce0fffe2471ee43d..56109697e9ad211f4656747e9fc6226ad183849c 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/TimelineFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/TimelineFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.timeline
+package org.futo.circles.feature.timeline
 
 import android.annotation.SuppressLint
 import android.net.Uri
@@ -12,19 +12,19 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.list.BaseRvDecoration
-import com.futo.circles.databinding.TimelineFragmentBinding
-import com.futo.circles.extensions.*
-import com.futo.circles.feature.timeline.list.PostViewHolder
-import com.futo.circles.feature.timeline.list.TimelineAdapter
-import com.futo.circles.feature.timeline.post.CreatePostListener
-import com.futo.circles.feature.timeline.post.emoji.EmojiPickerListener
-import com.futo.circles.feature.timeline.post.share.ShareProvider
-import com.futo.circles.model.CircleRoomTypeArg
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.PostContent
-import com.futo.circles.view.PostOptionsListener
+import org.futo.circles.R
+import org.futo.circles.core.list.BaseRvDecoration
+import org.futo.circles.databinding.TimelineFragmentBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.feature.timeline.list.PostViewHolder
+import org.futo.circles.feature.timeline.list.TimelineAdapter
+import org.futo.circles.feature.timeline.post.CreatePostListener
+import org.futo.circles.feature.timeline.post.emoji.EmojiPickerListener
+import org.futo.circles.feature.timeline.post.share.ShareProvider
+import org.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.PostContent
+import org.futo.circles.view.PostOptionsListener
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/TimelineViewModel.kt b/app/src/main/java/org/futo/circles/feature/timeline/TimelineViewModel.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/timeline/TimelineViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/TimelineViewModel.kt
index afbc959ca1966be5f4403fe51631d75cff2e71fc..7deb0b26233d937a35f40b5bf870ff02ed879824 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/TimelineViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/TimelineViewModel.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.timeline
+package org.futo.circles.feature.timeline
 
 import android.net.Uri
 import androidx.lifecycle.asLiveData
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.people.UserOptionsDataSource
-import com.futo.circles.feature.room.LeaveRoomDataSource
-import com.futo.circles.feature.timeline.data_source.SendMessageDataSource
-import com.futo.circles.feature.timeline.post.share.ShareableContent
-import com.futo.circles.feature.timeline.data_source.TimelineDataSource
-import com.futo.circles.feature.timeline.post.PostOptionsDataSource
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.PostContent
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.feature.people.UserOptionsDataSource
+import org.futo.circles.feature.room.LeaveRoomDataSource
+import org.futo.circles.feature.timeline.data_source.SendMessageDataSource
+import org.futo.circles.feature.timeline.post.share.ShareableContent
+import org.futo.circles.feature.timeline.data_source.TimelineDataSource
+import org.futo.circles.feature.timeline.post.PostOptionsDataSource
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.PostContent
 import org.matrix.android.sdk.api.util.Cancelable
 
 class TimelineViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt b/app/src/main/java/org/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt
index a50772be4009554a20d5a69587382e9b3e786791..33d182ae1536b889f8886b7bd23cc765c5febfee 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.timeline.data_source
+package org.futo.circles.feature.timeline.data_source
 
 import android.content.Context
 import android.net.Uri
-import com.futo.circles.extensions.toImageContentAttachmentData
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.toImageContentAttachmentData
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getRoom
 
 class SendMessageDataSource(private val context: Context) {
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineBuilder.kt b/app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineBuilder.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineBuilder.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineBuilder.kt
index a4dd81b62fcfa84395aba1a49810cacdd2864c37..8c0f24e84a035ed449229a7f1660419df0b85316 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineBuilder.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineBuilder.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.timeline.data_source
+package org.futo.circles.feature.timeline.data_source
 
-import com.futo.circles.mapping.toPost
-import com.futo.circles.model.Post
-import com.futo.circles.model.PostContentType
-import com.futo.circles.model.ReplyPost
-import com.futo.circles.model.RootPost
+import org.futo.circles.mapping.toPost
+import org.futo.circles.model.Post
+import org.futo.circles.model.PostContentType
+import org.futo.circles.model.ReplyPost
+import org.futo.circles.model.RootPost
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineDataSource.kt b/app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
index bb5524ce4cce5f8b0dd88eadcbba7c7f844c4f1b..e1776757a75d07bde816995cf1c8d71d5ba9f6b7 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.timeline.data_source
+package org.futo.circles.feature.timeline.data_source
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.map
-import com.futo.circles.mapping.nameOrId
-import com.futo.circles.model.CircleRoomTypeArg
-import com.futo.circles.model.Post
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.mapping.nameOrId
+import org.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.model.Post
+import org.futo.circles.provider.MatrixSessionProvider
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.mapNotNull
 import org.matrix.android.sdk.api.session.events.model.EventType
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/list/TimelineAdapter.kt b/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineAdapter.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/timeline/list/TimelineAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/list/TimelineAdapter.kt
index c908d845e48b469390d26171c9b4a77dbdd1cedb..037fe96cc380161af7bebe9559096cf32de02380 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/list/TimelineAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineAdapter.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.timeline.list
+package org.futo.circles.feature.timeline.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.Post
-import com.futo.circles.model.PostContentType
-import com.futo.circles.model.PostItemPayload
-import com.futo.circles.model.RootPost
-import com.futo.circles.view.PostOptionsListener
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.Post
+import org.futo.circles.model.PostContentType
+import org.futo.circles.model.PostItemPayload
+import org.futo.circles.model.RootPost
+import org.futo.circles.view.PostOptionsListener
 
 class TimelineAdapter(
     private val userPowerLevel: Int,
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/list/TimelineViewHolder.kt b/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineViewHolder.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/timeline/list/TimelineViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/list/TimelineViewHolder.kt
index a3c7899c69feb735946800088a44686f2dc16ee1..42ec3190ce67976dd9c4647cca3d0829a87279b8 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/list/TimelineViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineViewHolder.kt
@@ -1,23 +1,23 @@
-package com.futo.circles.feature.timeline.list
+package org.futo.circles.feature.timeline.list
 
 import android.util.Size
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.ImagePostViewBinding
-import com.futo.circles.databinding.TextPostViewBinding
-import com.futo.circles.extensions.UriContentScheme
-import com.futo.circles.extensions.gone
-import com.futo.circles.extensions.loadEncryptedImage
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.Post
-import com.futo.circles.model.PostItemPayload
-import com.futo.circles.model.TextContent
-import com.futo.circles.provider.MatrixSessionProvider
-import com.futo.circles.view.PostOptionsListener
-import com.futo.circles.view.PostLayout
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.ImagePostViewBinding
+import org.futo.circles.databinding.TextPostViewBinding
+import org.futo.circles.extensions.UriContentScheme
+import org.futo.circles.extensions.gone
+import org.futo.circles.extensions.loadEncryptedImage
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.Post
+import org.futo.circles.model.PostItemPayload
+import org.futo.circles.model.TextContent
+import org.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.view.PostOptionsListener
+import org.futo.circles.view.PostLayout
 import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
 
 sealed class PostViewHolder(view: View, private val userPowerLevel: Int) :
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt b/app/src/main/java/org/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt
index 19aeb7dda16e4269b131bf05e6dc7acf518a64cd..3069c32b630f9eb2be4651db3a8a9ae42892b588 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.timeline.list
+package org.futo.circles.feature.timeline.list
 
-import com.futo.circles.R
-import com.futo.circles.extensions.gone
-import com.futo.circles.extensions.visible
-import com.futo.circles.model.LoadingData
-import com.futo.circles.view.LoadingView
+import org.futo.circles.R
+import org.futo.circles.extensions.gone
+import org.futo.circles.extensions.visible
+import org.futo.circles.model.LoadingData
+import org.futo.circles.view.LoadingView
 import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
 
 object UploadImageProgressHelper {
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
index afa168eddc257f6fb2602b935b2919259ea8ccd3..049a0f6a8911c17af4e9caf0e8fd152ea564cc32 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.timeline.post
+package org.futo.circles.feature.timeline.post
 
 import android.content.Context
 import android.net.Uri
@@ -8,10 +8,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.databinding.CreatePostBottomSheetBinding
-import com.futo.circles.view.PreviewPostListener
+import org.futo.circles.R
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.databinding.CreatePostBottomSheetBinding
+import org.futo.circles.view.PreviewPostListener
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/PostOptionsDataSource.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/PostOptionsDataSource.kt
similarity index 76%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/PostOptionsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/PostOptionsDataSource.kt
index 8c3a2f9f6e32d5416f26c5304b3405ee66310c50..bc805c95f0a54ee27f32aa521e57a264d937bfe0 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/PostOptionsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/PostOptionsDataSource.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.timeline.post
+package org.futo.circles.feature.timeline.post
 
 import android.content.Context
 import com.bumptech.glide.Glide
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.getUri
-import com.futo.circles.extensions.saveImageToDeviceGallery
-import com.futo.circles.feature.timeline.post.share.ImageShareable
-import com.futo.circles.feature.timeline.post.share.TextShareable
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.PostContent
-import com.futo.circles.model.TextContent
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.getUri
+import org.futo.circles.extensions.saveImageToDeviceGallery
+import org.futo.circles.feature.timeline.post.share.ImageShareable
+import org.futo.circles.feature.timeline.post.share.TextShareable
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.PostContent
+import org.futo.circles.model.TextContent
+import org.futo.circles.provider.MatrixSessionProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.session.getRoom
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
index 2a82e45acabdc424f43037f292ae48127754261c..ca9acefc55fc8fbdf24e671c75a34e5b371d3e1d 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.timeline.post.emoji
+package org.futo.circles.feature.timeline.post.emoji
 
 import android.content.Context
 import android.os.Bundle
@@ -7,11 +7,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.navigation.fragment.navArgs
-import com.futo.circles.databinding.EmojiBottomSheetBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.feature.timeline.post.emoji.list.EmojiAdapter
-import com.futo.circles.model.EmojiCategory
-import com.futo.circles.model.EmojiItem
+import org.futo.circles.databinding.EmojiBottomSheetBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.feature.timeline.post.emoji.list.EmojiAdapter
+import org.futo.circles.model.EmojiCategory
+import org.futo.circles.model.EmojiItem
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt
index 71821658963e551e07183febb00ee47bd993e7b7..fabdcf6fc0f6af5946e8094174c595b7293fe35b 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.timeline.post.emoji
+package org.futo.circles.feature.timeline.post.emoji
 
 import android.content.Context
 import android.graphics.Paint
 import androidx.core.graphics.PaintCompat
-import com.futo.circles.R
-import com.futo.circles.model.EmojiCategory
-import com.futo.circles.model.EmojiData
-import com.futo.circles.model.EmojiItem
+import org.futo.circles.R
+import org.futo.circles.model.EmojiCategory
+import org.futo.circles.model.EmojiData
+import org.futo.circles.model.EmojiItem
 import com.google.gson.Gson
 
 class EmojiDataSource(context: Context) {
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
index 581b6f8ee69e594d8a014dec1c09e4afc06591da..e3e4a6ab44a01a7854c56f997433c7f3aa4b9aae 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.timeline.post.emoji
+package org.futo.circles.feature.timeline.post.emoji
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.futo.circles.model.EmojiItem
+import org.futo.circles.model.EmojiItem
 
 class EmojiViewModel(private val emojiDataSource: EmojiDataSource) : ViewModel() {
 
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
index dc0ba6d5c8fe5df3c563c2bea0c30366104639b3..3ca093f29e19a3bd910ca9cc1acf9561804b11e8 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.timeline.post.emoji.list
+package org.futo.circles.feature.timeline.post.emoji.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.EmojiItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.EmojiItem
 
 class EmojiAdapter(
     private val onEmojiSelected: (item: EmojiItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
similarity index 67%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
index 42acada3b5e4cc8149913dfa2b5fe74e1a165d40..f22095e51a6c5639e8588f405e6e6fafd0661c79 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.timeline.post.emoji.list
+package org.futo.circles.feature.timeline.post.emoji.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.EmojiListItemBinding
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.EmojiItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.EmojiListItemBinding
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.EmojiItem
 
 class EmojiViewHolder(
     parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDataSource.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDataSource.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDataSource.kt
index cc3b2980be521db664c3c464fe0af3feff0879cd..7621cfb186c9f59f546abbab6a92821f87fafe29 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.timeline.post.report
+package org.futo.circles.feature.timeline.post.report
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.extensions.createResult
-import com.futo.circles.model.ReportCategoryListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.createResult
+import org.futo.circles.model.ReportCategoryListItem
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getRoom
 
 class ReportDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
index 1c69c56533375c62c270fba29d682748233fad83..93797c871a2871d19845a434d14a07d2b0faf50a 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.timeline.post.report
+package org.futo.circles.feature.timeline.post.report
 
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.ReportDialogFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.timeline.post.report.list.ReportCategoryAdapter
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.ReportDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showSuccess
+import org.futo.circles.feature.timeline.post.report.list.ReportCategoryAdapter
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportViewModel.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportViewModel.kt
similarity index 72%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportViewModel.kt
index 9850312122ca98d795153b4bdfa4bccbcc00fab7..bda1b54535c76a9c03f45b978dddddb4d31e8936 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.timeline.post.report
+package org.futo.circles.feature.timeline.post.report
 
 import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
 
 class ReportViewModel(
     private val reportDataSource: ReportDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
index 8b04acea5f8dc4a756a4812b4bf8dc4f46ea2b04..ae66f638f4d98da201df81e6913d63a998e4f347 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.timeline.post.report.list
+package org.futo.circles.feature.timeline.post.report.list
 
 import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.ReportCategoryListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.ReportCategoryListItem
 
 class ReportCategoryAdapter(
     private val onCategorySelected: (id: Int) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
index e6abebbae8385415035ea0e1406ec90709f578b5..fc9b345524565536fd3a5c68c0c43558d3ad8b6b 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.timeline.post.report.list
+package org.futo.circles.feature.timeline.post.report.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.ReportCategoryListItemBinding
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.ReportCategoryListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.ReportCategoryListItemBinding
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.ReportCategoryListItem
 
 class ReportCategoryViewHolder(
     parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/share/SharableContent.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/share/SharableContent.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/share/SharableContent.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/share/SharableContent.kt
index f21683f52c2b7a84b87910d4f4861d21baba07d7..6e5a46c5e81779cff727be8899018fe92f286f96 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/share/SharableContent.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/share/SharableContent.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.timeline.post.share
+package org.futo.circles.feature.timeline.post.share
 
 import android.net.Uri
 
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/share/ShareProvider.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/share/ShareProvider.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/share/ShareProvider.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/share/ShareProvider.kt
index e01cdc3f1d9b435da73502641fee80bdef60d330..802a6d9cc65c45394bd513b13e18f2ac0a696c9c 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/share/ShareProvider.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/share/ShareProvider.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.timeline.post.share
+package org.futo.circles.feature.timeline.post.share
 
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import com.futo.circles.R
+import org.futo.circles.R
 
 object ShareProvider {
 
diff --git a/app/src/main/java/com/futo/circles/glide/CirclesAppGlideModule.kt b/app/src/main/java/org/futo/circles/glide/CirclesAppGlideModule.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/glide/CirclesAppGlideModule.kt
rename to app/src/main/java/org/futo/circles/glide/CirclesAppGlideModule.kt
index db1db9f85350fe9006f84b3a277e0c39d717f63a..a0a951a43611557e267f499acef397a55857b388 100644
--- a/app/src/main/java/com/futo/circles/glide/CirclesAppGlideModule.kt
+++ b/app/src/main/java/org/futo/circles/glide/CirclesAppGlideModule.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.glide
+package org.futo.circles.glide
 
 import android.content.Context
 import android.util.Log
@@ -7,7 +7,7 @@ import com.bumptech.glide.GlideBuilder
 import com.bumptech.glide.Registry
 import com.bumptech.glide.annotation.GlideModule
 import com.bumptech.glide.module.AppGlideModule
-import com.futo.circles.model.ImageContent
+import org.futo.circles.model.ImageContent
 import java.io.InputStream
 
 @GlideModule
diff --git a/app/src/main/java/com/futo/circles/glide/CirclesGlideDataFetcher.kt b/app/src/main/java/org/futo/circles/glide/CirclesGlideDataFetcher.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/glide/CirclesGlideDataFetcher.kt
rename to app/src/main/java/org/futo/circles/glide/CirclesGlideDataFetcher.kt
index 39ed25d4f633b55f68888603468061394ab6311e..c743d2c8b2a232be0cf0f0d042206968279ca633 100644
--- a/app/src/main/java/com/futo/circles/glide/CirclesGlideDataFetcher.kt
+++ b/app/src/main/java/org/futo/circles/glide/CirclesGlideDataFetcher.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.glide
+package org.futo.circles.glide
 
 import android.content.Context
 import android.util.Log
 import com.bumptech.glide.Priority
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.data.DataFetcher
-import com.futo.circles.extensions.coroutineScope
-import com.futo.circles.model.ImageContent
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.coroutineScope
+import org.futo.circles.model.ImageContent
+import org.futo.circles.provider.MatrixSessionProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/com/futo/circles/glide/CirclesGlideModelLoaderFactory.kt b/app/src/main/java/org/futo/circles/glide/CirclesGlideModelLoaderFactory.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/glide/CirclesGlideModelLoaderFactory.kt
rename to app/src/main/java/org/futo/circles/glide/CirclesGlideModelLoaderFactory.kt
index 6a1cade237b9cf907f5b0145fbed8f3a4700165d..2f0608d5fc28d79de7b3c03a68773497c37fe8e9 100644
--- a/app/src/main/java/com/futo/circles/glide/CirclesGlideModelLoaderFactory.kt
+++ b/app/src/main/java/org/futo/circles/glide/CirclesGlideModelLoaderFactory.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.glide
+package org.futo.circles.glide
 
 import android.content.Context
 import com.bumptech.glide.load.Options
@@ -6,7 +6,7 @@ import com.bumptech.glide.load.model.ModelLoader
 import com.bumptech.glide.load.model.ModelLoaderFactory
 import com.bumptech.glide.load.model.MultiModelLoaderFactory
 import com.bumptech.glide.signature.ObjectKey
-import com.futo.circles.model.ImageContent
+import org.futo.circles.model.ImageContent
 import java.io.InputStream
 
 class CirclesGlideModelLoaderFactory(private val context: Context) :
diff --git a/app/src/main/java/com/futo/circles/glide/LocalFileHelper.kt b/app/src/main/java/org/futo/circles/glide/LocalFileHelper.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/glide/LocalFileHelper.kt
rename to app/src/main/java/org/futo/circles/glide/LocalFileHelper.kt
index ff0c3588dc8bedc86d84a5c6c429cce1a96d074b..4991a38e061c2d2230b49a7a3333045cadded762 100644
--- a/app/src/main/java/com/futo/circles/glide/LocalFileHelper.kt
+++ b/app/src/main/java/org/futo/circles/glide/LocalFileHelper.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.glide
+package org.futo.circles.glide
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/com/futo/circles/mapping/FollowingListItemMapping.kt b/app/src/main/java/org/futo/circles/mapping/FollowingListItemMapping.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/mapping/FollowingListItemMapping.kt
rename to app/src/main/java/org/futo/circles/mapping/FollowingListItemMapping.kt
index fb48a5574b68a9677aef1953dba7f188d52a0ff1..443d821480645a536820c99b87da407d571e1b0e 100644
--- a/app/src/main/java/com/futo/circles/mapping/FollowingListItemMapping.kt
+++ b/app/src/main/java/org/futo/circles/mapping/FollowingListItemMapping.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.mapping
+package org.futo.circles.mapping
 
-import com.futo.circles.extensions.getRoomOwners
-import com.futo.circles.extensions.getTimelineRoomFor
-import com.futo.circles.model.FollowingListItem
+import org.futo.circles.extensions.getRoomOwners
+import org.futo.circles.extensions.getTimelineRoomFor
+import org.futo.circles.model.FollowingListItem
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 fun RoomSummary.toFollowingListItem(circleId: String) = FollowingListItem(
diff --git a/app/src/main/java/com/futo/circles/mapping/MatrixUserMapping.kt b/app/src/main/java/org/futo/circles/mapping/MatrixUserMapping.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/mapping/MatrixUserMapping.kt
rename to app/src/main/java/org/futo/circles/mapping/MatrixUserMapping.kt
index 43ad674466cbb4bfbb1ef0ef57af655ac58dad53..8ce1a7ca8ae79ce54d113b7d40d8ac2906565342 100644
--- a/app/src/main/java/com/futo/circles/mapping/MatrixUserMapping.kt
+++ b/app/src/main/java/org/futo/circles/mapping/MatrixUserMapping.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.mapping
+package org.futo.circles.mapping
 
-import com.futo.circles.model.CirclesUserSummary
-import com.futo.circles.model.PeopleUserListItem
-import com.futo.circles.model.UserListItem
+import org.futo.circles.model.CirclesUserSummary
+import org.futo.circles.model.PeopleUserListItem
+import org.futo.circles.model.UserListItem
 import org.matrix.android.sdk.api.session.user.model.User
 
 fun User.toUserListItem(isSelected: Boolean) = UserListItem(
diff --git a/app/src/main/java/com/futo/circles/mapping/RoomListItemMapping.kt b/app/src/main/java/org/futo/circles/mapping/RoomListItemMapping.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/mapping/RoomListItemMapping.kt
rename to app/src/main/java/org/futo/circles/mapping/RoomListItemMapping.kt
index eedb79109e6d7b8e155e33f636cd238e12295353..f0cb5a8ca4331cc6c41f6e85763e8e1e63861345 100644
--- a/app/src/main/java/com/futo/circles/mapping/RoomListItemMapping.kt
+++ b/app/src/main/java/org/futo/circles/mapping/RoomListItemMapping.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.mapping
+package org.futo.circles.mapping
 
-import com.futo.circles.extensions.getTimelineRoomFor
-import com.futo.circles.model.*
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.getTimelineRoomFor
+import org.futo.circles.model.*
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
diff --git a/app/src/main/java/com/futo/circles/mapping/RoomMemberSummaryMapping.kt b/app/src/main/java/org/futo/circles/mapping/RoomMemberSummaryMapping.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/mapping/RoomMemberSummaryMapping.kt
rename to app/src/main/java/org/futo/circles/mapping/RoomMemberSummaryMapping.kt
index d32e9d3ecc14916f5da8c0cf51a5435acc3fc880..368b95ac6e4e6f87a71ce247538c7579603a6238 100644
--- a/app/src/main/java/com/futo/circles/mapping/RoomMemberSummaryMapping.kt
+++ b/app/src/main/java/org/futo/circles/mapping/RoomMemberSummaryMapping.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.mapping
+package org.futo.circles.mapping
 
-import com.futo.circles.model.CirclesUserSummary
-import com.futo.circles.model.GroupMemberListItem
-import com.futo.circles.model.InvitedUserListItem
+import org.futo.circles.model.CirclesUserSummary
+import org.futo.circles.model.GroupMemberListItem
+import org.futo.circles.model.InvitedUserListItem
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
diff --git a/app/src/main/java/com/futo/circles/mapping/TimelineEventMapping.kt b/app/src/main/java/org/futo/circles/mapping/TimelineEventMapping.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/mapping/TimelineEventMapping.kt
rename to app/src/main/java/org/futo/circles/mapping/TimelineEventMapping.kt
index 0b1346a87dc58778a21a01ba0f7f44742a698834..44e8bdc6b8ba026361aa5f8b090b030135e23084 100644
--- a/app/src/main/java/com/futo/circles/mapping/TimelineEventMapping.kt
+++ b/app/src/main/java/org/futo/circles/mapping/TimelineEventMapping.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.mapping
+package org.futo.circles.mapping
 
 import com.bumptech.glide.request.target.Target
-import com.futo.circles.model.*
+import org.futo.circles.model.*
 import org.matrix.android.sdk.api.session.crypto.attachments.toElementToDecrypt
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
diff --git a/app/src/main/java/com/futo/circles/model/AccessLevel.kt b/app/src/main/java/org/futo/circles/model/AccessLevel.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/model/AccessLevel.kt
rename to app/src/main/java/org/futo/circles/model/AccessLevel.kt
index 3499eca42f122fc45508f8e1199f6b355ea2eb96..5794ffbad25d8832e5d9bf4af240fff044abb2cb 100644
--- a/app/src/main/java/com/futo/circles/model/AccessLevel.kt
+++ b/app/src/main/java/org/futo/circles/model/AccessLevel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
 
diff --git a/app/src/main/java/com/futo/circles/model/AccessLevelListItem.kt b/app/src/main/java/org/futo/circles/model/AccessLevelListItem.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/model/AccessLevelListItem.kt
rename to app/src/main/java/org/futo/circles/model/AccessLevelListItem.kt
index 624b65ca4c35007a5e7deade9c7ab456adb37b2b..f85711964834e0ea4af270ca9eec8a540270a606 100644
--- a/app/src/main/java/com/futo/circles/model/AccessLevelListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/AccessLevelListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
 
 data class AccessLevelListItem(
diff --git a/app/src/main/java/com/futo/circles/model/ActiveSessionListItem.kt b/app/src/main/java/org/futo/circles/model/ActiveSessionListItem.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/model/ActiveSessionListItem.kt
rename to app/src/main/java/org/futo/circles/model/ActiveSessionListItem.kt
index 4a70297744db509da1fb29db5d413a1fd10e682a..bed71d3b26276f9129c97eb420835c78679bd45e 100644
--- a/app/src/main/java/com/futo/circles/model/ActiveSessionListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/ActiveSessionListItem.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.core.list.IdEntity
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.list.IdEntity
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
 
diff --git a/app/src/main/java/com/futo/circles/model/CircleListItemPayload.kt b/app/src/main/java/org/futo/circles/model/CircleListItemPayload.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/model/CircleListItemPayload.kt
rename to app/src/main/java/org/futo/circles/model/CircleListItemPayload.kt
index b07b02ac85eca5da5668d42e7e2419eecf4c8b48..599f028e89b063018bf9b808709d8805b2428e18 100644
--- a/app/src/main/java/com/futo/circles/model/CircleListItemPayload.kt
+++ b/app/src/main/java/org/futo/circles/model/CircleListItemPayload.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 data class CircleListItemPayload(
     val followersCount: Int,
diff --git a/app/src/main/java/com/futo/circles/model/CircleRoomTypeArg.kt b/app/src/main/java/org/futo/circles/model/CircleRoomTypeArg.kt
similarity index 63%
rename from app/src/main/java/com/futo/circles/model/CircleRoomTypeArg.kt
rename to app/src/main/java/org/futo/circles/model/CircleRoomTypeArg.kt
index f4578b2594bb072681955b232743398fb774afd3..947b4b8b0d06a9249c2b810e7fa2001a030dc939 100644
--- a/app/src/main/java/com/futo/circles/model/CircleRoomTypeArg.kt
+++ b/app/src/main/java/org/futo/circles/model/CircleRoomTypeArg.kt
@@ -1,3 +1,3 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 enum class CircleRoomTypeArg { Circle, Group, Photo }
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/model/CirclesRoom.kt b/app/src/main/java/org/futo/circles/model/CirclesRoom.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/model/CirclesRoom.kt
rename to app/src/main/java/org/futo/circles/model/CirclesRoom.kt
index 41635e986007bcffa226098104317e0bc2adeabf..722e9bc2ccd19fb219931f7494737f4d9974f530 100644
--- a/app/src/main/java/com/futo/circles/model/CirclesRoom.kt
+++ b/app/src/main/java/org/futo/circles/model/CirclesRoom.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 import androidx.annotation.StringRes
-import com.futo.circles.R
+import org.futo.circles.R
 import org.matrix.android.sdk.api.session.room.model.RoomType
 
 private const val ROOT_SPACE_TAG = "m.space.root"
diff --git a/app/src/main/java/com/futo/circles/model/CirclesUserSummary.kt b/app/src/main/java/org/futo/circles/model/CirclesUserSummary.kt
similarity index 76%
rename from app/src/main/java/com/futo/circles/model/CirclesUserSummary.kt
rename to app/src/main/java/org/futo/circles/model/CirclesUserSummary.kt
index f6ae56ac24809097fcefc60e06849ca3d76d83c9..9e7b3db506fd3436e62a1a910028e7bbafa43b10 100644
--- a/app/src/main/java/com/futo/circles/model/CirclesUserSummary.kt
+++ b/app/src/main/java/org/futo/circles/model/CirclesUserSummary.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 data class CirclesUserSummary(
     val id: String,
diff --git a/app/src/main/java/com/futo/circles/model/EmojiCategory.kt b/app/src/main/java/org/futo/circles/model/EmojiCategory.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/model/EmojiCategory.kt
rename to app/src/main/java/org/futo/circles/model/EmojiCategory.kt
index 7ef62d4c61bd7cf3fbc36c3d03f318b02e1188d9..681fc6560f7e13f2e3c88be4ae8531392646482a 100644
--- a/app/src/main/java/com/futo/circles/model/EmojiCategory.kt
+++ b/app/src/main/java/org/futo/circles/model/EmojiCategory.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 data class EmojiCategory(
     val id: String,
diff --git a/app/src/main/java/com/futo/circles/model/EmojiData.kt b/app/src/main/java/org/futo/circles/model/EmojiData.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/model/EmojiData.kt
rename to app/src/main/java/org/futo/circles/model/EmojiData.kt
index 0921a58419f6e1df1b2e31774df2a6f307d8a820..0444ae45feb9fbb73c7af8946731dd98f9ef73ad 100644
--- a/app/src/main/java/com/futo/circles/model/EmojiData.kt
+++ b/app/src/main/java/org/futo/circles/model/EmojiData.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 data class EmojiData(
     val categories: List<EmojiCategory>,
diff --git a/app/src/main/java/com/futo/circles/model/EmojiItem.kt b/app/src/main/java/org/futo/circles/model/EmojiItem.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/model/EmojiItem.kt
rename to app/src/main/java/org/futo/circles/model/EmojiItem.kt
index ec99e79e3efd3c7f2da481ea075dd6dada0f71e7..5378952a432931e7ada4c2d40973212b9d9b27ca 100644
--- a/app/src/main/java/com/futo/circles/model/EmojiItem.kt
+++ b/app/src/main/java/org/futo/circles/model/EmojiItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
 import com.google.gson.annotations.SerializedName
 
 data class EmojiItem(
diff --git a/app/src/main/java/com/futo/circles/model/FollowingListItem.kt b/app/src/main/java/org/futo/circles/model/FollowingListItem.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/model/FollowingListItem.kt
rename to app/src/main/java/org/futo/circles/model/FollowingListItem.kt
index 9708d126cb65cafe23aefcabd3d894af689ecfe9..15f4c95d6a49acf066fa3ec69563955db0ff2b90 100644
--- a/app/src/main/java/com/futo/circles/model/FollowingListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/FollowingListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
 
 data class FollowingListItem(
     override val id: String,
diff --git a/app/src/main/java/com/futo/circles/model/GalleryImageListItem.kt b/app/src/main/java/org/futo/circles/model/GalleryImageListItem.kt
similarity index 66%
rename from app/src/main/java/com/futo/circles/model/GalleryImageListItem.kt
rename to app/src/main/java/org/futo/circles/model/GalleryImageListItem.kt
index 26ef8b3e5c27a35453baf7f06ca4a96d202c7629..7af0f8ca4d7723d9c2dadb2d42653c903d3302e8 100644
--- a/app/src/main/java/com/futo/circles/model/GalleryImageListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/GalleryImageListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
 
 data class GalleryImageListItem(
     override val id: String,
diff --git a/app/src/main/java/com/futo/circles/model/GroupListItemPayload.kt b/app/src/main/java/org/futo/circles/model/GroupListItemPayload.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/model/GroupListItemPayload.kt
rename to app/src/main/java/org/futo/circles/model/GroupListItemPayload.kt
index c51349defaa61c55ec434f7284f6efa99fb97f67..da7720f7a037576ab6ac63c9604c8af044485535 100644
--- a/app/src/main/java/com/futo/circles/model/GroupListItemPayload.kt
+++ b/app/src/main/java/org/futo/circles/model/GroupListItemPayload.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 data class GroupListItemPayload(
     val topic: String?,
diff --git a/app/src/main/java/com/futo/circles/model/GroupMemberListItem.kt b/app/src/main/java/org/futo/circles/model/GroupMemberListItem.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/model/GroupMemberListItem.kt
rename to app/src/main/java/org/futo/circles/model/GroupMemberListItem.kt
index c242c65e92d02d62aff8fee8b0289fb2c4bbac13..2c0c0dbc70af4effc53a11d267530e720fa03e48 100644
--- a/app/src/main/java/com/futo/circles/model/GroupMemberListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/GroupMemberListItem.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.model
-
-import com.futo.circles.core.list.IdEntity
-import com.futo.circles.extensions.getCurrentUserPowerLevel
-import com.futo.circles.extensions.isCurrentUserAbleToBan
-import com.futo.circles.extensions.isCurrentUserAbleToChangeSettings
-import com.futo.circles.extensions.isCurrentUserAbleToKick
-import com.futo.circles.provider.MatrixSessionProvider
+package org.futo.circles.model
+
+import org.futo.circles.core.list.IdEntity
+import org.futo.circles.extensions.getCurrentUserPowerLevel
+import org.futo.circles.extensions.isCurrentUserAbleToBan
+import org.futo.circles.extensions.isCurrentUserAbleToChangeSettings
+import org.futo.circles.extensions.isCurrentUserAbleToKick
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
 
diff --git a/app/src/main/java/com/futo/circles/model/InviteMemberListItem.kt b/app/src/main/java/org/futo/circles/model/InviteMemberListItem.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/model/InviteMemberListItem.kt
rename to app/src/main/java/org/futo/circles/model/InviteMemberListItem.kt
index 48a6a71d98950d093dde07fcea169f53e790e1d9..60e88f5befba0102a5f4b61595d9e85fd773b4fb 100644
--- a/app/src/main/java/com/futo/circles/model/InviteMemberListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/InviteMemberListItem.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.R
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.R
+import org.futo.circles.core.list.IdEntity
 
 sealed class InviteMemberListItem : IdEntity<String>
 
diff --git a/app/src/main/java/com/futo/circles/model/LoadingData.kt b/app/src/main/java/org/futo/circles/model/LoadingData.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/model/LoadingData.kt
rename to app/src/main/java/org/futo/circles/model/LoadingData.kt
index bfaa3ec227a6e95b12385ea83e6c5fe8a75c4c67..e12bdacafb8faad372e0fa133110de1ead26774c 100644
--- a/app/src/main/java/com/futo/circles/model/LoadingData.kt
+++ b/app/src/main/java/org/futo/circles/model/LoadingData.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 import androidx.annotation.StringRes
-import com.futo.circles.R
+import org.futo.circles.R
 
 data class LoadingData(
     @StringRes var messageId: Int = R.string.loading,
diff --git a/app/src/main/java/com/futo/circles/model/PeopleListItem.kt b/app/src/main/java/org/futo/circles/model/PeopleListItem.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/model/PeopleListItem.kt
rename to app/src/main/java/org/futo/circles/model/PeopleListItem.kt
index 7963e7834b7616b6031b8ca2d729c7c761f46ec9..60a34f00fe2e7f7eaa5d02b1cea312db3cdd8395 100644
--- a/app/src/main/java/com/futo/circles/model/PeopleListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/PeopleListItem.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.R
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.R
+import org.futo.circles.core.list.IdEntity
 
 sealed class PeopleListItem : IdEntity<String>
 
diff --git a/app/src/main/java/com/futo/circles/model/Post.kt b/app/src/main/java/org/futo/circles/model/Post.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/model/Post.kt
rename to app/src/main/java/org/futo/circles/model/Post.kt
index ab5a42f16f8c237eccca70b8dcd4cd4cf7670d62..46dfc9b1c21cfb7ab5c0c15aea0559af48e4772b 100644
--- a/app/src/main/java/com/futo/circles/model/Post.kt
+++ b/app/src/main/java/org/futo/circles/model/Post.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.core.list.IdEntity
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.list.IdEntity
+import org.futo.circles.provider.MatrixSessionProvider
 
 sealed class Post(
     open val postInfo: PostInfo,
diff --git a/app/src/main/java/com/futo/circles/model/PostContent.kt b/app/src/main/java/org/futo/circles/model/PostContent.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/model/PostContent.kt
rename to app/src/main/java/org/futo/circles/model/PostContent.kt
index 07985515a4bc7bdd79e2f1716d9d74b16b4e5f32..e595b757f88e12ee2c4ec9bebf1a71900ccf03eb 100644
--- a/app/src/main/java/com/futo/circles/model/PostContent.kt
+++ b/app/src/main/java/org/futo/circles/model/PostContent.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 import org.matrix.android.sdk.api.session.crypto.attachments.ElementToDecrypt
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
diff --git a/app/src/main/java/com/futo/circles/model/PostInfo.kt b/app/src/main/java/org/futo/circles/model/PostInfo.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/model/PostInfo.kt
rename to app/src/main/java/org/futo/circles/model/PostInfo.kt
index eb0b3795b819dbe49f144cff70c97d44fe46dcd0..b713620a19fc3f7ad13d58abf408ddd7f8fbaf17 100644
--- a/app/src/main/java/com/futo/circles/model/PostInfo.kt
+++ b/app/src/main/java/org/futo/circles/model/PostInfo.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 
diff --git a/app/src/main/java/com/futo/circles/model/PostItemPayload.kt b/app/src/main/java/org/futo/circles/model/PostItemPayload.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/model/PostItemPayload.kt
rename to app/src/main/java/org/futo/circles/model/PostItemPayload.kt
index 65134bd683ac5199314c9b0f95ac0aaad9f90b1c..5e7678bc8012987fdd24a9836a51ce773195c7b6 100644
--- a/app/src/main/java/com/futo/circles/model/PostItemPayload.kt
+++ b/app/src/main/java/org/futo/circles/model/PostItemPayload.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 class PostItemPayload(
     val repliesCount: Int,
diff --git a/app/src/main/java/com/futo/circles/model/ReactionsData.kt b/app/src/main/java/org/futo/circles/model/ReactionsData.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/model/ReactionsData.kt
rename to app/src/main/java/org/futo/circles/model/ReactionsData.kt
index ec327c77fe021897738d6d1fceedb6e44d4ced2a..2293e8f52ecede5beff01b013743c759578586ef 100644
--- a/app/src/main/java/com/futo/circles/model/ReactionsData.kt
+++ b/app/src/main/java/org/futo/circles/model/ReactionsData.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 data class ReactionsData(
     val key: String,
diff --git a/app/src/main/java/com/futo/circles/model/ReportCategoryListItem.kt b/app/src/main/java/org/futo/circles/model/ReportCategoryListItem.kt
similarity index 65%
rename from app/src/main/java/com/futo/circles/model/ReportCategoryListItem.kt
rename to app/src/main/java/org/futo/circles/model/ReportCategoryListItem.kt
index 99718e0c5d4b59d8793c3b6d1e08466fdef30849..d42a877b8f42582cafa550572cd2a72ffe7d611e 100644
--- a/app/src/main/java/com/futo/circles/model/ReportCategoryListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/ReportCategoryListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
 
 data class ReportCategoryListItem(
     override val id: Int,
diff --git a/app/src/main/java/com/futo/circles/model/RoomListItem.kt b/app/src/main/java/org/futo/circles/model/RoomListItem.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/model/RoomListItem.kt
rename to app/src/main/java/org/futo/circles/model/RoomListItem.kt
index 85260b93fc75d34719e2c0fb69ff99192ba34eb4..22dead9287e337c812fdc54e872a4c2e338113a9 100644
--- a/app/src/main/java/com/futo/circles/model/RoomListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/RoomListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
 import org.matrix.android.sdk.api.session.room.model.Membership
 
 sealed class RoomListItem(
diff --git a/app/src/main/java/com/futo/circles/model/SelectableRoomListItem.kt b/app/src/main/java/org/futo/circles/model/SelectableRoomListItem.kt
similarity index 65%
rename from app/src/main/java/com/futo/circles/model/SelectableRoomListItem.kt
rename to app/src/main/java/org/futo/circles/model/SelectableRoomListItem.kt
index 120719dbb4f9c63966aa51682f4b96ce36b9bd0b..2e5fd3718897d20b85c4e4aff11372621a20d385 100644
--- a/app/src/main/java/com/futo/circles/model/SelectableRoomListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/SelectableRoomListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
 
 data class SelectableRoomListItem(
     override val id: String,
diff --git a/app/src/main/java/com/futo/circles/model/SetupCircleListItem.kt b/app/src/main/java/org/futo/circles/model/SetupCircleListItem.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/model/SetupCircleListItem.kt
rename to app/src/main/java/org/futo/circles/model/SetupCircleListItem.kt
index 1b41b02ab8bc26dadc00274014c8f7a5eef63528..32c5ac23998e0bac49f803ac391d13dd82ae8c7e 100644
--- a/app/src/main/java/com/futo/circles/model/SetupCircleListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/SetupCircleListItem.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
 import android.net.Uri
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
 
 data class SetupCircleListItem(
     override val id: Int,
diff --git a/app/src/main/java/com/futo/circles/model/TermsListItem.kt b/app/src/main/java/org/futo/circles/model/TermsListItem.kt
similarity index 66%
rename from app/src/main/java/com/futo/circles/model/TermsListItem.kt
rename to app/src/main/java/org/futo/circles/model/TermsListItem.kt
index 517ae6779bcb27615af49756f1aa73bd8917c359..2137c476659c1803eb30766c2842994ccb7ffb13 100644
--- a/app/src/main/java/com/futo/circles/model/TermsListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/TermsListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
 
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
 
 data class TermsListItem(
     override val id: Int,
diff --git a/app/src/main/java/com/futo/circles/provider/MatrixInstanceProvider.kt b/app/src/main/java/org/futo/circles/provider/MatrixInstanceProvider.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/provider/MatrixInstanceProvider.kt
rename to app/src/main/java/org/futo/circles/provider/MatrixInstanceProvider.kt
index 4589cd2e496208b8b91b4ff93d28656e5d4b6812..5661940e8c0651f599f068dda4d3ca52e03c7ef1 100644
--- a/app/src/main/java/com/futo/circles/provider/MatrixInstanceProvider.kt
+++ b/app/src/main/java/org/futo/circles/provider/MatrixInstanceProvider.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.provider
+package org.futo.circles.provider
 
 import org.matrix.android.sdk.api.Matrix
 
diff --git a/app/src/main/java/com/futo/circles/provider/MatrixSessionProvider.kt b/app/src/main/java/org/futo/circles/provider/MatrixSessionProvider.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/provider/MatrixSessionProvider.kt
rename to app/src/main/java/org/futo/circles/provider/MatrixSessionProvider.kt
index e21995b4147b7db2ed9c854aefc55efbbd64d5e7..4df1b1b95acf16839b05cddad8f4d0f97e2ab5d6 100644
--- a/app/src/main/java/com/futo/circles/provider/MatrixSessionProvider.kt
+++ b/app/src/main/java/org/futo/circles/provider/MatrixSessionProvider.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.provider
+package org.futo.circles.provider
 
 import android.content.Context
 import kotlinx.coroutines.suspendCancellableCoroutine
diff --git a/app/src/main/java/com/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt b/app/src/main/java/org/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt
rename to app/src/main/java/org/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt
index 9f7a99bf97ade57eec50267dc3cc22ca76888d2a..e0de10de5a722cc0213bafe99a40272b1229d32e 100644
--- a/app/src/main/java/com/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt
+++ b/app/src/main/java/org/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.provider
+package org.futo.circles.provider
 
 import org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider
 
diff --git a/app/src/main/java/com/futo/circles/view/ActiveSessionInfoView.kt b/app/src/main/java/org/futo/circles/view/ActiveSessionInfoView.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/view/ActiveSessionInfoView.kt
rename to app/src/main/java/org/futo/circles/view/ActiveSessionInfoView.kt
index f8883a8eabdbfd9854e50698a0d4c595e979f7e6..599577cd8e08b7e0da953b9fcc17a8497fe2d21f 100644
--- a/app/src/main/java/com/futo/circles/view/ActiveSessionInfoView.kt
+++ b/app/src/main/java/org/futo/circles/view/ActiveSessionInfoView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 import android.content.Context
 import android.util.AttributeSet
@@ -6,11 +6,11 @@ import android.view.LayoutInflater
 import android.widget.ImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
-import com.futo.circles.R
-import com.futo.circles.databinding.ActiveSessionInfoViewBinding
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.feature.settings.active_sessions.list.ActiveSessionClickListener
-import com.futo.circles.model.ActiveSession
+import org.futo.circles.R
+import org.futo.circles.databinding.ActiveSessionInfoViewBinding
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.feature.settings.active_sessions.list.ActiveSessionClickListener
+import org.futo.circles.model.ActiveSession
 
 class ActiveSessionInfoView(
     context: Context,
diff --git a/app/src/main/java/com/futo/circles/view/CirclesLogoView.kt b/app/src/main/java/org/futo/circles/view/CirclesLogoView.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/view/CirclesLogoView.kt
rename to app/src/main/java/org/futo/circles/view/CirclesLogoView.kt
index dd715b39a7ddfe4ed816b996529e01aa19de57e7..bf50dd590db5eccaea7473c5ddc22a618928588c 100644
--- a/app/src/main/java/com/futo/circles/view/CirclesLogoView.kt
+++ b/app/src/main/java/org/futo/circles/view/CirclesLogoView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 import android.content.Context
 import android.graphics.*
@@ -7,7 +7,7 @@ import android.view.View
 import androidx.annotation.ColorRes
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
-import com.futo.circles.R
+import org.futo.circles.R
 import kotlin.math.cos
 import kotlin.math.min
 import kotlin.math.sin
diff --git a/app/src/main/java/com/futo/circles/view/ExpandContentButton.kt b/app/src/main/java/org/futo/circles/view/ExpandContentButton.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/view/ExpandContentButton.kt
rename to app/src/main/java/org/futo/circles/view/ExpandContentButton.kt
index 86ec451100039525d6feeeb29a7d9ab490a58fde..0d8cd430370bfc6cf07aa52a38db5bdbc0cf5cbe 100644
--- a/app/src/main/java/com/futo/circles/view/ExpandContentButton.kt
+++ b/app/src/main/java/org/futo/circles/view/ExpandContentButton.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
-import com.futo.circles.R
-import com.futo.circles.extensions.getAttributes
+import org.futo.circles.R
+import org.futo.circles.extensions.getAttributes
 import com.google.android.material.button.MaterialButton
 
 class ExpandContentButton(
diff --git a/app/src/main/java/com/futo/circles/view/GroupPostFooterView.kt b/app/src/main/java/org/futo/circles/view/GroupPostFooterView.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/view/GroupPostFooterView.kt
rename to app/src/main/java/org/futo/circles/view/GroupPostFooterView.kt
index ae0a12ceb5110832f304319eee5de8de7d47a435..dae29b6d6164e75b4f2663b718ea5303194c48ed 100644
--- a/app/src/main/java/com/futo/circles/view/GroupPostFooterView.kt
+++ b/app/src/main/java/org/futo/circles/view/GroupPostFooterView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 import android.content.Context
 import android.util.AttributeSet
@@ -6,13 +6,13 @@ import android.view.LayoutInflater
 import android.widget.LinearLayout
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
-import com.futo.circles.R
-import com.futo.circles.databinding.GroupPostFooterViewBinding
-import com.futo.circles.extensions.getAttributes
-import com.futo.circles.extensions.setIsEncryptedIcon
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.Post
-import com.futo.circles.model.ReactionsData
+import org.futo.circles.R
+import org.futo.circles.databinding.GroupPostFooterViewBinding
+import org.futo.circles.extensions.getAttributes
+import org.futo.circles.extensions.setIsEncryptedIcon
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.Post
+import org.futo.circles.model.ReactionsData
 import com.google.android.material.chip.Chip
 import java.text.DateFormat
 import java.util.*
diff --git a/app/src/main/java/com/futo/circles/view/GroupPostHeaderView.kt b/app/src/main/java/org/futo/circles/view/GroupPostHeaderView.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/view/GroupPostHeaderView.kt
rename to app/src/main/java/org/futo/circles/view/GroupPostHeaderView.kt
index 5985032487873ae37900ac7f1cc0a0a73bbdfb78..78bf61b38b9e37b45b9a5d9782d6d4f13107e138 100644
--- a/app/src/main/java/com/futo/circles/view/GroupPostHeaderView.kt
+++ b/app/src/main/java/org/futo/circles/view/GroupPostHeaderView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -7,13 +7,13 @@ import android.view.LayoutInflater
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.appcompat.widget.PopupMenu
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.R
-import com.futo.circles.databinding.GroupPostHeaderViewBinding
-import com.futo.circles.extensions.getAttributes
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.Post
+import org.futo.circles.R
+import org.futo.circles.databinding.GroupPostHeaderViewBinding
+import org.futo.circles.extensions.getAttributes
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.Post
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
 
 class GroupPostHeaderView(
diff --git a/app/src/main/java/com/futo/circles/view/LoadingButton.kt b/app/src/main/java/org/futo/circles/view/LoadingButton.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/view/LoadingButton.kt
rename to app/src/main/java/org/futo/circles/view/LoadingButton.kt
index 098d6cc4af65eab304672fcfac47b2cbf37793c1..00d9c511f3c597d163340134b63232e605b0a8ee 100644
--- a/app/src/main/java/com/futo/circles/view/LoadingButton.kt
+++ b/app/src/main/java/org/futo/circles/view/LoadingButton.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 import android.content.Context
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.R
-import com.futo.circles.databinding.LoadingButtonViewBinding
-import com.futo.circles.extensions.getAttributes
-import com.futo.circles.extensions.setIsVisible
+import org.futo.circles.R
+import org.futo.circles.databinding.LoadingButtonViewBinding
+import org.futo.circles.extensions.getAttributes
+import org.futo.circles.extensions.setIsVisible
 
 class LoadingButton(
     context: Context,
diff --git a/app/src/main/java/com/futo/circles/view/LoadingView.kt b/app/src/main/java/org/futo/circles/view/LoadingView.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/view/LoadingView.kt
rename to app/src/main/java/org/futo/circles/view/LoadingView.kt
index 91c494561fd21d463d3ad21d9945458e72bdb0ff..d3bd4539ed34c70a5c46c7421409d14b36c62683 100644
--- a/app/src/main/java/com/futo/circles/view/LoadingView.kt
+++ b/app/src/main/java/org/futo/circles/view/LoadingView.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.annotation.StringRes
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.model.LoadingData
-import com.futo.circles.databinding.LoadingViewBinding
-import com.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.LoadingData
+import org.futo.circles.databinding.LoadingViewBinding
+import org.futo.circles.extensions.setIsVisible
 
 class LoadingView(
     context: Context,
diff --git a/app/src/main/java/com/futo/circles/view/ManageMembersOptionsView.kt b/app/src/main/java/org/futo/circles/view/ManageMembersOptionsView.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/view/ManageMembersOptionsView.kt
rename to app/src/main/java/org/futo/circles/view/ManageMembersOptionsView.kt
index 6d63b194486c93ea776005d6236e83acb5380edf..cba0c94f2cf906a38cf69ec8458f16edca034fbf 100644
--- a/app/src/main/java/com/futo/circles/view/ManageMembersOptionsView.kt
+++ b/app/src/main/java/org/futo/circles/view/ManageMembersOptionsView.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.databinding.ManageMembersOptionsViewBinding
-import com.futo.circles.extensions.isCurrentUserAbleToBan
-import com.futo.circles.extensions.isCurrentUserAbleToChangeLevelFor
-import com.futo.circles.extensions.isCurrentUserAbleToKick
-import com.futo.circles.extensions.setIsVisible
+import org.futo.circles.databinding.ManageMembersOptionsViewBinding
+import org.futo.circles.extensions.isCurrentUserAbleToBan
+import org.futo.circles.extensions.isCurrentUserAbleToChangeLevelFor
+import org.futo.circles.extensions.isCurrentUserAbleToKick
+import org.futo.circles.extensions.setIsVisible
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 
 interface ManageMembersOptionsListener {
diff --git a/app/src/main/java/com/futo/circles/view/PostLayout.kt b/app/src/main/java/org/futo/circles/view/PostLayout.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/view/PostLayout.kt
rename to app/src/main/java/org/futo/circles/view/PostLayout.kt
index 70e7af7e63b2419b356575615cd155f4511d9784..a4bf86ce6681302f9fd8279a3d816c3a262f472d 100644
--- a/app/src/main/java/com/futo/circles/view/PostLayout.kt
+++ b/app/src/main/java/org/futo/circles/view/PostLayout.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 import android.content.Context
 import android.util.AttributeSet
@@ -7,11 +7,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.R
-import com.futo.circles.databinding.PostLayoutBinding
-import com.futo.circles.extensions.gone
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.*
+import org.futo.circles.R
+import org.futo.circles.databinding.PostLayoutBinding
+import org.futo.circles.extensions.gone
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.*
 
 
 interface PostOptionsListener {
diff --git a/app/src/main/java/com/futo/circles/view/PreviewPostView.kt b/app/src/main/java/org/futo/circles/view/PreviewPostView.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/view/PreviewPostView.kt
rename to app/src/main/java/org/futo/circles/view/PreviewPostView.kt
index a721794c578cef3b3b990a6fe48f3ecf6c9ea659..c0c2423ae575c4b0b213a0097de3974d674dbc40 100644
--- a/app/src/main/java/com/futo/circles/view/PreviewPostView.kt
+++ b/app/src/main/java/org/futo/circles/view/PreviewPostView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 
 import android.content.Context
@@ -7,11 +7,11 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.widget.doAfterTextChanged
-import com.futo.circles.R
-import com.futo.circles.databinding.PreviewPostViewBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.databinding.PreviewPostViewBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.session.user.model.User
 
diff --git a/app/src/main/java/com/futo/circles/view/ProfileView.kt b/app/src/main/java/org/futo/circles/view/ProfileView.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/view/ProfileView.kt
rename to app/src/main/java/org/futo/circles/view/ProfileView.kt
index 6f0f7a793990c51a67d99130de06688ae1740e1c..e220f0cafb00fac4aa0e6b00ca97447fe406fb14 100644
--- a/app/src/main/java/com/futo/circles/view/ProfileView.kt
+++ b/app/src/main/java/org/futo/circles/view/ProfileView.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.view
+package org.futo.circles.view
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.databinding.ProfileViewBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.mapping.notEmptyDisplayName
+import org.futo.circles.databinding.ProfileViewBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.mapping.notEmptyDisplayName
 import org.matrix.android.sdk.api.session.user.model.User
 
 class ProfileView(
diff --git a/app/src/main/res/layout/accept_circle_invite_dialog_fragment.xml b/app/src/main/res/layout/accept_circle_invite_dialog_fragment.xml
index fd31b55a4eae4d23d4ab43b7eecf05ef260e742e..5acc9e7600ad6b0238c1b5cf7ad2c155d7ee3a8b 100644
--- a/app/src/main/res/layout/accept_circle_invite_dialog_fragment.xml
+++ b/app/src/main/res/layout/accept_circle_invite_dialog_fragment.xml
@@ -18,7 +18,7 @@
         app:titleCentered="true"
         app:titleMarginEnd="72dp">
 
-        <com.futo.circles.view.LoadingButton
+        <org.futo.circles.view.LoadingButton
             android:id="@+id/btnInvite"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/accept_terms_fragment.xml b/app/src/main/res/layout/accept_terms_fragment.xml
index a6df1f295f09fc26805a9cb9b7c54c5b97a5414d..be5f8f855db631f4e8ec6586fec49acab60b8560 100644
--- a/app/src/main/res/layout/accept_terms_fragment.xml
+++ b/app/src/main/res/layout/accept_terms_fragment.xml
@@ -12,7 +12,7 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.3" />
 
-    <com.futo.circles.view.CirclesLogoView
+    <org.futo.circles.view.CirclesLogoView
         android:id="@+id/ivLogo"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -62,7 +62,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <com.futo.circles.view.LoadingButton
+    <org.futo.circles.view.LoadingButton
         android:id="@+id/btnAccept"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/active_session_list_item.xml b/app/src/main/res/layout/active_session_list_item.xml
index 744ef3fff85be50dd1703c49ff9d706105dda4c6..286a80e35c0472f865b7773e8a3484fe3282d72f 100644
--- a/app/src/main/res/layout/active_session_list_item.xml
+++ b/app/src/main/res/layout/active_session_list_item.xml
@@ -72,7 +72,7 @@
         app:layout_constraintTop_toTopOf="@id/ivIcon"
         app:tint="@color/blue" />
 
-    <com.futo.circles.view.ActiveSessionInfoView
+    <org.futo.circles.view.ActiveSessionInfoView
         android:id="@+id/vInfo"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/change_password_dialog_fragment.xml b/app/src/main/res/layout/change_password_dialog_fragment.xml
index a4ff2fce2485af5af3f400a765e3df05b07e84e2..2a232c2a312a1d553370fbe772c92f8f1c3a5d9f 100644
--- a/app/src/main/res/layout/change_password_dialog_fragment.xml
+++ b/app/src/main/res/layout/change_password_dialog_fragment.xml
@@ -18,7 +18,7 @@
         app:titleCentered="true"
         app:titleMarginEnd="72dp">
 
-        <com.futo.circles.view.LoadingButton
+        <org.futo.circles.view.LoadingButton
             android:id="@+id/btnSave"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/create_post_bottom_sheet.xml b/app/src/main/res/layout/create_post_bottom_sheet.xml
index a0e61a546960f98c82697c94b6fbe012686ec3cb..fe33013dd4ecfcee2dd605fa6d153aec60e72f63 100644
--- a/app/src/main/res/layout/create_post_bottom_sheet.xml
+++ b/app/src/main/res/layout/create_post_bottom_sheet.xml
@@ -57,7 +57,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btnPost" />
 
-    <com.futo.circles.view.PreviewPostView
+    <org.futo.circles.view.PreviewPostView
         android:id="@+id/vPostPreview"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/create_room_dialog_fragment.xml b/app/src/main/res/layout/create_room_dialog_fragment.xml
index 4337d131ea634357da5efa777ff9861bc9cdc675..97ca65060eb175b2e1ef4f0345a4bef4b0b9dbd8 100644
--- a/app/src/main/res/layout/create_room_dialog_fragment.xml
+++ b/app/src/main/res/layout/create_room_dialog_fragment.xml
@@ -19,7 +19,7 @@
         app:titleMarginEnd="72dp"
         tools:title="@string/create_new_group">
 
-        <com.futo.circles.view.LoadingButton
+        <org.futo.circles.view.LoadingButton
             android:id="@+id/btnCreate"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/deactivate_account_dialog_fragment.xml b/app/src/main/res/layout/deactivate_account_dialog_fragment.xml
index c9868d04a1f9dc83b46e680ce414e9086b25a33b..ef54d4e95bff5a535face413a5a23b04e9062809 100644
--- a/app/src/main/res/layout/deactivate_account_dialog_fragment.xml
+++ b/app/src/main/res/layout/deactivate_account_dialog_fragment.xml
@@ -17,7 +17,7 @@
         app:title="@string/deactivate_my_account"
         app:titleCentered="true">
 
-        <com.futo.circles.view.LoadingButton
+        <org.futo.circles.view.LoadingButton
             android:id="@+id/btnDelete"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/edit_profile_dialog_fragment.xml b/app/src/main/res/layout/edit_profile_dialog_fragment.xml
index b4afa9986d2816bafaf64afd2b0b199eac7c1d5b..69496dfb317382e5981f92ec82fb2d854cc861f2 100644
--- a/app/src/main/res/layout/edit_profile_dialog_fragment.xml
+++ b/app/src/main/res/layout/edit_profile_dialog_fragment.xml
@@ -18,7 +18,7 @@
         app:titleCentered="true"
         app:titleMarginEnd="72dp">
 
-        <com.futo.circles.view.LoadingButton
+        <org.futo.circles.view.LoadingButton
             android:id="@+id/btnSave"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/image_post_view.xml b/app/src/main/res/layout/image_post_view.xml
index 92aac0f75c48af768ce4b9375ffb9d9a02cc2030..25faed9c69b81095b0df016c92dfd7f590bb30aa 100644
--- a/app/src/main/res/layout/image_post_view.xml
+++ b/app/src/main/res/layout/image_post_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/lImagePost"
     android:layout_width="match_parent"
@@ -16,7 +16,7 @@
             android:adjustViewBounds="true"
             android:src="@drawable/blurred_placeholder" />
 
-        <com.futo.circles.view.LoadingView
+        <org.futo.circles.view.LoadingView
             android:id="@+id/vLoadingImage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -29,4 +29,4 @@
 
     </FrameLayout>
 
-</com.futo.circles.view.PostLayout>
\ No newline at end of file
+</org.futo.circles.view.PostLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/invite_members_dialog_fragment.xml b/app/src/main/res/layout/invite_members_dialog_fragment.xml
index 9252d3c7f631123a55138ad11a4940748874e671..894f284c357867d687e2e7b17276d6160cf276ca 100644
--- a/app/src/main/res/layout/invite_members_dialog_fragment.xml
+++ b/app/src/main/res/layout/invite_members_dialog_fragment.xml
@@ -16,7 +16,7 @@
         app:titleCentered="true"
         app:titleMarginEnd="72dp">
 
-        <com.futo.circles.view.LoadingButton
+        <org.futo.circles.view.LoadingButton
             android:id="@+id/btnInvite"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/loading_dialog.xml b/app/src/main/res/layout/loading_dialog.xml
index 1d9417ae9cc9b5032ecc4a704fcc7393e8dfe619..e1c843c801909de9cb03e6f31b01c616e8dbf842 100644
--- a/app/src/main/res/layout/loading_dialog.xml
+++ b/app/src/main/res/layout/loading_dialog.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         app:cardCornerRadius="12dp">
 
-        <com.futo.circles.view.LoadingView
+        <org.futo.circles.view.LoadingView
             android:id="@+id/vLoading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/log_in_fragment.xml b/app/src/main/res/layout/log_in_fragment.xml
index 1eb24fa55a3c0c98a9b63efa182174b89a4f39e9..4b3ed8ad2056c4bebd65a69307396c006c486f0f 100644
--- a/app/src/main/res/layout/log_in_fragment.xml
+++ b/app/src/main/res/layout/log_in_fragment.xml
@@ -16,7 +16,7 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.3" />
 
-    <com.futo.circles.view.CirclesLogoView
+    <org.futo.circles.view.CirclesLogoView
         android:id="@+id/ivLogo"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -98,7 +98,7 @@
     </com.google.android.material.textfield.TextInputLayout>
 
 
-    <com.futo.circles.view.LoadingButton
+    <org.futo.circles.view.LoadingButton
         android:id="@+id/btnLogin"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -119,7 +119,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <com.futo.circles.view.LoadingButton
+    <org.futo.circles.view.LoadingButton
         android:id="@+id/btnSignUp"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/member_list_item.xml b/app/src/main/res/layout/member_list_item.xml
index a469a6c968a4dba94f08a09eb10e2c16fdcb8834..e25e108cc46549759b65cd72033ba528ac9cf0ba 100644
--- a/app/src/main/res/layout/member_list_item.xml
+++ b/app/src/main/res/layout/member_list_item.xml
@@ -53,7 +53,7 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.futo.circles.view.ManageMembersOptionsView
+    <org.futo.circles.view.ManageMembersOptionsView
         android:id="@+id/optionsView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/post_layout.xml b/app/src/main/res/layout/post_layout.xml
index fc8aa255db938c5eda5795ad109ed8b790cda0c5..c7f641d0d4fa21f8a422b9ac203fba296c270b04 100644
--- a/app/src/main/res/layout/post_layout.xml
+++ b/app/src/main/res/layout/post_layout.xml
@@ -51,7 +51,7 @@
                 android:orientation="horizontal"
                 app:layout_constraintGuide_begin="8dp" />
 
-            <com.futo.circles.view.GroupPostHeaderView
+            <org.futo.circles.view.GroupPostHeaderView
                 android:id="@+id/postHeader"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
                 app:layout_constraintTop_toBottomOf="@id/postHeader" />
 
 
-            <com.futo.circles.view.GroupPostFooterView
+            <org.futo.circles.view.GroupPostFooterView
                 android:id="@+id/postFooter"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
 
     </androidx.cardview.widget.CardView>
 
-    <com.futo.circles.view.ExpandContentButton
+    <org.futo.circles.view.ExpandContentButton
         android:id="@+id/btnShowReplies"
         style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/preview_post_view.xml b/app/src/main/res/layout/preview_post_view.xml
index 3ae763e5b54a1bc174ee1f2236da048d45c950e2..8e699b854c5e3d3c6c96f86664f6541af2ebc568 100644
--- a/app/src/main/res/layout/preview_post_view.xml
+++ b/app/src/main/res/layout/preview_post_view.xml
@@ -28,7 +28,7 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_begin="8dp" />
 
-    <com.futo.circles.view.GroupPostHeaderView
+    <org.futo.circles.view.GroupPostHeaderView
         android:id="@+id/postHeader"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-    <com.futo.circles.view.GroupPostFooterView
+    <org.futo.circles.view.GroupPostFooterView
         android:id="@+id/postFooter"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/remove_session_dialog_fragment.xml b/app/src/main/res/layout/remove_session_dialog_fragment.xml
index 737a4326a9d7a22c6272df3328b06991b5dd87ef..369ea06646ebf6a15b2851ebf2263151baa970a3 100644
--- a/app/src/main/res/layout/remove_session_dialog_fragment.xml
+++ b/app/src/main/res/layout/remove_session_dialog_fragment.xml
@@ -18,7 +18,7 @@
         app:title="@string/remove_session"
         app:titleCentered="true">
 
-        <com.futo.circles.view.LoadingButton
+        <org.futo.circles.view.LoadingButton
             android:id="@+id/btnRemove"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/report_dialog_fragment.xml b/app/src/main/res/layout/report_dialog_fragment.xml
index 9d7a24341bcfc0174a0bdced89d72bb724428981..57dff70c6e4dc1a3fb1371004917531df9af797b 100644
--- a/app/src/main/res/layout/report_dialog_fragment.xml
+++ b/app/src/main/res/layout/report_dialog_fragment.xml
@@ -19,7 +19,7 @@
         app:titleTextAppearance="@style/subheadline"
         app:titleTextColor="@color/black">
 
-        <com.futo.circles.view.LoadingButton
+        <org.futo.circles.view.LoadingButton
             android:id="@+id/btnReport"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/save_to_gallery_dialog_fragment.xml b/app/src/main/res/layout/save_to_gallery_dialog_fragment.xml
index 2e0f51feff802b97bac14376ec8ec41ac1ee1498..f9a7f39ce2687273c463e382dc3eac190b148607 100644
--- a/app/src/main/res/layout/save_to_gallery_dialog_fragment.xml
+++ b/app/src/main/res/layout/save_to_gallery_dialog_fragment.xml
@@ -18,7 +18,7 @@
         app:titleCentered="true"
         app:titleMarginEnd="72dp">
 
-        <com.futo.circles.view.LoadingButton
+        <org.futo.circles.view.LoadingButton
             android:id="@+id/btnSave"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/select_sign_up_type_fragment.xml b/app/src/main/res/layout/select_sign_up_type_fragment.xml
index 0092a53160428ae533d8e3d70a836dcda0954452..4968ecb59d2406f1bab49a50faad54f9beb2ffec 100644
--- a/app/src/main/res/layout/select_sign_up_type_fragment.xml
+++ b/app/src/main/res/layout/select_sign_up_type_fragment.xml
@@ -13,7 +13,7 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.3" />
 
-    <com.futo.circles.view.CirclesLogoView
+    <org.futo.circles.view.CirclesLogoView
         android:id="@+id/ivLogo"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -80,7 +80,7 @@
         app:layout_constraintVertical_bias="0.3"
         app:layout_constraintVertical_chainStyle="packed" />
 
-    <com.futo.circles.view.LoadingButton
+    <org.futo.circles.view.LoadingButton
         android:id="@+id/btnToken"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index 735284657c90fed0ec3821fdb2450f9e4948061a..b52e6296b563d51bca43b043d89adc52cac8f6f3 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <com.futo.circles.view.ProfileView
+    <org.futo.circles.view.ProfileView
         android:id="@+id/vUser"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_circles_fragment.xml b/app/src/main/res/layout/setup_circles_fragment.xml
index 80745e91beab9986a733f4cbb9ee805d9d041106..497b37dc36b3c7732d989e5405ed746b051f2f58 100644
--- a/app/src/main/res/layout/setup_circles_fragment.xml
+++ b/app/src/main/res/layout/setup_circles_fragment.xml
@@ -63,7 +63,7 @@
         app:layout_constraintEnd_toEndOf="@id/guidelineEnd"
         app:layout_constraintStart_toStartOf="@id/guidelineStart" />
 
-    <com.futo.circles.view.LoadingButton
+    <org.futo.circles.view.LoadingButton
         android:id="@+id/btnSave"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_profile_fragment.xml b/app/src/main/res/layout/setup_profile_fragment.xml
index 3ff134a7ac92699a3edfd57852efff7b9d8fdbea..d20a9671816d23109d63e377847ec12e84456666 100644
--- a/app/src/main/res/layout/setup_profile_fragment.xml
+++ b/app/src/main/res/layout/setup_profile_fragment.xml
@@ -99,7 +99,7 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <com.futo.circles.view.LoadingButton
+    <org.futo.circles.view.LoadingButton
         android:id="@+id/btnSave"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/text_post_view.xml b/app/src/main/res/layout/text_post_view.xml
index fc91bd6b34cdcd59d61450f42fd36bcbcf8d8c9e..038c39d25f18eeba86d14391b1b3cf7414f45015 100644
--- a/app/src/main/res/layout/text_post_view.xml
+++ b/app/src/main/res/layout/text_post_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/lTextPost"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -11,4 +11,4 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/post_text_side_margin" />
 
-</com.futo.circles.view.PostLayout>
\ No newline at end of file
+</org.futo.circles.view.PostLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/update_room_dialog_fragment.xml b/app/src/main/res/layout/update_room_dialog_fragment.xml
index 893c1cdc17837a69f6b466d43edf684c7d162f04..6a13fd15df78ae4a24f3533c4349cbb38dd50e9f 100644
--- a/app/src/main/res/layout/update_room_dialog_fragment.xml
+++ b/app/src/main/res/layout/update_room_dialog_fragment.xml
@@ -19,7 +19,7 @@
         app:titleMarginEnd="72dp"
         tools:title="@string/configure_group">
 
-        <com.futo.circles.view.LoadingButton
+        <org.futo.circles.view.LoadingButton
             android:id="@+id/btnSave"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/validate_email_fragment.xml b/app/src/main/res/layout/validate_email_fragment.xml
index de975c52ae7fac33e61471ba970f4ccc2af647b4..37ee8c1ec1ff38ab2b71dac399abf1ca532d7ea7 100644
--- a/app/src/main/res/layout/validate_email_fragment.xml
+++ b/app/src/main/res/layout/validate_email_fragment.xml
@@ -21,7 +21,7 @@
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.5" />
 
-    <com.futo.circles.view.CirclesLogoView
+    <org.futo.circles.view.CirclesLogoView
         android:id="@+id/ivLogo"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -96,7 +96,7 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <com.futo.circles.view.LoadingButton
+    <org.futo.circles.view.LoadingButton
         android:id="@+id/btnSendCode"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -109,7 +109,7 @@
         app:layout_constraintTop_toBottomOf="@id/tilEmail" />
 
 
-    <com.futo.circles.view.LoadingButton
+    <org.futo.circles.view.LoadingButton
         android:id="@+id/btnValidate"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/validate_token_fragment.xml b/app/src/main/res/layout/validate_token_fragment.xml
index 9e15099c262623a97fc1f42532167a88d8d0ebcb..b723190007b523b27039fdba4b07f0bce818d5d6 100644
--- a/app/src/main/res/layout/validate_token_fragment.xml
+++ b/app/src/main/res/layout/validate_token_fragment.xml
@@ -13,7 +13,7 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.35" />
 
-    <com.futo.circles.view.CirclesLogoView
+    <org.futo.circles.view.CirclesLogoView
         android:id="@+id/ivLogo"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -61,7 +61,7 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <com.futo.circles.view.LoadingButton
+    <org.futo.circles.view.LoadingButton
         android:id="@+id/btnValidate"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/navigation/circles_nav_graph.xml b/app/src/main/res/navigation/circles_nav_graph.xml
index 8adf9f785d6713f00dad6d006cbf41f5ceba7921..df1fdc17d113454a797535cfa31b01cc508a888b 100644
--- a/app/src/main/res/navigation/circles_nav_graph.xml
+++ b/app/src/main/res/navigation/circles_nav_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/circlesFragment"
-        android:name="com.futo.circles.feature.circles.CirclesFragment"
+        android:name="org.futo.circles.feature.circles.CirclesFragment"
         android:label="@string/my_circles"
         tools:layout="@layout/rooms_fragment">
 
@@ -23,7 +23,7 @@
             <argument
                 android:name="type"
                 android:defaultValue="Circle"
-                app:argType="com.futo.circles.model.CircleRoomTypeArg"
+                app:argType="org.futo.circles.model.CircleRoomTypeArg"
                 app:nullable="false" />
 
         </action>
@@ -35,7 +35,7 @@
             <argument
                 android:name="type"
                 android:defaultValue="Circle"
-                app:argType="com.futo.circles.model.CircleRoomTypeArg"
+                app:argType="org.futo.circles.model.CircleRoomTypeArg"
                 app:nullable="false" />
 
         </action>
@@ -55,19 +55,19 @@
 
     <dialog
         android:id="@+id/createRoomDialogFragment"
-        android:name="com.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
+        android:name="org.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
         android:label="CreateCircleDialogFragment"
         tools:layout="@layout/create_room_dialog_fragment">
 
         <argument
             android:name="type"
-            app:argType="com.futo.circles.model.CircleRoomTypeArg"
+            app:argType="org.futo.circles.model.CircleRoomTypeArg"
             app:nullable="false" />
 
     </dialog>
     <dialog
         android:id="@+id/acceptCircleInviteDialogFragment"
-        android:name="com.futo.circles.feature.circles.accept_invite.AcceptCircleInviteDialogFragment"
+        android:name="org.futo.circles.feature.circles.accept_invite.AcceptCircleInviteDialogFragment"
         android:label="AcceptCircleInviteDialogFragment"
         tools:layout="@layout/accept_circle_invite_dialog_fragment">
 
diff --git a/app/src/main/res/navigation/groups_nav_graph.xml b/app/src/main/res/navigation/groups_nav_graph.xml
index 9acb0b6e1b684ba0ecedeabec6023ad53ee0ed85..e9b11da50d6c8eeaf0115ac28393ef5d2354ab9d 100644
--- a/app/src/main/res/navigation/groups_nav_graph.xml
+++ b/app/src/main/res/navigation/groups_nav_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/groupsFragment"
-        android:name="com.futo.circles.feature.groups.GroupsFragment"
+        android:name="org.futo.circles.feature.groups.GroupsFragment"
         android:label="@string/my_groups"
         tools:layout="@layout/rooms_fragment">
 
@@ -23,7 +23,7 @@
             <argument
                 android:name="type"
                 android:defaultValue="Group"
-                app:argType="com.futo.circles.model.CircleRoomTypeArg"
+                app:argType="org.futo.circles.model.CircleRoomTypeArg"
                 app:nullable="false" />
 
         </action>
@@ -35,7 +35,7 @@
             <argument
                 android:name="type"
                 android:defaultValue="Group"
-                app:argType="com.futo.circles.model.CircleRoomTypeArg"
+                app:argType="org.futo.circles.model.CircleRoomTypeArg"
                 app:nullable="false" />
 
         </action>
@@ -46,12 +46,12 @@
 
     <dialog
         android:id="@+id/createRoomDialogFragment"
-        android:name="com.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
+        android:name="org.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
         tools:layout="@layout/create_room_dialog_fragment">
 
         <argument
             android:name="type"
-            app:argType="com.futo.circles.model.CircleRoomTypeArg"
+            app:argType="org.futo.circles.model.CircleRoomTypeArg"
             app:nullable="false" />
 
     </dialog>
diff --git a/app/src/main/res/navigation/nav_graph_start_host.xml b/app/src/main/res/navigation/nav_graph_start_host.xml
index 675e4bb827768b35f1e838c2f651143158415483..c1c36ec84d27cfc28ed93b53934a7813b3f6b803 100644
--- a/app/src/main/res/navigation/nav_graph_start_host.xml
+++ b/app/src/main/res/navigation/nav_graph_start_host.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/splashFragment"
-        android:name="com.futo.circles.feature.splash.SplashFragment"
+        android:name="org.futo.circles.feature.splash.SplashFragment"
         android:label="Splash"
         tools:layout="@layout/splash_fragment">
 
@@ -25,7 +25,7 @@
 
     <fragment
         android:id="@+id/logInFragment"
-        android:name="com.futo.circles.feature.log_in.LogInFragment"
+        android:name="org.futo.circles.feature.log_in.LogInFragment"
         android:label="Log In"
         tools:layout="@layout/log_in_fragment">
         <action
@@ -40,7 +40,7 @@
 
     <fragment
         android:id="@+id/signUpFragment"
-        android:name="com.futo.circles.feature.sign_up.SignUpFragment"
+        android:name="org.futo.circles.feature.sign_up.SignUpFragment"
         android:label="Sign up"
         tools:layout="@layout/sign_up_fragment">
         <action
@@ -52,7 +52,7 @@
 
     <fragment
         android:id="@+id/bottomNavigationFragment"
-        android:name="com.futo.circles.feature.bottom_navigation.BottomNavigationFragment"
+        android:name="org.futo.circles.feature.bottom_navigation.BottomNavigationFragment"
         android:label="Bottom Navigation"
         tools:layout="@layout/bottom_navigation_fragment">
 
@@ -65,7 +65,7 @@
     </fragment>
     <fragment
         android:id="@+id/setupProfileFragment"
-        android:name="com.futo.circles.feature.sign_up.setup_profile.SetupProfileFragment"
+        android:name="org.futo.circles.feature.sign_up.setup_profile.SetupProfileFragment"
         android:label="SetupProfileFragment"
         tools:layout="@layout/setup_profile_fragment">
         <action
@@ -76,7 +76,7 @@
     </fragment>
     <fragment
         android:id="@+id/setupCirclesFragment"
-        android:name="com.futo.circles.feature.sign_up.setup_circles.SetupCirclesFragment"
+        android:name="org.futo.circles.feature.sign_up.setup_circles.SetupCirclesFragment"
         android:label="SetupCirclesFragment"
         tools:layout="@layout/setup_circles_fragment">
         <action
diff --git a/app/src/main/res/navigation/people_nav_graph.xml b/app/src/main/res/navigation/people_nav_graph.xml
index 2b2857392309f55cea94fc111a36061eeebff33c..a285bbe58897e1ab8c4eb321e84160d48a1c61cf 100644
--- a/app/src/main/res/navigation/people_nav_graph.xml
+++ b/app/src/main/res/navigation/people_nav_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/peopleFragment"
-        android:name="com.futo.circles.feature.people.PeopleFragment"
+        android:name="org.futo.circles.feature.people.PeopleFragment"
         android:label="@string/my_people"
         tools:layout="@layout/people_fragment">
         <action
@@ -24,7 +24,7 @@
 
     <fragment
         android:id="@+id/userFragment"
-        android:name="com.futo.circles.feature.people.user.UserFragment"
+        android:name="org.futo.circles.feature.people.user.UserFragment"
         tools:layout="@layout/user_fragment">
 
         <argument
diff --git a/app/src/main/res/navigation/photos_nav_graph.xml b/app/src/main/res/navigation/photos_nav_graph.xml
index f60684129867586db6b06e142791f5dcc054cf6d..e78349add3e5ca202008c967eb50b487c5d70837 100644
--- a/app/src/main/res/navigation/photos_nav_graph.xml
+++ b/app/src/main/res/navigation/photos_nav_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/photosFragment"
-        android:name="com.futo.circles.feature.photos.PhotosFragment"
+        android:name="org.futo.circles.feature.photos.PhotosFragment"
         android:label="@string/photo_galleries"
         tools:layout="@layout/rooms_fragment">
 
@@ -18,7 +18,7 @@
             <argument
                 android:name="type"
                 android:defaultValue="Photo"
-                app:argType="com.futo.circles.model.CircleRoomTypeArg"
+                app:argType="org.futo.circles.model.CircleRoomTypeArg"
                 app:nullable="false" />
 
         </action>
@@ -36,19 +36,19 @@
 
     <dialog
         android:id="@+id/createRoomDialogFragment"
-        android:name="com.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
+        android:name="org.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
         tools:layout="@layout/create_room_dialog_fragment">
 
         <argument
             android:name="type"
-            app:argType="com.futo.circles.model.CircleRoomTypeArg"
+            app:argType="org.futo.circles.model.CircleRoomTypeArg"
             app:nullable="false" />
 
     </dialog>
 
     <fragment
         android:id="@+id/galleryFragment"
-        android:name="com.futo.circles.feature.photos.gallery.GalleryFragment"
+        android:name="org.futo.circles.feature.photos.gallery.GalleryFragment"
         tools:layout="@layout/gallery_fragment">
 
         <argument
@@ -68,7 +68,7 @@
             <argument
                 android:name="type"
                 android:defaultValue="Photo"
-                app:argType="com.futo.circles.model.CircleRoomTypeArg"
+                app:argType="org.futo.circles.model.CircleRoomTypeArg"
                 app:nullable="false" />
 
         </action>
@@ -93,7 +93,7 @@
 
     <dialog
         android:id="@+id/updateRoomDialogFragment"
-        android:name="com.futo.circles.feature.room.update_room.UpdateRoomDialogFragment"
+        android:name="org.futo.circles.feature.room.update_room.UpdateRoomDialogFragment"
         tools:layout="@layout/update_room_dialog_fragment">
 
         <argument
@@ -103,14 +103,14 @@
 
         <argument
             android:name="type"
-            app:argType="com.futo.circles.model.CircleRoomTypeArg"
+            app:argType="org.futo.circles.model.CircleRoomTypeArg"
             app:nullable="false" />
 
 
     </dialog>
     <dialog
         android:id="@+id/galleryImageDialogFragment"
-        android:name="com.futo.circles.feature.photos.preview.GalleryImageDialogFragment"
+        android:name="org.futo.circles.feature.photos.preview.GalleryImageDialogFragment"
         tools:layout="@layout/gallery_image_dialog_fragment">
 
         <argument
diff --git a/app/src/main/res/navigation/settings_nav_graph.xml b/app/src/main/res/navigation/settings_nav_graph.xml
index 4170d8207b7c2f2f5d9d9feb20eb64c41a639720..d27d1b0e5c337d0773b5e378c59339b2ec982ba8 100644
--- a/app/src/main/res/navigation/settings_nav_graph.xml
+++ b/app/src/main/res/navigation/settings_nav_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/settingsFragment"
-        android:name="com.futo.circles.feature.settings.SettingsFragment"
+        android:name="org.futo.circles.feature.settings.SettingsFragment"
         android:label="@string/settings"
         tools:layout="@layout/settings_fragment">
         <action
@@ -26,22 +26,22 @@
 
     <dialog
         android:id="@+id/editProfileDialogFragment"
-        android:name="com.futo.circles.feature.settings.edit_profile.EditProfileDialogFragment"
+        android:name="org.futo.circles.feature.settings.edit_profile.EditProfileDialogFragment"
         android:label="ProfileDialogFragment"
         tools:layout="@layout/edit_profile_dialog_fragment" />
     <dialog
         android:id="@+id/changePasswordDialogFragment"
-        android:name="com.futo.circles.feature.settings.change_password.ChangePasswordDialogFragment"
+        android:name="org.futo.circles.feature.settings.change_password.ChangePasswordDialogFragment"
         android:label="ChangePasswordDialogFragment"
         tools:layout="@layout/change_password_dialog_fragment" />
     <dialog
         android:id="@+id/deactivateAccountDialogFragment"
-        android:name="com.futo.circles.feature.settings.deactivate.DeactivateAccountDialogFragment"
+        android:name="org.futo.circles.feature.settings.deactivate.DeactivateAccountDialogFragment"
         android:label="DeactivateAccountDialogFragment"
         tools:layout="@layout/deactivate_account_dialog_fragment" />
     <dialog
         android:id="@+id/activeSessionsDialogFragment"
-        android:name="com.futo.circles.feature.settings.active_sessions.ActiveSessionsDialogFragment"
+        android:name="org.futo.circles.feature.settings.active_sessions.ActiveSessionsDialogFragment"
         android:label="ActiveSessionsDialogFragment"
         tools:layout="@layout/active_sessions_dialog_fragment">
         <action
@@ -57,7 +57,7 @@
     </dialog>
     <dialog
         android:id="@+id/removeSessionDialogFragment"
-        android:name="com.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionDialogFragment"
+        android:name="org.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionDialogFragment"
         android:label="RemoveSessionDialogFragment"
         tools:layout="@layout/remove_session_dialog_fragment">
 
diff --git a/app/src/main/res/navigation/sign_up_nav_graph.xml b/app/src/main/res/navigation/sign_up_nav_graph.xml
index d2641d76c0650b3731bb7e68bf15d835d104ce8d..872fd83f131647257234fd492b96b47a0f010635 100644
--- a/app/src/main/res/navigation/sign_up_nav_graph.xml
+++ b/app/src/main/res/navigation/sign_up_nav_graph.xml
@@ -19,25 +19,25 @@
 
     <fragment
         android:id="@+id/selectSignUpTypeFragment"
-        android:name="com.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeFragment"
+        android:name="org.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeFragment"
         android:label="SelectSignUpTypeFragment"
         tools:layout="@layout/select_sign_up_type_fragment" />
 
     <fragment
         android:id="@+id/validateTokenFragment"
-        android:name="com.futo.circles.feature.sign_up.validate_token.ValidateTokenFragment"
+        android:name="org.futo.circles.feature.sign_up.validate_token.ValidateTokenFragment"
         android:label="ValidateTokenFragment"
         tools:layout="@layout/validate_token_fragment" />
 
     <fragment
         android:id="@+id/validateEmailFragment"
-        android:name="com.futo.circles.feature.sign_up.validate_email.ValidateEmailFragment"
+        android:name="org.futo.circles.feature.sign_up.validate_email.ValidateEmailFragment"
         android:label="CreateAccountFragment"
         tools:layout="@layout/validate_email_fragment" />
 
     <fragment
         android:id="@+id/acceptTermsFragment"
-        android:name="com.futo.circles.feature.sign_up.terms.AcceptTermsFragment"
+        android:name="org.futo.circles.feature.sign_up.terms.AcceptTermsFragment"
         android:label="AcceptTermsFragment"
         tools:layout="@layout/accept_terms_fragment" />
 
diff --git a/app/src/main/res/navigation/timeline_nav_graph.xml b/app/src/main/res/navigation/timeline_nav_graph.xml
index 70355f70c1026631d65f5718d1b8fdedba6d36ee..0ab6e1287bd3341512b79e0ae7e01cbfbbd8052b 100644
--- a/app/src/main/res/navigation/timeline_nav_graph.xml
+++ b/app/src/main/res/navigation/timeline_nav_graph.xml
@@ -8,7 +8,7 @@
 
     <fragment
         android:id="@+id/timelineFragment"
-        android:name="com.futo.circles.feature.timeline.TimelineFragment"
+        android:name="org.futo.circles.feature.timeline.TimelineFragment"
         tools:layout="@layout/timeline_fragment">
 
         <argument
@@ -18,7 +18,7 @@
 
         <argument
             android:name="type"
-            app:argType="com.futo.circles.model.CircleRoomTypeArg"
+            app:argType="org.futo.circles.model.CircleRoomTypeArg"
             app:nullable="false" />
 
         <action
@@ -42,7 +42,7 @@
 
             <argument
                 android:name="type"
-                app:argType="com.futo.circles.model.CircleRoomTypeArg"
+                app:argType="org.futo.circles.model.CircleRoomTypeArg"
                 app:nullable="false" />
 
         </action>
@@ -57,7 +57,7 @@
 
             <argument
                 android:name="type"
-                app:argType="com.futo.circles.model.CircleRoomTypeArg"
+                app:argType="org.futo.circles.model.CircleRoomTypeArg"
                 app:nullable="false" />
 
         </action>
@@ -141,7 +141,7 @@
 
     <dialog
         android:id="@+id/inviteMembersDialogFragment"
-        android:name="com.futo.circles.feature.room.invite.InviteMembersDialogFragment"
+        android:name="org.futo.circles.feature.room.invite.InviteMembersDialogFragment"
         tools:layout="@layout/invite_members_dialog_fragment">
 
         <argument
@@ -153,7 +153,7 @@
 
     <dialog
         android:id="@+id/manageMembersDialogFragment"
-        android:name="com.futo.circles.feature.room.manage_members.ManageMembersDialogFragment"
+        android:name="org.futo.circles.feature.room.manage_members.ManageMembersDialogFragment"
         tools:layout="@layout/manage_members_dialog_fragment">
 
         <argument
@@ -163,7 +163,7 @@
 
         <argument
             android:name="type"
-            app:argType="com.futo.circles.model.CircleRoomTypeArg"
+            app:argType="org.futo.circles.model.CircleRoomTypeArg"
             app:nullable="false" />
 
         <action
@@ -190,7 +190,7 @@
     </dialog>
     <dialog
         android:id="@+id/changeAccessLevelBottomSheet"
-        android:name="com.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelBottomSheet"
+        android:name="org.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelBottomSheet"
         android:label="ChangeAccessLevelBottomSheet"
         tools:layout="@layout/change_access_level_bottom_sheet">
 
@@ -212,7 +212,7 @@
     </dialog>
     <dialog
         android:id="@+id/updateRoomDialogFragment"
-        android:name="com.futo.circles.feature.room.update_room.UpdateRoomDialogFragment"
+        android:name="org.futo.circles.feature.room.update_room.UpdateRoomDialogFragment"
         android:label="UpdateRoomDialogFragment"
         tools:layout="@layout/update_room_dialog_fragment">
 
@@ -223,14 +223,14 @@
 
         <argument
             android:name="type"
-            app:argType="com.futo.circles.model.CircleRoomTypeArg"
+            app:argType="org.futo.circles.model.CircleRoomTypeArg"
             app:nullable="false" />
 
 
     </dialog>
     <dialog
         android:id="@+id/createPostBottomSheet"
-        android:name="com.futo.circles.feature.timeline.post.CreatePostBottomSheet"
+        android:name="org.futo.circles.feature.timeline.post.CreatePostBottomSheet"
         android:label="CreatePostBottomSheet"
         tools:layout="@layout/create_post_bottom_sheet">
 
@@ -252,7 +252,7 @@
     </dialog>
     <dialog
         android:id="@+id/reportDialogFragment"
-        android:name="com.futo.circles.feature.timeline.post.report.ReportDialogFragment"
+        android:name="org.futo.circles.feature.timeline.post.report.ReportDialogFragment"
         android:label="ReportDialogFragment"
         tools:layout="@layout/report_dialog_fragment">
 
@@ -269,7 +269,7 @@
     </dialog>
     <dialog
         android:id="@+id/emojiBottomSheet"
-        android:name="com.futo.circles.feature.timeline.post.emoji.EmojiBottomSheet"
+        android:name="org.futo.circles.feature.timeline.post.emoji.EmojiBottomSheet"
         android:label="EmojiBottomSheet"
         tools:layout="@layout/emoji_bottom_sheet">
 
@@ -286,7 +286,7 @@
     </dialog>
     <dialog
         android:id="@+id/followingDialogFragment"
-        android:name="com.futo.circles.feature.circles.following.FollowingDialogFragment"
+        android:name="org.futo.circles.feature.circles.following.FollowingDialogFragment"
         android:label="FollowingDialogFragment"
         tools:layout="@layout/following_dialog_fragment">
 
@@ -298,7 +298,7 @@
     </dialog>
     <dialog
         android:id="@+id/saveToGalleyDialogFragment"
-        android:name="com.futo.circles.feature.photos.save.SaveToGalleyDialogFragment"
+        android:name="org.futo.circles.feature.photos.save.SaveToGalleyDialogFragment"
         tools:layout="@layout/save_to_gallery_dialog_fragment">
 
         <argument
diff --git a/app/src/test/java/com/futo/circles/ExampleUnitTest.kt b/app/src/test/java/org/futo/circles/ExampleUnitTest.kt
similarity index 92%
rename from app/src/test/java/com/futo/circles/ExampleUnitTest.kt
rename to app/src/test/java/org/futo/circles/ExampleUnitTest.kt
index d55847b1cce50bb37bd324ea86b89b198f8f0523..32c96263aded6fb0252f54c0a2ee53477962792a 100644
--- a/app/src/test/java/com/futo/circles/ExampleUnitTest.kt
+++ b/app/src/test/java/org/futo/circles/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.futo.circles
+package org.futo.circles
 
 import org.junit.Test