diff --git a/messenger/.gitignore b/session/.gitignore
similarity index 100%
rename from messenger/.gitignore
rename to session/.gitignore
diff --git a/messenger/build.gradle b/session/build.gradle
similarity index 100%
rename from messenger/build.gradle
rename to session/build.gradle
diff --git a/messenger/google-services.json b/session/google-services.json
similarity index 100%
rename from messenger/google-services.json
rename to session/google-services.json
diff --git a/messenger/ic_launcher-web.png b/session/ic_launcher-web.png
similarity index 100%
rename from messenger/ic_launcher-web.png
rename to session/ic_launcher-web.png
diff --git a/messenger/lint-baseline.xml b/session/lint-baseline.xml
similarity index 100%
rename from messenger/lint-baseline.xml
rename to session/lint-baseline.xml
diff --git a/messenger/lint.xml b/session/lint.xml
similarity index 100%
rename from messenger/lint.xml
rename to session/lint.xml
diff --git a/messenger/proguard/proguard-appcompat-v7.pro b/session/proguard/proguard-appcompat-v7.pro
similarity index 100%
rename from messenger/proguard/proguard-appcompat-v7.pro
rename to session/proguard/proguard-appcompat-v7.pro
diff --git a/messenger/proguard/proguard-automation.pro b/session/proguard/proguard-automation.pro
similarity index 100%
rename from messenger/proguard/proguard-automation.pro
rename to session/proguard/proguard-automation.pro
diff --git a/messenger/proguard/proguard-dagger.pro b/session/proguard/proguard-dagger.pro
similarity index 100%
rename from messenger/proguard/proguard-dagger.pro
rename to session/proguard/proguard-dagger.pro
diff --git a/messenger/proguard/proguard-ez-vcard.pro b/session/proguard/proguard-ez-vcard.pro
similarity index 100%
rename from messenger/proguard/proguard-ez-vcard.pro
rename to session/proguard/proguard-ez-vcard.pro
diff --git a/messenger/proguard/proguard-glide.pro b/session/proguard/proguard-glide.pro
similarity index 100%
rename from messenger/proguard/proguard-glide.pro
rename to session/proguard/proguard-glide.pro
diff --git a/messenger/proguard/proguard-jackson.pro b/session/proguard/proguard-jackson.pro
similarity index 100%
rename from messenger/proguard/proguard-jackson.pro
rename to session/proguard/proguard-jackson.pro
diff --git a/messenger/proguard/proguard-jna.pro b/session/proguard/proguard-jna.pro
similarity index 100%
rename from messenger/proguard/proguard-jna.pro
rename to session/proguard/proguard-jna.pro
diff --git a/messenger/proguard/proguard-klinker.pro b/session/proguard/proguard-klinker.pro
similarity index 100%
rename from messenger/proguard/proguard-klinker.pro
rename to session/proguard/proguard-klinker.pro
diff --git a/messenger/proguard/proguard-okhttp.pro b/session/proguard/proguard-okhttp.pro
similarity index 100%
rename from messenger/proguard/proguard-okhttp.pro
rename to session/proguard/proguard-okhttp.pro
diff --git a/messenger/proguard/proguard-retrofit.pro b/session/proguard/proguard-retrofit.pro
similarity index 100%
rename from messenger/proguard/proguard-retrofit.pro
rename to session/proguard/proguard-retrofit.pro
diff --git a/messenger/proguard/proguard-retrolambda.pro b/session/proguard/proguard-retrolambda.pro
similarity index 100%
rename from messenger/proguard/proguard-retrolambda.pro
rename to session/proguard/proguard-retrolambda.pro
diff --git a/messenger/proguard/proguard-rounded-image-view.pro b/session/proguard/proguard-rounded-image-view.pro
similarity index 100%
rename from messenger/proguard/proguard-rounded-image-view.pro
rename to session/proguard/proguard-rounded-image-view.pro
diff --git a/messenger/proguard/proguard-shortcutbadger.pro b/session/proguard/proguard-shortcutbadger.pro
similarity index 100%
rename from messenger/proguard/proguard-shortcutbadger.pro
rename to session/proguard/proguard-shortcutbadger.pro
diff --git a/messenger/proguard/proguard-sqlite.pro b/session/proguard/proguard-sqlite.pro
similarity index 100%
rename from messenger/proguard/proguard-sqlite.pro
rename to session/proguard/proguard-sqlite.pro
diff --git a/messenger/proguard/proguard-square-okhttp.pro b/session/proguard/proguard-square-okhttp.pro
similarity index 100%
rename from messenger/proguard/proguard-square-okhttp.pro
rename to session/proguard/proguard-square-okhttp.pro
diff --git a/messenger/proguard/proguard-square-okio.pro b/session/proguard/proguard-square-okio.pro
similarity index 100%
rename from messenger/proguard/proguard-square-okio.pro
rename to session/proguard/proguard-square-okio.pro
diff --git a/messenger/proguard/proguard-webrtc.pro b/session/proguard/proguard-webrtc.pro
similarity index 100%
rename from messenger/proguard/proguard-webrtc.pro
rename to session/proguard/proguard-webrtc.pro
diff --git a/messenger/proguard/proguard.pro b/session/proguard/proguard.pro
similarity index 100%
rename from messenger/proguard/proguard.pro
rename to session/proguard/proguard.pro
diff --git a/messenger/src/main/AndroidManifest.xml b/session/src/main/AndroidManifest.xml
similarity index 100%
rename from messenger/src/main/AndroidManifest.xml
rename to session/src/main/AndroidManifest.xml
diff --git a/messenger/src/main/assets/csv/geolite2_country_blocks_ipv4.csv b/session/src/main/assets/csv/geolite2_country_blocks_ipv4.csv
similarity index 100%
rename from messenger/src/main/assets/csv/geolite2_country_blocks_ipv4.csv
rename to session/src/main/assets/csv/geolite2_country_blocks_ipv4.csv
diff --git a/messenger/src/main/assets/csv/geolite2_country_locations_english.csv b/session/src/main/assets/csv/geolite2_country_locations_english.csv
similarity index 100%
rename from messenger/src/main/assets/csv/geolite2_country_locations_english.csv
rename to session/src/main/assets/csv/geolite2_country_locations_english.csv
diff --git a/messenger/src/main/assets/databases/apns.db b/session/src/main/assets/databases/apns.db
similarity index 100%
rename from messenger/src/main/assets/databases/apns.db
rename to session/src/main/assets/databases/apns.db
diff --git a/messenger/src/main/assets/emoji/Activity.png b/session/src/main/assets/emoji/Activity.png
similarity index 100%
rename from messenger/src/main/assets/emoji/Activity.png
rename to session/src/main/assets/emoji/Activity.png
diff --git a/messenger/src/main/assets/emoji/Flags.png b/session/src/main/assets/emoji/Flags.png
similarity index 100%
rename from messenger/src/main/assets/emoji/Flags.png
rename to session/src/main/assets/emoji/Flags.png
diff --git a/messenger/src/main/assets/emoji/Foods.png b/session/src/main/assets/emoji/Foods.png
similarity index 100%
rename from messenger/src/main/assets/emoji/Foods.png
rename to session/src/main/assets/emoji/Foods.png
diff --git a/messenger/src/main/assets/emoji/Nature.png b/session/src/main/assets/emoji/Nature.png
similarity index 100%
rename from messenger/src/main/assets/emoji/Nature.png
rename to session/src/main/assets/emoji/Nature.png
diff --git a/messenger/src/main/assets/emoji/Objects.png b/session/src/main/assets/emoji/Objects.png
similarity index 100%
rename from messenger/src/main/assets/emoji/Objects.png
rename to session/src/main/assets/emoji/Objects.png
diff --git a/messenger/src/main/assets/emoji/People_0.png b/session/src/main/assets/emoji/People_0.png
similarity index 100%
rename from messenger/src/main/assets/emoji/People_0.png
rename to session/src/main/assets/emoji/People_0.png
diff --git a/messenger/src/main/assets/emoji/People_1.png b/session/src/main/assets/emoji/People_1.png
similarity index 100%
rename from messenger/src/main/assets/emoji/People_1.png
rename to session/src/main/assets/emoji/People_1.png
diff --git a/messenger/src/main/assets/emoji/People_2.png b/session/src/main/assets/emoji/People_2.png
similarity index 100%
rename from messenger/src/main/assets/emoji/People_2.png
rename to session/src/main/assets/emoji/People_2.png
diff --git a/messenger/src/main/assets/emoji/People_3.png b/session/src/main/assets/emoji/People_3.png
similarity index 100%
rename from messenger/src/main/assets/emoji/People_3.png
rename to session/src/main/assets/emoji/People_3.png
diff --git a/messenger/src/main/assets/emoji/Places.png b/session/src/main/assets/emoji/Places.png
similarity index 100%
rename from messenger/src/main/assets/emoji/Places.png
rename to session/src/main/assets/emoji/Places.png
diff --git a/messenger/src/main/assets/emoji/Symbols.png b/session/src/main/assets/emoji/Symbols.png
similarity index 100%
rename from messenger/src/main/assets/emoji/Symbols.png
rename to session/src/main/assets/emoji/Symbols.png
diff --git a/messenger/src/main/assets/fonts/Roboto-Light.ttf b/session/src/main/assets/fonts/Roboto-Light.ttf
similarity index 100%
rename from messenger/src/main/assets/fonts/Roboto-Light.ttf
rename to session/src/main/assets/fonts/Roboto-Light.ttf
diff --git a/messenger/src/main/assets/mnemonic/english.txt b/session/src/main/assets/mnemonic/english.txt
similarity index 100%
rename from messenger/src/main/assets/mnemonic/english.txt
rename to session/src/main/assets/mnemonic/english.txt
diff --git a/messenger/src/main/assets/mnemonic/japanese.txt b/session/src/main/assets/mnemonic/japanese.txt
similarity index 100%
rename from messenger/src/main/assets/mnemonic/japanese.txt
rename to session/src/main/assets/mnemonic/japanese.txt
diff --git a/messenger/src/main/assets/mnemonic/portuguese.txt b/session/src/main/assets/mnemonic/portuguese.txt
similarity index 100%
rename from messenger/src/main/assets/mnemonic/portuguese.txt
rename to session/src/main/assets/mnemonic/portuguese.txt
diff --git a/messenger/src/main/assets/mnemonic/spanish.txt b/session/src/main/assets/mnemonic/spanish.txt
similarity index 100%
rename from messenger/src/main/assets/mnemonic/spanish.txt
rename to session/src/main/assets/mnemonic/spanish.txt
diff --git a/messenger/src/main/assets/stickers/animals/anteater.png b/session/src/main/assets/stickers/animals/anteater.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/anteater.png
rename to session/src/main/assets/stickers/animals/anteater.png
diff --git a/messenger/src/main/assets/stickers/animals/bat.png b/session/src/main/assets/stickers/animals/bat.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/bat.png
rename to session/src/main/assets/stickers/animals/bat.png
diff --git a/messenger/src/main/assets/stickers/animals/beetle.png b/session/src/main/assets/stickers/animals/beetle.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/beetle.png
rename to session/src/main/assets/stickers/animals/beetle.png
diff --git a/messenger/src/main/assets/stickers/animals/bulldog.png b/session/src/main/assets/stickers/animals/bulldog.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/bulldog.png
rename to session/src/main/assets/stickers/animals/bulldog.png
diff --git a/messenger/src/main/assets/stickers/animals/butterfly.png b/session/src/main/assets/stickers/animals/butterfly.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/butterfly.png
rename to session/src/main/assets/stickers/animals/butterfly.png
diff --git a/messenger/src/main/assets/stickers/animals/camel.png b/session/src/main/assets/stickers/animals/camel.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/camel.png
rename to session/src/main/assets/stickers/animals/camel.png
diff --git a/messenger/src/main/assets/stickers/animals/cat.png b/session/src/main/assets/stickers/animals/cat.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/cat.png
rename to session/src/main/assets/stickers/animals/cat.png
diff --git a/messenger/src/main/assets/stickers/animals/chameleon.png b/session/src/main/assets/stickers/animals/chameleon.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/chameleon.png
rename to session/src/main/assets/stickers/animals/chameleon.png
diff --git a/messenger/src/main/assets/stickers/animals/clown-fish.png b/session/src/main/assets/stickers/animals/clown-fish.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/clown-fish.png
rename to session/src/main/assets/stickers/animals/clown-fish.png
diff --git a/messenger/src/main/assets/stickers/animals/cobra.png b/session/src/main/assets/stickers/animals/cobra.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/cobra.png
rename to session/src/main/assets/stickers/animals/cobra.png
diff --git a/messenger/src/main/assets/stickers/animals/cow.png b/session/src/main/assets/stickers/animals/cow.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/cow.png
rename to session/src/main/assets/stickers/animals/cow.png
diff --git a/messenger/src/main/assets/stickers/animals/crab.png b/session/src/main/assets/stickers/animals/crab.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/crab.png
rename to session/src/main/assets/stickers/animals/crab.png
diff --git a/messenger/src/main/assets/stickers/animals/crocodile.png b/session/src/main/assets/stickers/animals/crocodile.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/crocodile.png
rename to session/src/main/assets/stickers/animals/crocodile.png
diff --git a/messenger/src/main/assets/stickers/animals/duck.png b/session/src/main/assets/stickers/animals/duck.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/duck.png
rename to session/src/main/assets/stickers/animals/duck.png
diff --git a/messenger/src/main/assets/stickers/animals/elephant.png b/session/src/main/assets/stickers/animals/elephant.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/elephant.png
rename to session/src/main/assets/stickers/animals/elephant.png
diff --git a/messenger/src/main/assets/stickers/animals/frog.png b/session/src/main/assets/stickers/animals/frog.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/frog.png
rename to session/src/main/assets/stickers/animals/frog.png
diff --git a/messenger/src/main/assets/stickers/animals/giraffe.png b/session/src/main/assets/stickers/animals/giraffe.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/giraffe.png
rename to session/src/main/assets/stickers/animals/giraffe.png
diff --git a/messenger/src/main/assets/stickers/animals/hen.png b/session/src/main/assets/stickers/animals/hen.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/hen.png
rename to session/src/main/assets/stickers/animals/hen.png
diff --git a/messenger/src/main/assets/stickers/animals/hippopotamus.png b/session/src/main/assets/stickers/animals/hippopotamus.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/hippopotamus.png
rename to session/src/main/assets/stickers/animals/hippopotamus.png
diff --git a/messenger/src/main/assets/stickers/animals/kangaroo.png b/session/src/main/assets/stickers/animals/kangaroo.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/kangaroo.png
rename to session/src/main/assets/stickers/animals/kangaroo.png
diff --git a/messenger/src/main/assets/stickers/animals/lion.png b/session/src/main/assets/stickers/animals/lion.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/lion.png
rename to session/src/main/assets/stickers/animals/lion.png
diff --git a/messenger/src/main/assets/stickers/animals/llama.png b/session/src/main/assets/stickers/animals/llama.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/llama.png
rename to session/src/main/assets/stickers/animals/llama.png
diff --git a/messenger/src/main/assets/stickers/animals/macaw.png b/session/src/main/assets/stickers/animals/macaw.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/macaw.png
rename to session/src/main/assets/stickers/animals/macaw.png
diff --git a/messenger/src/main/assets/stickers/animals/monkey.png b/session/src/main/assets/stickers/animals/monkey.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/monkey.png
rename to session/src/main/assets/stickers/animals/monkey.png
diff --git a/messenger/src/main/assets/stickers/animals/moose.png b/session/src/main/assets/stickers/animals/moose.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/moose.png
rename to session/src/main/assets/stickers/animals/moose.png
diff --git a/messenger/src/main/assets/stickers/animals/mouse.png b/session/src/main/assets/stickers/animals/mouse.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/mouse.png
rename to session/src/main/assets/stickers/animals/mouse.png
diff --git a/messenger/src/main/assets/stickers/animals/octopus.png b/session/src/main/assets/stickers/animals/octopus.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/octopus.png
rename to session/src/main/assets/stickers/animals/octopus.png
diff --git a/messenger/src/main/assets/stickers/animals/ostrich.png b/session/src/main/assets/stickers/animals/ostrich.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/ostrich.png
rename to session/src/main/assets/stickers/animals/ostrich.png
diff --git a/messenger/src/main/assets/stickers/animals/owl.png b/session/src/main/assets/stickers/animals/owl.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/owl.png
rename to session/src/main/assets/stickers/animals/owl.png
diff --git a/messenger/src/main/assets/stickers/animals/panda.png b/session/src/main/assets/stickers/animals/panda.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/panda.png
rename to session/src/main/assets/stickers/animals/panda.png
diff --git a/messenger/src/main/assets/stickers/animals/pelican.png b/session/src/main/assets/stickers/animals/pelican.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/pelican.png
rename to session/src/main/assets/stickers/animals/pelican.png
diff --git a/messenger/src/main/assets/stickers/animals/penguin.png b/session/src/main/assets/stickers/animals/penguin.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/penguin.png
rename to session/src/main/assets/stickers/animals/penguin.png
diff --git a/messenger/src/main/assets/stickers/animals/pig.png b/session/src/main/assets/stickers/animals/pig.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/pig.png
rename to session/src/main/assets/stickers/animals/pig.png
diff --git a/messenger/src/main/assets/stickers/animals/rabbit.png b/session/src/main/assets/stickers/animals/rabbit.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/rabbit.png
rename to session/src/main/assets/stickers/animals/rabbit.png
diff --git a/messenger/src/main/assets/stickers/animals/racoon.png b/session/src/main/assets/stickers/animals/racoon.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/racoon.png
rename to session/src/main/assets/stickers/animals/racoon.png
diff --git a/messenger/src/main/assets/stickers/animals/ray.png b/session/src/main/assets/stickers/animals/ray.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/ray.png
rename to session/src/main/assets/stickers/animals/ray.png
diff --git a/messenger/src/main/assets/stickers/animals/rhinoceros.png b/session/src/main/assets/stickers/animals/rhinoceros.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/rhinoceros.png
rename to session/src/main/assets/stickers/animals/rhinoceros.png
diff --git a/messenger/src/main/assets/stickers/animals/sea-cow.png b/session/src/main/assets/stickers/animals/sea-cow.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/sea-cow.png
rename to session/src/main/assets/stickers/animals/sea-cow.png
diff --git a/messenger/src/main/assets/stickers/animals/shark.png b/session/src/main/assets/stickers/animals/shark.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/shark.png
rename to session/src/main/assets/stickers/animals/shark.png
diff --git a/messenger/src/main/assets/stickers/animals/sheep.png b/session/src/main/assets/stickers/animals/sheep.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/sheep.png
rename to session/src/main/assets/stickers/animals/sheep.png
diff --git a/messenger/src/main/assets/stickers/animals/siberian-husky.png b/session/src/main/assets/stickers/animals/siberian-husky.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/siberian-husky.png
rename to session/src/main/assets/stickers/animals/siberian-husky.png
diff --git a/messenger/src/main/assets/stickers/animals/sloth.png b/session/src/main/assets/stickers/animals/sloth.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/sloth.png
rename to session/src/main/assets/stickers/animals/sloth.png
diff --git a/messenger/src/main/assets/stickers/animals/snake.png b/session/src/main/assets/stickers/animals/snake.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/snake.png
rename to session/src/main/assets/stickers/animals/snake.png
diff --git a/messenger/src/main/assets/stickers/animals/spider.png b/session/src/main/assets/stickers/animals/spider.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/spider.png
rename to session/src/main/assets/stickers/animals/spider.png
diff --git a/messenger/src/main/assets/stickers/animals/squirrel.png b/session/src/main/assets/stickers/animals/squirrel.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/squirrel.png
rename to session/src/main/assets/stickers/animals/squirrel.png
diff --git a/messenger/src/main/assets/stickers/animals/swan.png b/session/src/main/assets/stickers/animals/swan.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/swan.png
rename to session/src/main/assets/stickers/animals/swan.png
diff --git a/messenger/src/main/assets/stickers/animals/tiger.png b/session/src/main/assets/stickers/animals/tiger.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/tiger.png
rename to session/src/main/assets/stickers/animals/tiger.png
diff --git a/messenger/src/main/assets/stickers/animals/toucan.png b/session/src/main/assets/stickers/animals/toucan.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/toucan.png
rename to session/src/main/assets/stickers/animals/toucan.png
diff --git a/messenger/src/main/assets/stickers/animals/turtle.png b/session/src/main/assets/stickers/animals/turtle.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/turtle.png
rename to session/src/main/assets/stickers/animals/turtle.png
diff --git a/messenger/src/main/assets/stickers/animals/whale.png b/session/src/main/assets/stickers/animals/whale.png
similarity index 100%
rename from messenger/src/main/assets/stickers/animals/whale.png
rename to session/src/main/assets/stickers/animals/whale.png
diff --git a/messenger/src/main/assets/stickers/clothes/backpack.png b/session/src/main/assets/stickers/clothes/backpack.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/backpack.png
rename to session/src/main/assets/stickers/clothes/backpack.png
diff --git a/messenger/src/main/assets/stickers/clothes/bathrobe.png b/session/src/main/assets/stickers/clothes/bathrobe.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/bathrobe.png
rename to session/src/main/assets/stickers/clothes/bathrobe.png
diff --git a/messenger/src/main/assets/stickers/clothes/belt.png b/session/src/main/assets/stickers/clothes/belt.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/belt.png
rename to session/src/main/assets/stickers/clothes/belt.png
diff --git a/messenger/src/main/assets/stickers/clothes/boot.png b/session/src/main/assets/stickers/clothes/boot.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/boot.png
rename to session/src/main/assets/stickers/clothes/boot.png
diff --git a/messenger/src/main/assets/stickers/clothes/bow-tie.png b/session/src/main/assets/stickers/clothes/bow-tie.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/bow-tie.png
rename to session/src/main/assets/stickers/clothes/bow-tie.png
diff --git a/messenger/src/main/assets/stickers/clothes/bowler-hat.png b/session/src/main/assets/stickers/clothes/bowler-hat.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/bowler-hat.png
rename to session/src/main/assets/stickers/clothes/bowler-hat.png
diff --git a/messenger/src/main/assets/stickers/clothes/boxers.png b/session/src/main/assets/stickers/clothes/boxers.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/boxers.png
rename to session/src/main/assets/stickers/clothes/boxers.png
diff --git a/messenger/src/main/assets/stickers/clothes/bra.png b/session/src/main/assets/stickers/clothes/bra.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/bra.png
rename to session/src/main/assets/stickers/clothes/bra.png
diff --git a/messenger/src/main/assets/stickers/clothes/cap.png b/session/src/main/assets/stickers/clothes/cap.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/cap.png
rename to session/src/main/assets/stickers/clothes/cap.png
diff --git a/messenger/src/main/assets/stickers/clothes/dress-1.png b/session/src/main/assets/stickers/clothes/dress-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/dress-1.png
rename to session/src/main/assets/stickers/clothes/dress-1.png
diff --git a/messenger/src/main/assets/stickers/clothes/dress-2.png b/session/src/main/assets/stickers/clothes/dress-2.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/dress-2.png
rename to session/src/main/assets/stickers/clothes/dress-2.png
diff --git a/messenger/src/main/assets/stickers/clothes/dress-3.png b/session/src/main/assets/stickers/clothes/dress-3.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/dress-3.png
rename to session/src/main/assets/stickers/clothes/dress-3.png
diff --git a/messenger/src/main/assets/stickers/clothes/dress.png b/session/src/main/assets/stickers/clothes/dress.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/dress.png
rename to session/src/main/assets/stickers/clothes/dress.png
diff --git a/messenger/src/main/assets/stickers/clothes/glasses.png b/session/src/main/assets/stickers/clothes/glasses.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/glasses.png
rename to session/src/main/assets/stickers/clothes/glasses.png
diff --git a/messenger/src/main/assets/stickers/clothes/hat.png b/session/src/main/assets/stickers/clothes/hat.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/hat.png
rename to session/src/main/assets/stickers/clothes/hat.png
diff --git a/messenger/src/main/assets/stickers/clothes/high-heel.png b/session/src/main/assets/stickers/clothes/high-heel.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/high-heel.png
rename to session/src/main/assets/stickers/clothes/high-heel.png
diff --git a/messenger/src/main/assets/stickers/clothes/jacket-1.png b/session/src/main/assets/stickers/clothes/jacket-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/jacket-1.png
rename to session/src/main/assets/stickers/clothes/jacket-1.png
diff --git a/messenger/src/main/assets/stickers/clothes/jacket-2.png b/session/src/main/assets/stickers/clothes/jacket-2.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/jacket-2.png
rename to session/src/main/assets/stickers/clothes/jacket-2.png
diff --git a/messenger/src/main/assets/stickers/clothes/jacket-3.png b/session/src/main/assets/stickers/clothes/jacket-3.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/jacket-3.png
rename to session/src/main/assets/stickers/clothes/jacket-3.png
diff --git a/messenger/src/main/assets/stickers/clothes/jacket-4.png b/session/src/main/assets/stickers/clothes/jacket-4.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/jacket-4.png
rename to session/src/main/assets/stickers/clothes/jacket-4.png
diff --git a/messenger/src/main/assets/stickers/clothes/jacket.png b/session/src/main/assets/stickers/clothes/jacket.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/jacket.png
rename to session/src/main/assets/stickers/clothes/jacket.png
diff --git a/messenger/src/main/assets/stickers/clothes/jeans.png b/session/src/main/assets/stickers/clothes/jeans.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/jeans.png
rename to session/src/main/assets/stickers/clothes/jeans.png
diff --git a/messenger/src/main/assets/stickers/clothes/lingerie.png b/session/src/main/assets/stickers/clothes/lingerie.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/lingerie.png
rename to session/src/main/assets/stickers/clothes/lingerie.png
diff --git a/messenger/src/main/assets/stickers/clothes/overall.png b/session/src/main/assets/stickers/clothes/overall.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/overall.png
rename to session/src/main/assets/stickers/clothes/overall.png
diff --git a/messenger/src/main/assets/stickers/clothes/polo.png b/session/src/main/assets/stickers/clothes/polo.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/polo.png
rename to session/src/main/assets/stickers/clothes/polo.png
diff --git a/messenger/src/main/assets/stickers/clothes/pullover.png b/session/src/main/assets/stickers/clothes/pullover.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/pullover.png
rename to session/src/main/assets/stickers/clothes/pullover.png
diff --git a/messenger/src/main/assets/stickers/clothes/purse-1.png b/session/src/main/assets/stickers/clothes/purse-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/purse-1.png
rename to session/src/main/assets/stickers/clothes/purse-1.png
diff --git a/messenger/src/main/assets/stickers/clothes/purse.png b/session/src/main/assets/stickers/clothes/purse.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/purse.png
rename to session/src/main/assets/stickers/clothes/purse.png
diff --git a/messenger/src/main/assets/stickers/clothes/scarf.png b/session/src/main/assets/stickers/clothes/scarf.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/scarf.png
rename to session/src/main/assets/stickers/clothes/scarf.png
diff --git a/messenger/src/main/assets/stickers/clothes/shirt-1.png b/session/src/main/assets/stickers/clothes/shirt-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/shirt-1.png
rename to session/src/main/assets/stickers/clothes/shirt-1.png
diff --git a/messenger/src/main/assets/stickers/clothes/shirt-2.png b/session/src/main/assets/stickers/clothes/shirt-2.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/shirt-2.png
rename to session/src/main/assets/stickers/clothes/shirt-2.png
diff --git a/messenger/src/main/assets/stickers/clothes/shirt.png b/session/src/main/assets/stickers/clothes/shirt.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/shirt.png
rename to session/src/main/assets/stickers/clothes/shirt.png
diff --git a/messenger/src/main/assets/stickers/clothes/shoe.png b/session/src/main/assets/stickers/clothes/shoe.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/shoe.png
rename to session/src/main/assets/stickers/clothes/shoe.png
diff --git a/messenger/src/main/assets/stickers/clothes/shorts.png b/session/src/main/assets/stickers/clothes/shorts.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/shorts.png
rename to session/src/main/assets/stickers/clothes/shorts.png
diff --git a/messenger/src/main/assets/stickers/clothes/skirt.png b/session/src/main/assets/stickers/clothes/skirt.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/skirt.png
rename to session/src/main/assets/stickers/clothes/skirt.png
diff --git a/messenger/src/main/assets/stickers/clothes/sleeveless.png b/session/src/main/assets/stickers/clothes/sleeveless.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/sleeveless.png
rename to session/src/main/assets/stickers/clothes/sleeveless.png
diff --git a/messenger/src/main/assets/stickers/clothes/slippers.png b/session/src/main/assets/stickers/clothes/slippers.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/slippers.png
rename to session/src/main/assets/stickers/clothes/slippers.png
diff --git a/messenger/src/main/assets/stickers/clothes/sneakers-1.png b/session/src/main/assets/stickers/clothes/sneakers-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/sneakers-1.png
rename to session/src/main/assets/stickers/clothes/sneakers-1.png
diff --git a/messenger/src/main/assets/stickers/clothes/sneakers.png b/session/src/main/assets/stickers/clothes/sneakers.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/sneakers.png
rename to session/src/main/assets/stickers/clothes/sneakers.png
diff --git a/messenger/src/main/assets/stickers/clothes/socks.png b/session/src/main/assets/stickers/clothes/socks.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/socks.png
rename to session/src/main/assets/stickers/clothes/socks.png
diff --git a/messenger/src/main/assets/stickers/clothes/suitcase.png b/session/src/main/assets/stickers/clothes/suitcase.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/suitcase.png
rename to session/src/main/assets/stickers/clothes/suitcase.png
diff --git a/messenger/src/main/assets/stickers/clothes/sweatshirt.png b/session/src/main/assets/stickers/clothes/sweatshirt.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/sweatshirt.png
rename to session/src/main/assets/stickers/clothes/sweatshirt.png
diff --git a/messenger/src/main/assets/stickers/clothes/swimsuit-1.png b/session/src/main/assets/stickers/clothes/swimsuit-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/swimsuit-1.png
rename to session/src/main/assets/stickers/clothes/swimsuit-1.png
diff --git a/messenger/src/main/assets/stickers/clothes/swimsuit.png b/session/src/main/assets/stickers/clothes/swimsuit.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/swimsuit.png
rename to session/src/main/assets/stickers/clothes/swimsuit.png
diff --git a/messenger/src/main/assets/stickers/clothes/tie.png b/session/src/main/assets/stickers/clothes/tie.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/tie.png
rename to session/src/main/assets/stickers/clothes/tie.png
diff --git a/messenger/src/main/assets/stickers/clothes/trench-coat.png b/session/src/main/assets/stickers/clothes/trench-coat.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/trench-coat.png
rename to session/src/main/assets/stickers/clothes/trench-coat.png
diff --git a/messenger/src/main/assets/stickers/clothes/trousers.png b/session/src/main/assets/stickers/clothes/trousers.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/trousers.png
rename to session/src/main/assets/stickers/clothes/trousers.png
diff --git a/messenger/src/main/assets/stickers/clothes/underpants.png b/session/src/main/assets/stickers/clothes/underpants.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/underpants.png
rename to session/src/main/assets/stickers/clothes/underpants.png
diff --git a/messenger/src/main/assets/stickers/clothes/vest.png b/session/src/main/assets/stickers/clothes/vest.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/vest.png
rename to session/src/main/assets/stickers/clothes/vest.png
diff --git a/messenger/src/main/assets/stickers/clothes/winter-hat.png b/session/src/main/assets/stickers/clothes/winter-hat.png
similarity index 100%
rename from messenger/src/main/assets/stickers/clothes/winter-hat.png
rename to session/src/main/assets/stickers/clothes/winter-hat.png
diff --git a/messenger/src/main/assets/stickers/emoticons/angry-1.png b/session/src/main/assets/stickers/emoticons/angry-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/angry-1.png
rename to session/src/main/assets/stickers/emoticons/angry-1.png
diff --git a/messenger/src/main/assets/stickers/emoticons/angry.png b/session/src/main/assets/stickers/emoticons/angry.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/angry.png
rename to session/src/main/assets/stickers/emoticons/angry.png
diff --git a/messenger/src/main/assets/stickers/emoticons/bored-1.png b/session/src/main/assets/stickers/emoticons/bored-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/bored-1.png
rename to session/src/main/assets/stickers/emoticons/bored-1.png
diff --git a/messenger/src/main/assets/stickers/emoticons/bored-2.png b/session/src/main/assets/stickers/emoticons/bored-2.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/bored-2.png
rename to session/src/main/assets/stickers/emoticons/bored-2.png
diff --git a/messenger/src/main/assets/stickers/emoticons/bored.png b/session/src/main/assets/stickers/emoticons/bored.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/bored.png
rename to session/src/main/assets/stickers/emoticons/bored.png
diff --git a/messenger/src/main/assets/stickers/emoticons/confused-1.png b/session/src/main/assets/stickers/emoticons/confused-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/confused-1.png
rename to session/src/main/assets/stickers/emoticons/confused-1.png
diff --git a/messenger/src/main/assets/stickers/emoticons/confused.png b/session/src/main/assets/stickers/emoticons/confused.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/confused.png
rename to session/src/main/assets/stickers/emoticons/confused.png
diff --git a/messenger/src/main/assets/stickers/emoticons/crying-1.png b/session/src/main/assets/stickers/emoticons/crying-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/crying-1.png
rename to session/src/main/assets/stickers/emoticons/crying-1.png
diff --git a/messenger/src/main/assets/stickers/emoticons/crying.png b/session/src/main/assets/stickers/emoticons/crying.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/crying.png
rename to session/src/main/assets/stickers/emoticons/crying.png
diff --git a/messenger/src/main/assets/stickers/emoticons/embarrassed.png b/session/src/main/assets/stickers/emoticons/embarrassed.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/embarrassed.png
rename to session/src/main/assets/stickers/emoticons/embarrassed.png
diff --git a/messenger/src/main/assets/stickers/emoticons/emoticons.png b/session/src/main/assets/stickers/emoticons/emoticons.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/emoticons.png
rename to session/src/main/assets/stickers/emoticons/emoticons.png
diff --git a/messenger/src/main/assets/stickers/emoticons/happy-1.png b/session/src/main/assets/stickers/emoticons/happy-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/happy-1.png
rename to session/src/main/assets/stickers/emoticons/happy-1.png
diff --git a/messenger/src/main/assets/stickers/emoticons/happy-2.png b/session/src/main/assets/stickers/emoticons/happy-2.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/happy-2.png
rename to session/src/main/assets/stickers/emoticons/happy-2.png
diff --git a/messenger/src/main/assets/stickers/emoticons/happy-3.png b/session/src/main/assets/stickers/emoticons/happy-3.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/happy-3.png
rename to session/src/main/assets/stickers/emoticons/happy-3.png
diff --git a/messenger/src/main/assets/stickers/emoticons/happy-4.png b/session/src/main/assets/stickers/emoticons/happy-4.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/happy-4.png
rename to session/src/main/assets/stickers/emoticons/happy-4.png
diff --git a/messenger/src/main/assets/stickers/emoticons/happy.png b/session/src/main/assets/stickers/emoticons/happy.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/happy.png
rename to session/src/main/assets/stickers/emoticons/happy.png
diff --git a/messenger/src/main/assets/stickers/emoticons/ill.png b/session/src/main/assets/stickers/emoticons/ill.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/ill.png
rename to session/src/main/assets/stickers/emoticons/ill.png
diff --git a/messenger/src/main/assets/stickers/emoticons/in-love.png b/session/src/main/assets/stickers/emoticons/in-love.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/in-love.png
rename to session/src/main/assets/stickers/emoticons/in-love.png
diff --git a/messenger/src/main/assets/stickers/emoticons/kissing.png b/session/src/main/assets/stickers/emoticons/kissing.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/kissing.png
rename to session/src/main/assets/stickers/emoticons/kissing.png
diff --git a/messenger/src/main/assets/stickers/emoticons/mad.png b/session/src/main/assets/stickers/emoticons/mad.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/mad.png
rename to session/src/main/assets/stickers/emoticons/mad.png
diff --git a/messenger/src/main/assets/stickers/emoticons/nerd.png b/session/src/main/assets/stickers/emoticons/nerd.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/nerd.png
rename to session/src/main/assets/stickers/emoticons/nerd.png
diff --git a/messenger/src/main/assets/stickers/emoticons/ninja.png b/session/src/main/assets/stickers/emoticons/ninja.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/ninja.png
rename to session/src/main/assets/stickers/emoticons/ninja.png
diff --git a/messenger/src/main/assets/stickers/emoticons/quiet.png b/session/src/main/assets/stickers/emoticons/quiet.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/quiet.png
rename to session/src/main/assets/stickers/emoticons/quiet.png
diff --git a/messenger/src/main/assets/stickers/emoticons/sad.png b/session/src/main/assets/stickers/emoticons/sad.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/sad.png
rename to session/src/main/assets/stickers/emoticons/sad.png
diff --git a/messenger/src/main/assets/stickers/emoticons/secret.png b/session/src/main/assets/stickers/emoticons/secret.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/secret.png
rename to session/src/main/assets/stickers/emoticons/secret.png
diff --git a/messenger/src/main/assets/stickers/emoticons/smart.png b/session/src/main/assets/stickers/emoticons/smart.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/smart.png
rename to session/src/main/assets/stickers/emoticons/smart.png
diff --git a/messenger/src/main/assets/stickers/emoticons/smile.png b/session/src/main/assets/stickers/emoticons/smile.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/smile.png
rename to session/src/main/assets/stickers/emoticons/smile.png
diff --git a/messenger/src/main/assets/stickers/emoticons/smiling.png b/session/src/main/assets/stickers/emoticons/smiling.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/smiling.png
rename to session/src/main/assets/stickers/emoticons/smiling.png
diff --git a/messenger/src/main/assets/stickers/emoticons/surprised-1.png b/session/src/main/assets/stickers/emoticons/surprised-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/surprised-1.png
rename to session/src/main/assets/stickers/emoticons/surprised-1.png
diff --git a/messenger/src/main/assets/stickers/emoticons/surprised.png b/session/src/main/assets/stickers/emoticons/surprised.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/surprised.png
rename to session/src/main/assets/stickers/emoticons/surprised.png
diff --git a/messenger/src/main/assets/stickers/emoticons/suspicious-1.png b/session/src/main/assets/stickers/emoticons/suspicious-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/suspicious-1.png
rename to session/src/main/assets/stickers/emoticons/suspicious-1.png
diff --git a/messenger/src/main/assets/stickers/emoticons/suspicious.png b/session/src/main/assets/stickers/emoticons/suspicious.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/suspicious.png
rename to session/src/main/assets/stickers/emoticons/suspicious.png
diff --git a/messenger/src/main/assets/stickers/emoticons/tongue-out-1.png b/session/src/main/assets/stickers/emoticons/tongue-out-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/tongue-out-1.png
rename to session/src/main/assets/stickers/emoticons/tongue-out-1.png
diff --git a/messenger/src/main/assets/stickers/emoticons/tongue-out.png b/session/src/main/assets/stickers/emoticons/tongue-out.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/tongue-out.png
rename to session/src/main/assets/stickers/emoticons/tongue-out.png
diff --git a/messenger/src/main/assets/stickers/emoticons/unhappy.png b/session/src/main/assets/stickers/emoticons/unhappy.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/unhappy.png
rename to session/src/main/assets/stickers/emoticons/unhappy.png
diff --git a/messenger/src/main/assets/stickers/emoticons/wink.png b/session/src/main/assets/stickers/emoticons/wink.png
similarity index 100%
rename from messenger/src/main/assets/stickers/emoticons/wink.png
rename to session/src/main/assets/stickers/emoticons/wink.png
diff --git a/messenger/src/main/assets/stickers/food/apple.png b/session/src/main/assets/stickers/food/apple.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/apple.png
rename to session/src/main/assets/stickers/food/apple.png
diff --git a/messenger/src/main/assets/stickers/food/artichoke.png b/session/src/main/assets/stickers/food/artichoke.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/artichoke.png
rename to session/src/main/assets/stickers/food/artichoke.png
diff --git a/messenger/src/main/assets/stickers/food/aubergine.png b/session/src/main/assets/stickers/food/aubergine.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/aubergine.png
rename to session/src/main/assets/stickers/food/aubergine.png
diff --git a/messenger/src/main/assets/stickers/food/avocado.png b/session/src/main/assets/stickers/food/avocado.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/avocado.png
rename to session/src/main/assets/stickers/food/avocado.png
diff --git a/messenger/src/main/assets/stickers/food/bacon.png b/session/src/main/assets/stickers/food/bacon.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/bacon.png
rename to session/src/main/assets/stickers/food/bacon.png
diff --git a/messenger/src/main/assets/stickers/food/banana.png b/session/src/main/assets/stickers/food/banana.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/banana.png
rename to session/src/main/assets/stickers/food/banana.png
diff --git a/messenger/src/main/assets/stickers/food/beans.png b/session/src/main/assets/stickers/food/beans.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/beans.png
rename to session/src/main/assets/stickers/food/beans.png
diff --git a/messenger/src/main/assets/stickers/food/bell-pepper.png b/session/src/main/assets/stickers/food/bell-pepper.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/bell-pepper.png
rename to session/src/main/assets/stickers/food/bell-pepper.png
diff --git a/messenger/src/main/assets/stickers/food/birthday-cake.png b/session/src/main/assets/stickers/food/birthday-cake.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/birthday-cake.png
rename to session/src/main/assets/stickers/food/birthday-cake.png
diff --git a/messenger/src/main/assets/stickers/food/biscuit.png b/session/src/main/assets/stickers/food/biscuit.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/biscuit.png
rename to session/src/main/assets/stickers/food/biscuit.png
diff --git a/messenger/src/main/assets/stickers/food/boiled-egg.png b/session/src/main/assets/stickers/food/boiled-egg.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/boiled-egg.png
rename to session/src/main/assets/stickers/food/boiled-egg.png
diff --git a/messenger/src/main/assets/stickers/food/bread.png b/session/src/main/assets/stickers/food/bread.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/bread.png
rename to session/src/main/assets/stickers/food/bread.png
diff --git a/messenger/src/main/assets/stickers/food/broccoli.png b/session/src/main/assets/stickers/food/broccoli.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/broccoli.png
rename to session/src/main/assets/stickers/food/broccoli.png
diff --git a/messenger/src/main/assets/stickers/food/brochette.png b/session/src/main/assets/stickers/food/brochette.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/brochette.png
rename to session/src/main/assets/stickers/food/brochette.png
diff --git a/messenger/src/main/assets/stickers/food/burger-1.png b/session/src/main/assets/stickers/food/burger-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/burger-1.png
rename to session/src/main/assets/stickers/food/burger-1.png
diff --git a/messenger/src/main/assets/stickers/food/burger.png b/session/src/main/assets/stickers/food/burger.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/burger.png
rename to session/src/main/assets/stickers/food/burger.png
diff --git a/messenger/src/main/assets/stickers/food/burrito.png b/session/src/main/assets/stickers/food/burrito.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/burrito.png
rename to session/src/main/assets/stickers/food/burrito.png
diff --git a/messenger/src/main/assets/stickers/food/cake.png b/session/src/main/assets/stickers/food/cake.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/cake.png
rename to session/src/main/assets/stickers/food/cake.png
diff --git a/messenger/src/main/assets/stickers/food/candy-cane.png b/session/src/main/assets/stickers/food/candy-cane.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/candy-cane.png
rename to session/src/main/assets/stickers/food/candy-cane.png
diff --git a/messenger/src/main/assets/stickers/food/candy.png b/session/src/main/assets/stickers/food/candy.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/candy.png
rename to session/src/main/assets/stickers/food/candy.png
diff --git a/messenger/src/main/assets/stickers/food/carrot.png b/session/src/main/assets/stickers/food/carrot.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/carrot.png
rename to session/src/main/assets/stickers/food/carrot.png
diff --git a/messenger/src/main/assets/stickers/food/cheese.png b/session/src/main/assets/stickers/food/cheese.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/cheese.png
rename to session/src/main/assets/stickers/food/cheese.png
diff --git a/messenger/src/main/assets/stickers/food/cherry.png b/session/src/main/assets/stickers/food/cherry.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/cherry.png
rename to session/src/main/assets/stickers/food/cherry.png
diff --git a/messenger/src/main/assets/stickers/food/chicken-leg.png b/session/src/main/assets/stickers/food/chicken-leg.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/chicken-leg.png
rename to session/src/main/assets/stickers/food/chicken-leg.png
diff --git a/messenger/src/main/assets/stickers/food/chili-pepper.png b/session/src/main/assets/stickers/food/chili-pepper.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/chili-pepper.png
rename to session/src/main/assets/stickers/food/chili-pepper.png
diff --git a/messenger/src/main/assets/stickers/food/chocolate.png b/session/src/main/assets/stickers/food/chocolate.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/chocolate.png
rename to session/src/main/assets/stickers/food/chocolate.png
diff --git a/messenger/src/main/assets/stickers/food/chorizo.png b/session/src/main/assets/stickers/food/chorizo.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/chorizo.png
rename to session/src/main/assets/stickers/food/chorizo.png
diff --git a/messenger/src/main/assets/stickers/food/corn.png b/session/src/main/assets/stickers/food/corn.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/corn.png
rename to session/src/main/assets/stickers/food/corn.png
diff --git a/messenger/src/main/assets/stickers/food/cotton-candy.png b/session/src/main/assets/stickers/food/cotton-candy.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/cotton-candy.png
rename to session/src/main/assets/stickers/food/cotton-candy.png
diff --git a/messenger/src/main/assets/stickers/food/crab.png b/session/src/main/assets/stickers/food/crab.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/crab.png
rename to session/src/main/assets/stickers/food/crab.png
diff --git a/messenger/src/main/assets/stickers/food/croissant.png b/session/src/main/assets/stickers/food/croissant.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/croissant.png
rename to session/src/main/assets/stickers/food/croissant.png
diff --git a/messenger/src/main/assets/stickers/food/cupcake-1.png b/session/src/main/assets/stickers/food/cupcake-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/cupcake-1.png
rename to session/src/main/assets/stickers/food/cupcake-1.png
diff --git a/messenger/src/main/assets/stickers/food/cupcake.png b/session/src/main/assets/stickers/food/cupcake.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/cupcake.png
rename to session/src/main/assets/stickers/food/cupcake.png
diff --git a/messenger/src/main/assets/stickers/food/doner-kebab.png b/session/src/main/assets/stickers/food/doner-kebab.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/doner-kebab.png
rename to session/src/main/assets/stickers/food/doner-kebab.png
diff --git a/messenger/src/main/assets/stickers/food/donut.png b/session/src/main/assets/stickers/food/donut.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/donut.png
rename to session/src/main/assets/stickers/food/donut.png
diff --git a/messenger/src/main/assets/stickers/food/drink.png b/session/src/main/assets/stickers/food/drink.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/drink.png
rename to session/src/main/assets/stickers/food/drink.png
diff --git a/messenger/src/main/assets/stickers/food/fish.png b/session/src/main/assets/stickers/food/fish.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/fish.png
rename to session/src/main/assets/stickers/food/fish.png
diff --git a/messenger/src/main/assets/stickers/food/french-fries.png b/session/src/main/assets/stickers/food/french-fries.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/french-fries.png
rename to session/src/main/assets/stickers/food/french-fries.png
diff --git a/messenger/src/main/assets/stickers/food/fried-egg.png b/session/src/main/assets/stickers/food/fried-egg.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/fried-egg.png
rename to session/src/main/assets/stickers/food/fried-egg.png
diff --git a/messenger/src/main/assets/stickers/food/garlic.png b/session/src/main/assets/stickers/food/garlic.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/garlic.png
rename to session/src/main/assets/stickers/food/garlic.png
diff --git a/messenger/src/main/assets/stickers/food/gingerbread-man.png b/session/src/main/assets/stickers/food/gingerbread-man.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/gingerbread-man.png
rename to session/src/main/assets/stickers/food/gingerbread-man.png
diff --git a/messenger/src/main/assets/stickers/food/grapes.png b/session/src/main/assets/stickers/food/grapes.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/grapes.png
rename to session/src/main/assets/stickers/food/grapes.png
diff --git a/messenger/src/main/assets/stickers/food/honey.png b/session/src/main/assets/stickers/food/honey.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/honey.png
rename to session/src/main/assets/stickers/food/honey.png
diff --git a/messenger/src/main/assets/stickers/food/hot-dog.png b/session/src/main/assets/stickers/food/hot-dog.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/hot-dog.png
rename to session/src/main/assets/stickers/food/hot-dog.png
diff --git a/messenger/src/main/assets/stickers/food/ice-cream.png b/session/src/main/assets/stickers/food/ice-cream.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/ice-cream.png
rename to session/src/main/assets/stickers/food/ice-cream.png
diff --git a/messenger/src/main/assets/stickers/food/jam.png b/session/src/main/assets/stickers/food/jam.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/jam.png
rename to session/src/main/assets/stickers/food/jam.png
diff --git a/messenger/src/main/assets/stickers/food/jelly.png b/session/src/main/assets/stickers/food/jelly.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/jelly.png
rename to session/src/main/assets/stickers/food/jelly.png
diff --git a/messenger/src/main/assets/stickers/food/ketchup.png b/session/src/main/assets/stickers/food/ketchup.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/ketchup.png
rename to session/src/main/assets/stickers/food/ketchup.png
diff --git a/messenger/src/main/assets/stickers/food/kiwi.png b/session/src/main/assets/stickers/food/kiwi.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/kiwi.png
rename to session/src/main/assets/stickers/food/kiwi.png
diff --git a/messenger/src/main/assets/stickers/food/lemon.png b/session/src/main/assets/stickers/food/lemon.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/lemon.png
rename to session/src/main/assets/stickers/food/lemon.png
diff --git a/messenger/src/main/assets/stickers/food/lettuce.png b/session/src/main/assets/stickers/food/lettuce.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/lettuce.png
rename to session/src/main/assets/stickers/food/lettuce.png
diff --git a/messenger/src/main/assets/stickers/food/lobster.png b/session/src/main/assets/stickers/food/lobster.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/lobster.png
rename to session/src/main/assets/stickers/food/lobster.png
diff --git a/messenger/src/main/assets/stickers/food/lollipop-1.png b/session/src/main/assets/stickers/food/lollipop-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/lollipop-1.png
rename to session/src/main/assets/stickers/food/lollipop-1.png
diff --git a/messenger/src/main/assets/stickers/food/lollipop.png b/session/src/main/assets/stickers/food/lollipop.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/lollipop.png
rename to session/src/main/assets/stickers/food/lollipop.png
diff --git a/messenger/src/main/assets/stickers/food/macarons.png b/session/src/main/assets/stickers/food/macarons.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/macarons.png
rename to session/src/main/assets/stickers/food/macarons.png
diff --git a/messenger/src/main/assets/stickers/food/muffin.png b/session/src/main/assets/stickers/food/muffin.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/muffin.png
rename to session/src/main/assets/stickers/food/muffin.png
diff --git a/messenger/src/main/assets/stickers/food/mushroom.png b/session/src/main/assets/stickers/food/mushroom.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/mushroom.png
rename to session/src/main/assets/stickers/food/mushroom.png
diff --git a/messenger/src/main/assets/stickers/food/mussel.png b/session/src/main/assets/stickers/food/mussel.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/mussel.png
rename to session/src/main/assets/stickers/food/mussel.png
diff --git a/messenger/src/main/assets/stickers/food/noodles.png b/session/src/main/assets/stickers/food/noodles.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/noodles.png
rename to session/src/main/assets/stickers/food/noodles.png
diff --git a/messenger/src/main/assets/stickers/food/olive-oil.png b/session/src/main/assets/stickers/food/olive-oil.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/olive-oil.png
rename to session/src/main/assets/stickers/food/olive-oil.png
diff --git a/messenger/src/main/assets/stickers/food/olives.png b/session/src/main/assets/stickers/food/olives.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/olives.png
rename to session/src/main/assets/stickers/food/olives.png
diff --git a/messenger/src/main/assets/stickers/food/onion-rings.png b/session/src/main/assets/stickers/food/onion-rings.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/onion-rings.png
rename to session/src/main/assets/stickers/food/onion-rings.png
diff --git a/messenger/src/main/assets/stickers/food/onion.png b/session/src/main/assets/stickers/food/onion.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/onion.png
rename to session/src/main/assets/stickers/food/onion.png
diff --git a/messenger/src/main/assets/stickers/food/orange.png b/session/src/main/assets/stickers/food/orange.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/orange.png
rename to session/src/main/assets/stickers/food/orange.png
diff --git a/messenger/src/main/assets/stickers/food/pancakes.png b/session/src/main/assets/stickers/food/pancakes.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/pancakes.png
rename to session/src/main/assets/stickers/food/pancakes.png
diff --git a/messenger/src/main/assets/stickers/food/pasta.png b/session/src/main/assets/stickers/food/pasta.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/pasta.png
rename to session/src/main/assets/stickers/food/pasta.png
diff --git a/messenger/src/main/assets/stickers/food/peach.png b/session/src/main/assets/stickers/food/peach.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/peach.png
rename to session/src/main/assets/stickers/food/peach.png
diff --git a/messenger/src/main/assets/stickers/food/pear.png b/session/src/main/assets/stickers/food/pear.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/pear.png
rename to session/src/main/assets/stickers/food/pear.png
diff --git a/messenger/src/main/assets/stickers/food/pepper.png b/session/src/main/assets/stickers/food/pepper.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/pepper.png
rename to session/src/main/assets/stickers/food/pepper.png
diff --git a/messenger/src/main/assets/stickers/food/pie.png b/session/src/main/assets/stickers/food/pie.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/pie.png
rename to session/src/main/assets/stickers/food/pie.png
diff --git a/messenger/src/main/assets/stickers/food/pineapple.png b/session/src/main/assets/stickers/food/pineapple.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/pineapple.png
rename to session/src/main/assets/stickers/food/pineapple.png
diff --git a/messenger/src/main/assets/stickers/food/pizza.png b/session/src/main/assets/stickers/food/pizza.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/pizza.png
rename to session/src/main/assets/stickers/food/pizza.png
diff --git a/messenger/src/main/assets/stickers/food/popcorn.png b/session/src/main/assets/stickers/food/popcorn.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/popcorn.png
rename to session/src/main/assets/stickers/food/popcorn.png
diff --git a/messenger/src/main/assets/stickers/food/prawn.png b/session/src/main/assets/stickers/food/prawn.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/prawn.png
rename to session/src/main/assets/stickers/food/prawn.png
diff --git a/messenger/src/main/assets/stickers/food/pretzel.png b/session/src/main/assets/stickers/food/pretzel.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/pretzel.png
rename to session/src/main/assets/stickers/food/pretzel.png
diff --git a/messenger/src/main/assets/stickers/food/pumpkin.png b/session/src/main/assets/stickers/food/pumpkin.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/pumpkin.png
rename to session/src/main/assets/stickers/food/pumpkin.png
diff --git a/messenger/src/main/assets/stickers/food/radish.png b/session/src/main/assets/stickers/food/radish.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/radish.png
rename to session/src/main/assets/stickers/food/radish.png
diff --git a/messenger/src/main/assets/stickers/food/raspberry.png b/session/src/main/assets/stickers/food/raspberry.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/raspberry.png
rename to session/src/main/assets/stickers/food/raspberry.png
diff --git a/messenger/src/main/assets/stickers/food/rice.png b/session/src/main/assets/stickers/food/rice.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/rice.png
rename to session/src/main/assets/stickers/food/rice.png
diff --git a/messenger/src/main/assets/stickers/food/roast-chicken.png b/session/src/main/assets/stickers/food/roast-chicken.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/roast-chicken.png
rename to session/src/main/assets/stickers/food/roast-chicken.png
diff --git a/messenger/src/main/assets/stickers/food/salad.png b/session/src/main/assets/stickers/food/salad.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/salad.png
rename to session/src/main/assets/stickers/food/salad.png
diff --git a/messenger/src/main/assets/stickers/food/salt.png b/session/src/main/assets/stickers/food/salt.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/salt.png
rename to session/src/main/assets/stickers/food/salt.png
diff --git a/messenger/src/main/assets/stickers/food/sandwich-1.png b/session/src/main/assets/stickers/food/sandwich-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/sandwich-1.png
rename to session/src/main/assets/stickers/food/sandwich-1.png
diff --git a/messenger/src/main/assets/stickers/food/sandwich.png b/session/src/main/assets/stickers/food/sandwich.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/sandwich.png
rename to session/src/main/assets/stickers/food/sandwich.png
diff --git a/messenger/src/main/assets/stickers/food/sardine.png b/session/src/main/assets/stickers/food/sardine.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/sardine.png
rename to session/src/main/assets/stickers/food/sardine.png
diff --git a/messenger/src/main/assets/stickers/food/soup.png b/session/src/main/assets/stickers/food/soup.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/soup.png
rename to session/src/main/assets/stickers/food/soup.png
diff --git a/messenger/src/main/assets/stickers/food/soya.png b/session/src/main/assets/stickers/food/soya.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/soya.png
rename to session/src/main/assets/stickers/food/soya.png
diff --git a/messenger/src/main/assets/stickers/food/steak.png b/session/src/main/assets/stickers/food/steak.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/steak.png
rename to session/src/main/assets/stickers/food/steak.png
diff --git a/messenger/src/main/assets/stickers/food/strawberry.png b/session/src/main/assets/stickers/food/strawberry.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/strawberry.png
rename to session/src/main/assets/stickers/food/strawberry.png
diff --git a/messenger/src/main/assets/stickers/food/sushi.png b/session/src/main/assets/stickers/food/sushi.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/sushi.png
rename to session/src/main/assets/stickers/food/sushi.png
diff --git a/messenger/src/main/assets/stickers/food/taco.png b/session/src/main/assets/stickers/food/taco.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/taco.png
rename to session/src/main/assets/stickers/food/taco.png
diff --git a/messenger/src/main/assets/stickers/food/toaster.png b/session/src/main/assets/stickers/food/toaster.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/toaster.png
rename to session/src/main/assets/stickers/food/toaster.png
diff --git a/messenger/src/main/assets/stickers/food/tomato.png b/session/src/main/assets/stickers/food/tomato.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/tomato.png
rename to session/src/main/assets/stickers/food/tomato.png
diff --git a/messenger/src/main/assets/stickers/food/tuna.png b/session/src/main/assets/stickers/food/tuna.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/tuna.png
rename to session/src/main/assets/stickers/food/tuna.png
diff --git a/messenger/src/main/assets/stickers/food/vinegar.png b/session/src/main/assets/stickers/food/vinegar.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/vinegar.png
rename to session/src/main/assets/stickers/food/vinegar.png
diff --git a/messenger/src/main/assets/stickers/food/watermelon.png b/session/src/main/assets/stickers/food/watermelon.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/watermelon.png
rename to session/src/main/assets/stickers/food/watermelon.png
diff --git a/messenger/src/main/assets/stickers/food/yogurt.png b/session/src/main/assets/stickers/food/yogurt.png
similarity index 100%
rename from messenger/src/main/assets/stickers/food/yogurt.png
rename to session/src/main/assets/stickers/food/yogurt.png
diff --git a/messenger/src/main/assets/stickers/weather/cloud.png b/session/src/main/assets/stickers/weather/cloud.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/cloud.png
rename to session/src/main/assets/stickers/weather/cloud.png
diff --git a/messenger/src/main/assets/stickers/weather/cloudy-1.png b/session/src/main/assets/stickers/weather/cloudy-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/cloudy-1.png
rename to session/src/main/assets/stickers/weather/cloudy-1.png
diff --git a/messenger/src/main/assets/stickers/weather/cloudy-night.png b/session/src/main/assets/stickers/weather/cloudy-night.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/cloudy-night.png
rename to session/src/main/assets/stickers/weather/cloudy-night.png
diff --git a/messenger/src/main/assets/stickers/weather/cloudy.png b/session/src/main/assets/stickers/weather/cloudy.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/cloudy.png
rename to session/src/main/assets/stickers/weather/cloudy.png
diff --git a/messenger/src/main/assets/stickers/weather/eclipse.png b/session/src/main/assets/stickers/weather/eclipse.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/eclipse.png
rename to session/src/main/assets/stickers/weather/eclipse.png
diff --git a/messenger/src/main/assets/stickers/weather/full-moon.png b/session/src/main/assets/stickers/weather/full-moon.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/full-moon.png
rename to session/src/main/assets/stickers/weather/full-moon.png
diff --git a/messenger/src/main/assets/stickers/weather/hail.png b/session/src/main/assets/stickers/weather/hail.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/hail.png
rename to session/src/main/assets/stickers/weather/hail.png
diff --git a/messenger/src/main/assets/stickers/weather/lightning.png b/session/src/main/assets/stickers/weather/lightning.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/lightning.png
rename to session/src/main/assets/stickers/weather/lightning.png
diff --git a/messenger/src/main/assets/stickers/weather/moon-phases-1.png b/session/src/main/assets/stickers/weather/moon-phases-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/moon-phases-1.png
rename to session/src/main/assets/stickers/weather/moon-phases-1.png
diff --git a/messenger/src/main/assets/stickers/weather/moon-phases-2.png b/session/src/main/assets/stickers/weather/moon-phases-2.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/moon-phases-2.png
rename to session/src/main/assets/stickers/weather/moon-phases-2.png
diff --git a/messenger/src/main/assets/stickers/weather/moon-phases-3.png b/session/src/main/assets/stickers/weather/moon-phases-3.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/moon-phases-3.png
rename to session/src/main/assets/stickers/weather/moon-phases-3.png
diff --git a/messenger/src/main/assets/stickers/weather/moon-phases-4.png b/session/src/main/assets/stickers/weather/moon-phases-4.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/moon-phases-4.png
rename to session/src/main/assets/stickers/weather/moon-phases-4.png
diff --git a/messenger/src/main/assets/stickers/weather/moon-phases-5.png b/session/src/main/assets/stickers/weather/moon-phases-5.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/moon-phases-5.png
rename to session/src/main/assets/stickers/weather/moon-phases-5.png
diff --git a/messenger/src/main/assets/stickers/weather/moon-phases.png b/session/src/main/assets/stickers/weather/moon-phases.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/moon-phases.png
rename to session/src/main/assets/stickers/weather/moon-phases.png
diff --git a/messenger/src/main/assets/stickers/weather/planet-earth.png b/session/src/main/assets/stickers/weather/planet-earth.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/planet-earth.png
rename to session/src/main/assets/stickers/weather/planet-earth.png
diff --git a/messenger/src/main/assets/stickers/weather/rain-1.png b/session/src/main/assets/stickers/weather/rain-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/rain-1.png
rename to session/src/main/assets/stickers/weather/rain-1.png
diff --git a/messenger/src/main/assets/stickers/weather/rain.png b/session/src/main/assets/stickers/weather/rain.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/rain.png
rename to session/src/main/assets/stickers/weather/rain.png
diff --git a/messenger/src/main/assets/stickers/weather/raindrop.png b/session/src/main/assets/stickers/weather/raindrop.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/raindrop.png
rename to session/src/main/assets/stickers/weather/raindrop.png
diff --git a/messenger/src/main/assets/stickers/weather/rainy-1.png b/session/src/main/assets/stickers/weather/rainy-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/rainy-1.png
rename to session/src/main/assets/stickers/weather/rainy-1.png
diff --git a/messenger/src/main/assets/stickers/weather/rainy.png b/session/src/main/assets/stickers/weather/rainy.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/rainy.png
rename to session/src/main/assets/stickers/weather/rainy.png
diff --git a/messenger/src/main/assets/stickers/weather/snowflake.png b/session/src/main/assets/stickers/weather/snowflake.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/snowflake.png
rename to session/src/main/assets/stickers/weather/snowflake.png
diff --git a/messenger/src/main/assets/stickers/weather/storm.png b/session/src/main/assets/stickers/weather/storm.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/storm.png
rename to session/src/main/assets/stickers/weather/storm.png
diff --git a/messenger/src/main/assets/stickers/weather/sun.png b/session/src/main/assets/stickers/weather/sun.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/sun.png
rename to session/src/main/assets/stickers/weather/sun.png
diff --git a/messenger/src/main/assets/stickers/weather/temperature-1.png b/session/src/main/assets/stickers/weather/temperature-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/temperature-1.png
rename to session/src/main/assets/stickers/weather/temperature-1.png
diff --git a/messenger/src/main/assets/stickers/weather/temperature.png b/session/src/main/assets/stickers/weather/temperature.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/temperature.png
rename to session/src/main/assets/stickers/weather/temperature.png
diff --git a/messenger/src/main/assets/stickers/weather/thermometer-1.png b/session/src/main/assets/stickers/weather/thermometer-1.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/thermometer-1.png
rename to session/src/main/assets/stickers/weather/thermometer-1.png
diff --git a/messenger/src/main/assets/stickers/weather/thermometer-2.png b/session/src/main/assets/stickers/weather/thermometer-2.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/thermometer-2.png
rename to session/src/main/assets/stickers/weather/thermometer-2.png
diff --git a/messenger/src/main/assets/stickers/weather/thermometer.png b/session/src/main/assets/stickers/weather/thermometer.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/thermometer.png
rename to session/src/main/assets/stickers/weather/thermometer.png
diff --git a/messenger/src/main/assets/stickers/weather/tornado.png b/session/src/main/assets/stickers/weather/tornado.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/tornado.png
rename to session/src/main/assets/stickers/weather/tornado.png
diff --git a/messenger/src/main/assets/stickers/weather/wind.png b/session/src/main/assets/stickers/weather/wind.png
similarity index 100%
rename from messenger/src/main/assets/stickers/weather/wind.png
rename to session/src/main/assets/stickers/weather/wind.png
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/session/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
rename to session/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/session/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java b/session/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/BaseActivity.java b/session/src/main/java/org/thoughtcrime/securesms/BaseActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/BaseActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/BaseActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/BasicIntroFragment.java b/session/src/main/java/org/thoughtcrime/securesms/BasicIntroFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/BasicIntroFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/BasicIntroFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java b/session/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
rename to session/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java b/session/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java
rename to session/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java b/session/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java b/session/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java b/session/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
rename to session/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java b/session/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java b/session/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ConversationListAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/ConversationListAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ConversationListAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/ConversationListAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java b/session/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java b/session/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ConversationListItem.java b/session/src/main/java/org/thoughtcrime/securesms/ConversationListItem.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ConversationListItem.java
rename to session/src/main/java/org/thoughtcrime/securesms/ConversationListItem.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ConversationListItemAction.java b/session/src/main/java/org/thoughtcrime/securesms/ConversationListItemAction.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ConversationListItemAction.java
rename to session/src/main/java/org/thoughtcrime/securesms/ConversationListItemAction.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ConversationListItemInboxZero.java b/session/src/main/java/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
rename to session/src/main/java/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/CountrySelectionActivity.java b/session/src/main/java/org/thoughtcrime/securesms/CountrySelectionActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/CountrySelectionActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/CountrySelectionActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/CountrySelectionFragment.java b/session/src/main/java/org/thoughtcrime/securesms/CountrySelectionFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/CountrySelectionFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/CountrySelectionFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java b/session/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java b/session/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java b/session/src/main/java/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java b/session/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java b/session/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/DeviceLinkFragment.java b/session/src/main/java/org/thoughtcrime/securesms/DeviceLinkFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/DeviceLinkFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/DeviceLinkFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java b/session/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/DeviceListItem.java b/session/src/main/java/org/thoughtcrime/securesms/DeviceListItem.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/DeviceListItem.java
rename to session/src/main/java/org/thoughtcrime/securesms/DeviceListItem.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java b/session/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/DummyActivity.java b/session/src/main/java/org/thoughtcrime/securesms/DummyActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/DummyActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/DummyActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java b/session/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java b/session/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java
rename to session/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java b/session/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java b/session/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java
rename to session/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/IntroPagerAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/IntroPagerAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/IntroPagerAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/IntroPagerAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/InviteActivity.java b/session/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java b/session/src/main/java/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/LogSubmitActivity.java b/session/src/main/java/org/thoughtcrime/securesms/LogSubmitActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/LogSubmitActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/LogSubmitActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/MasterSecretListener.java b/session/src/main/java/org/thoughtcrime/securesms/MasterSecretListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/MasterSecretListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/MasterSecretListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/MediaGalleryAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/MediaGalleryAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/MediaGalleryAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/MediaGalleryAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java b/session/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/session/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java b/session/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/MessageRecipientListItem.java b/session/src/main/java/org/thoughtcrime/securesms/MessageRecipientListItem.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/MessageRecipientListItem.java
rename to session/src/main/java/org/thoughtcrime/securesms/MessageRecipientListItem.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/MuteDialog.java b/session/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
rename to session/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java b/session/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java b/session/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java b/session/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/PassphraseChangeActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/PassphraseCreateActivity.java b/session/src/main/java/org/thoughtcrime/securesms/PassphraseCreateActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/PassphraseCreateActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/PassphraseCreateActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/session/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/session/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/PromptMmsActivity.java b/session/src/main/java/org/thoughtcrime/securesms/PromptMmsActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/PromptMmsActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/PromptMmsActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java b/session/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java b/session/src/main/java/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/session/src/main/java/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java b/session/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ShareActivity.java b/session/src/main/java/org/thoughtcrime/securesms/ShareActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ShareActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/ShareActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java b/session/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java b/session/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/TextSecureExpiredException.java b/session/src/main/java/org/thoughtcrime/securesms/TextSecureExpiredException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/TextSecureExpiredException.java
rename to session/src/main/java/org/thoughtcrime/securesms/TextSecureExpiredException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/TransportOption.java b/session/src/main/java/org/thoughtcrime/securesms/TransportOption.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/TransportOption.java
rename to session/src/main/java/org/thoughtcrime/securesms/TransportOption.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/TransportOptions.java b/session/src/main/java/org/thoughtcrime/securesms/TransportOptions.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/TransportOptions.java
rename to session/src/main/java/org/thoughtcrime/securesms/TransportOptions.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/TransportOptionsAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/TransportOptionsAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/TransportOptionsAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/TransportOptionsAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/TransportOptionsPopup.java b/session/src/main/java/org/thoughtcrime/securesms/TransportOptionsPopup.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/TransportOptionsPopup.java
rename to session/src/main/java/org/thoughtcrime/securesms/TransportOptionsPopup.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java b/session/src/main/java/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/Unbindable.java b/session/src/main/java/org/thoughtcrime/securesms/Unbindable.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/Unbindable.java
rename to session/src/main/java/org/thoughtcrime/securesms/Unbindable.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/session/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/session/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java b/session/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java b/session/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
rename to session/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.java b/session/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.java
rename to session/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java b/session/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java
rename to session/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java b/session/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
rename to session/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentAudioExtras.kt b/session/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentAudioExtras.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentAudioExtras.kt
rename to session/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentAudioExtras.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java b/session/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
rename to session/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java b/session/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java
rename to session/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java b/session/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java
rename to session/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java b/session/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java
rename to session/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java b/session/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
rename to session/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/session/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
rename to session/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java b/session/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java
rename to session/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java b/session/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java
rename to session/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/backup/BackupEvent.kt b/session/src/main/java/org/thoughtcrime/securesms/backup/BackupEvent.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/backup/BackupEvent.kt
rename to session/src/main/java/org/thoughtcrime/securesms/backup/BackupEvent.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java b/session/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java
rename to session/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/backup/BackupProtos.java b/session/src/main/java/org/thoughtcrime/securesms/backup/BackupProtos.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/backup/BackupProtos.java
rename to session/src/main/java/org/thoughtcrime/securesms/backup/BackupProtos.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt b/session/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt
rename to session/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt b/session/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt
rename to session/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java b/session/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java
rename to session/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/color/MaterialColors.java b/session/src/main/java/org/thoughtcrime/securesms/color/MaterialColors.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/color/MaterialColors.java
rename to session/src/main/java/org/thoughtcrime/securesms/color/MaterialColors.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java b/session/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java b/session/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/AlertView.java b/session/src/main/java/org/thoughtcrime/securesms/components/AlertView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/AlertView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/AlertView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/AnimatingToggle.java b/session/src/main/java/org/thoughtcrime/securesms/components/AnimatingToggle.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/AnimatingToggle.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/AnimatingToggle.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java b/session/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/session/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/BubbleDrawableBuilder.java b/session/src/main/java/org/thoughtcrime/securesms/components/BubbleDrawableBuilder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/BubbleDrawableBuilder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/BubbleDrawableBuilder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/CircleColorImageView.java b/session/src/main/java/org/thoughtcrime/securesms/components/CircleColorImageView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/CircleColorImageView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/CircleColorImageView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java b/session/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ContactFilterToolbar.java b/session/src/main/java/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ControllableTabLayout.java b/session/src/main/java/org/thoughtcrime/securesms/components/ControllableTabLayout.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ControllableTabLayout.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ControllableTabLayout.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ControllableViewPager.java b/session/src/main/java/org/thoughtcrime/securesms/components/ControllableViewPager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ControllableViewPager.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ControllableViewPager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/session/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/session/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java b/session/src/main/java/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java b/session/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java b/session/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/session/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java b/session/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java b/session/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java b/session/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/session/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java b/session/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java b/session/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java b/session/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/HourglassView.java b/session/src/main/java/org/thoughtcrime/securesms/components/HourglassView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/HourglassView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/HourglassView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java b/session/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java b/session/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/session/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/session/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/LabeledEditText.java b/session/src/main/java/org/thoughtcrime/securesms/components/LabeledEditText.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/LabeledEditText.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/LabeledEditText.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java b/session/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/MaxHeightScrollView.java b/session/src/main/java/org/thoughtcrime/securesms/components/MaxHeightScrollView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/MaxHeightScrollView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/MaxHeightScrollView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/MediaView.java b/session/src/main/java/org/thoughtcrime/securesms/components/MediaView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/MediaView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/MediaView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java b/session/src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java b/session/src/main/java/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/Outliner.java b/session/src/main/java/org/thoughtcrime/securesms/components/Outliner.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/Outliner.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/Outliner.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/PushRecipientsPanel.java b/session/src/main/java/org/thoughtcrime/securesms/components/PushRecipientsPanel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/PushRecipientsPanel.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/PushRecipientsPanel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/session/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java b/session/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java b/session/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java b/session/src/main/java/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java b/session/src/main/java/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java b/session/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java b/session/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/SendButton.java b/session/src/main/java/org/thoughtcrime/securesms/components/SendButton.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/SendButton.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/SendButton.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ShapeScrim.java b/session/src/main/java/org/thoughtcrime/securesms/components/ShapeScrim.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ShapeScrim.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ShapeScrim.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java b/session/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/SquareFrameLayout.java b/session/src/main/java/org/thoughtcrime/securesms/components/SquareFrameLayout.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/SquareFrameLayout.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/SquareFrameLayout.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/SquareImageView.java b/session/src/main/java/org/thoughtcrime/securesms/components/SquareImageView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/SquareImageView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/SquareImageView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/SquareLinearLayout.java b/session/src/main/java/org/thoughtcrime/securesms/components/SquareLinearLayout.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/SquareLinearLayout.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/SquareLinearLayout.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/StickerView.java b/session/src/main/java/org/thoughtcrime/securesms/components/StickerView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/StickerView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/StickerView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java b/session/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java b/session/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/session/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java b/session/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/TransferControlView.java b/session/src/main/java/org/thoughtcrime/securesms/components/TransferControlView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/TransferControlView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/TransferControlView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/TypingIndicatorView.java b/session/src/main/java/org/thoughtcrime/securesms/components/TypingIndicatorView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/TypingIndicatorView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/TypingIndicatorView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java b/session/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java b/session/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java b/session/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java b/session/src/main/java/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java b/session/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java b/session/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/Emoji.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/Emoji.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/Emoji.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/Emoji.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick.java b/session/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java b/session/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java b/session/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java b/session/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/location/SignalMapView.java b/session/src/main/java/org/thoughtcrime/securesms/components/location/SignalMapView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/location/SignalMapView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/location/SignalMapView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java b/session/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java b/session/src/main/java/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java b/session/src/main/java/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java b/session/src/main/java/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java b/session/src/main/java/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java b/session/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java b/session/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/InviteReminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/Reminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/Reminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/Reminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/Reminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/ShareReminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/ShareReminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/ShareReminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/ShareReminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java b/session/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentBitmapDecoder.java b/session/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentBitmapDecoder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentBitmapDecoder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentBitmapDecoder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java b/session/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java b/session/src/main/java/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java b/session/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java b/session/src/main/java/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java b/session/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java b/session/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java b/session/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
rename to session/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/ArrayListCursor.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/ArrayListCursor.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/ArrayListCursor.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/ArrayListCursor.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManager.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManagerICS.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManagerICS.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManagerICS.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/ContactIdentityManagerICS.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/ContactsDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/NameAndNumber.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/NameAndNumber.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/NameAndNumber.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/NameAndNumber.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsEditor.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsEditor.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsEditor.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/RecipientsEditor.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java b/session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java
rename to session/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactRepository.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactRepository.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactRepository.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactRepository.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/Selectable.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/Selectable.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/Selectable.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/Selectable.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/contactshare/SimpleTextWatcher.java b/session/src/main/java/org/thoughtcrime/securesms/contactshare/SimpleTextWatcher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/contactshare/SimpleTextWatcher.java
rename to session/src/main/java/org/thoughtcrime/securesms/contactshare/SimpleTextWatcher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
rename to session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java b/session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
rename to session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
rename to session/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/AsymmetricMasterSecret.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecret.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecret.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecret.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecret.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecret.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecret.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecret.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecret.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/InvalidPassphraseException.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/InvalidPassphraseException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/InvalidPassphraseException.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/InvalidPassphraseException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecret.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecret.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecret.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecret.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/SecurityEvent.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/SecurityEvent.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/SecurityEvent.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/SecurityEvent.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/SessionUtil.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/SessionUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/SessionUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/SessionUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/session/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
rename to session/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/Address.java b/session/src/main/java/org/thoughtcrime/securesms/database/Address.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/Address.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/Address.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/ApnDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/ApnDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/ApnDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/ApnDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/ContentValuesBuilder.java b/session/src/main/java/org/thoughtcrime/securesms/database/ContentValuesBuilder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/ContentValuesBuilder.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/ContentValuesBuilder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/CursorList.java b/session/src/main/java/org/thoughtcrime/securesms/database/CursorList.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/CursorList.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/CursorList.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/Database.java b/session/src/main/java/org/thoughtcrime/securesms/database/Database.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/Database.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/Database.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/DatabaseContentProviders.java b/session/src/main/java/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java b/session/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/DraftDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/DraftDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/DraftDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/DraftDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java b/session/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java b/session/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/NoExternalStorageException.java b/session/src/main/java/org/thoughtcrime/securesms/database/NoExternalStorageException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/NoExternalStorageException.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/NoExternalStorageException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/NoSuchMessageException.java b/session/src/main/java/org/thoughtcrime/securesms/database/NoSuchMessageException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/NoSuchMessageException.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/NoSuchMessageException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/NotInDirectoryException.java b/session/src/main/java/org/thoughtcrime/securesms/database/NotInDirectoryException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/NotInDirectoryException.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/NotInDirectoryException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/ObservableContent.java b/session/src/main/java/org/thoughtcrime/securesms/database/ObservableContent.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/ObservableContent.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/ObservableContent.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java b/session/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/StickerDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/StickerDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/StickerDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/StickerDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/session/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/XmlBackup.java b/session/src/main/java/org/thoughtcrime/securesms/database/XmlBackup.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/XmlBackup.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/XmlBackup.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/documents/Document.java b/session/src/main/java/org/thoughtcrime/securesms/database/documents/Document.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/documents/Document.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/documents/Document.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java b/session/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatchList.java b/session/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatchList.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatchList.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatchList.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java b/session/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailureList.java b/session/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailureList.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailureList.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailureList.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java b/session/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java b/session/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java b/session/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/session/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java b/session/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java b/session/src/main/java/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/identity/IdentityRecordList.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/BlockedContactsLoader.java b/session/src/main/java/org/thoughtcrime/securesms/database/loaders/BlockedContactsLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/BlockedContactsLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/loaders/BlockedContactsLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java b/session/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java b/session/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java b/session/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java b/session/src/main/java/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java b/session/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/MessageDetailsLoader.java b/session/src/main/java/org/thoughtcrime/securesms/database/loaders/MessageDetailsLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/MessageDetailsLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/loaders/MessageDetailsLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java b/session/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java b/session/src/main/java/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java b/session/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/IncomingSticker.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/IncomingSticker.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/IncomingSticker.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/IncomingSticker.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/Quote.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/Quote.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/Quote.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/Quote.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/Sticker.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/Sticker.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/Sticker.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/Sticker.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/StickerPackRecord.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/StickerPackRecord.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/StickerPackRecord.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/StickerPackRecord.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/StickerRecord.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/StickerRecord.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/StickerRecord.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/StickerRecord.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/session/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
rename to session/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/dependencies/AxolotlStorageModule.java b/session/src/main/java/org/thoughtcrime/securesms/dependencies/AxolotlStorageModule.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/dependencies/AxolotlStorageModule.java
rename to session/src/main/java/org/thoughtcrime/securesms/dependencies/AxolotlStorageModule.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/dependencies/InjectableType.java b/session/src/main/java/org/thoughtcrime/securesms/dependencies/InjectableType.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/dependencies/InjectableType.java
rename to session/src/main/java/org/thoughtcrime/securesms/dependencies/InjectableType.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java b/session/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
rename to session/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/devicelist/Device.java b/session/src/main/java/org/thoughtcrime/securesms/devicelist/Device.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/devicelist/Device.java
rename to session/src/main/java/org/thoughtcrime/securesms/devicelist/Device.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/devicelist/DeviceNameProtos.java b/session/src/main/java/org/thoughtcrime/securesms/devicelist/DeviceNameProtos.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/devicelist/DeviceNameProtos.java
rename to session/src/main/java/org/thoughtcrime/securesms/devicelist/DeviceNameProtos.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/events/PartProgressEvent.java b/session/src/main/java/org/thoughtcrime/securesms/events/PartProgressEvent.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/events/PartProgressEvent.java
rename to session/src/main/java/org/thoughtcrime/securesms/events/PartProgressEvent.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/events/RedPhoneEvent.java b/session/src/main/java/org/thoughtcrime/securesms/events/RedPhoneEvent.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/events/RedPhoneEvent.java
rename to session/src/main/java/org/thoughtcrime/securesms/events/RedPhoneEvent.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/events/ReminderUpdateEvent.java b/session/src/main/java/org/thoughtcrime/securesms/events/ReminderUpdateEvent.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/events/ReminderUpdateEvent.java
rename to session/src/main/java/org/thoughtcrime/securesms/events/ReminderUpdateEvent.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java b/session/src/main/java/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyImage.java b/session/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyImage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyImage.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyImage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyResponse.java b/session/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyResponse.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyResponse.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/model/GiphyResponse.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java b/session/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java b/session/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java b/session/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java b/session/src/main/java/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java b/session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbarTextSecurePreferencesPersistence.java b/session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbarTextSecurePreferencesPersistence.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbarTextSecurePreferencesPersistence.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbarTextSecurePreferencesPersistence.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java b/session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java b/session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java b/session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java b/session/src/main/java/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java b/session/src/main/java/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java
rename to session/src/main/java/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java b/session/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java b/session/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java b/session/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java b/session/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java b/session/src/main/java/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java b/session/src/main/java/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java b/session/src/main/java/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java b/session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java b/session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java b/session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java b/session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java b/session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java b/session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java
rename to session/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java b/session/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java b/session/src/main/java/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
rename to session/src/main/java/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/Bounds.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/Bounds.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/Bounds.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/Bounds.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/DrawingSession.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/EditSession.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/EditSession.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/EditSession.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/EditSession.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/Renderer.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/Renderer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/Renderer.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/Renderer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/RendererContext.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/RendererContext.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/RendererContext.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/RendererContext.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/UndoRedoStackListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/Bisect.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/Bisect.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/Bisect.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/Bisect.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ThumbRenderer.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ThumbRenderer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ThumbRenderer.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/ThumbRenderer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java b/session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java
rename to session/src/main/java/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/Constraint.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/Constraint.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/Constraint.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/Constraint.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/Data.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/Data.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/Data.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/Data.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/DependencyInjector.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/DependencyInjector.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/DependencyInjector.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/DependencyInjector.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobLogger.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobLogger.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobLogger.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobLogger.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/Scheduler.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/Scheduler.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/Scheduler.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/Scheduler.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java b/session/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java b/session/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
rename to session/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/linkpreview/Link.java b/session/src/main/java/org/thoughtcrime/securesms/linkpreview/Link.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/linkpreview/Link.java
rename to session/src/main/java/org/thoughtcrime/securesms/linkpreview/Link.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreview.java b/session/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreview.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreview.java
rename to session/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreview.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/session/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
rename to session/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java b/session/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java b/session/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
rename to session/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java b/session/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java
rename to session/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java b/session/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java
rename to session/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java b/session/src/main/java/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java
rename to session/src/main/java/org/thoughtcrime/securesms/logging/CustomSignalProtocolLogger.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logging/GrowingBuffer.java b/session/src/main/java/org/thoughtcrime/securesms/logging/GrowingBuffer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logging/GrowingBuffer.java
rename to session/src/main/java/org/thoughtcrime/securesms/logging/GrowingBuffer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logging/Log.java b/session/src/main/java/org/thoughtcrime/securesms/logging/Log.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logging/Log.java
rename to session/src/main/java/org/thoughtcrime/securesms/logging/Log.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logging/LogFile.java b/session/src/main/java/org/thoughtcrime/securesms/logging/LogFile.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logging/LogFile.java
rename to session/src/main/java/org/thoughtcrime/securesms/logging/LogFile.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logging/LogSecretProvider.java b/session/src/main/java/org/thoughtcrime/securesms/logging/LogSecretProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logging/LogSecretProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/logging/LogSecretProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java b/session/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java
rename to session/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java b/session/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java
rename to session/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java b/session/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java b/session/src/main/java/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java
rename to session/src/main/java/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/ChatSettingsActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/ChatSettingsActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/ChatSettingsActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/ChatSettingsActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/DisplayNameActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/DisplayNameActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/DisplayNameActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/DisplayNameActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeLoader.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeLoader.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeLoader.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeLoader.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesLoader.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesLoader.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesLoader.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkedDevicesLoader.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/NotificationSettingsActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/NotificationSettingsActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/NotificationSettingsActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/NotificationSettingsActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/PrivacySettingsActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/PrivacySettingsActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/PrivacySettingsActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/PrivacySettingsActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/RestoreActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/RestoreActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/RestoreActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/RestoreActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/api/ClosedGroupPoller.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/api/ClosedGroupPoller.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/api/ClosedGroupPoller.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/api/ClosedGroupPoller.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/api/ResetThreadSessionJob.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/api/ResetThreadSessionJob.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/api/ResetThreadSessionJob.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/api/ResetThreadSessionJob.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/database/BackupFileRecord.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/database/BackupFileRecord.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/database/BackupFileRecord.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/database/BackupFileRecord.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiBackupFilesDatabase.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiBackupFilesDatabase.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiBackupFilesDatabase.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiBackupFilesDatabase.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiPreKeyBundleDatabase.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiPreKeyBundleDatabase.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiPreKeyBundleDatabase.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiPreKeyBundleDatabase.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiPreKeyRecordDatabase.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiPreKeyRecordDatabase.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiPreKeyRecordDatabase.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiPreKeyRecordDatabase.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabaseDelegate.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabaseDelegate.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabaseDelegate.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabaseDelegate.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/database/SharedSenderKeysDatabase.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/database/SharedSenderKeysDatabase.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/database/SharedSenderKeysDatabase.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/database/SharedSenderKeysDatabase.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LightThemeFeatureIntroBottomSheet.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LightThemeFeatureIntroBottomSheet.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LightThemeFeatureIntroBottomSheet.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LightThemeFeatureIntroBottomSheet.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJob.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJob.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJob.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJob.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/NullMessageSendJob.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/protocol/NullMessageSendJob.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/NullMessageSendJob.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/protocol/NullMessageSendJob.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionRequestMessageSendJob.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionRequestMessageSendJob.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionRequestMessageSendJob.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionRequestMessageSendJob.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionResetImplementation.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionResetImplementation.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionResetImplementation.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionResetImplementation.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceOpenGroupUpdateJob.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceOpenGroupUpdateJob.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceOpenGroupUpdateJob.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceOpenGroupUpdateJob.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceProtocol.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceProtocol.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceProtocol.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/MultiDeviceProtocol.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/SyncMessagesProtocol.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/SyncMessagesProtocol.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/SyncMessagesProtocol.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/protocol/shelved/SyncMessagesProtocol.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/KeyPairUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/KeyPairUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/KeyPairUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/KeyPairUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/MnemonicUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/MnemonicUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/MnemonicUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/MnemonicUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/NotificationUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/NotificationUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/NotificationUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/NotificationUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/PointFUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/PointFUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/PointFUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/PointFUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/ProfilePictureModifiedEvent.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/ProfilePictureModifiedEvent.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/ProfilePictureModifiedEvent.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/ProfilePictureModifiedEvent.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/PromiseUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/PromiseUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/PromiseUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/PromiseUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/QRCodeUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/QRCodeUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/QRCodeUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/QRCodeUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/RecipientUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/RecipientUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/RecipientUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/RecipientUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/UiModeUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/UiModeUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/UiModeUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/UiModeUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewGroupUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewGroupUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewGroupUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewGroupUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/audio/DecodedAudio.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/utilities/audio/DecodedAudio.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/utilities/audio/DecodedAudio.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/utilities/audio/DecodedAudio.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/ConversationView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/ConversationView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/ConversationView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/ConversationView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/DeviceView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/DeviceView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/DeviceView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/DeviceView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/FakeChatView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/GlowView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/GlowView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/GlowView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/GlowView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/PathStatusView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/SessionRestoreBannerView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/SessionRestoreBannerView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/SessionRestoreBannerView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/SessionRestoreBannerView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/TapJacking.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/TapJacking.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/TapJacking.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/TapJacking.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt b/session/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt
rename to session/src/main/java/org/thoughtcrime/securesms/loki/views/WaveformSeekBar.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessage.java b/session/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/session/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java b/session/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
rename to session/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/FlipTransformation.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/FlipTransformation.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/FlipTransformation.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/FlipTransformation.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaFolder.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaFolder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaFolder.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaFolder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mediasend/SimpleAnimationListener.java b/session/src/main/java/org/thoughtcrime/securesms/mediasend/SimpleAnimationListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mediasend/SimpleAnimationListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/mediasend/SimpleAnimationListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/ApnUnavailableException.java b/session/src/main/java/org/thoughtcrime/securesms/mms/ApnUnavailableException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/ApnUnavailableException.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/ApnUnavailableException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/session/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/session/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java b/session/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java b/session/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/CompatMmsConnection.java b/session/src/main/java/org/thoughtcrime/securesms/mms/CompatMmsConnection.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/CompatMmsConnection.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/CompatMmsConnection.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java b/session/src/main/java/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java b/session/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java b/session/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java b/session/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/GifSlide.java b/session/src/main/java/org/thoughtcrime/securesms/mms/GifSlide.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/GifSlide.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/GifSlide.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java b/session/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java b/session/src/main/java/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java b/session/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java b/session/src/main/java/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java b/session/src/main/java/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java b/session/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/LocationSlide.java b/session/src/main/java/org/thoughtcrime/securesms/mms/LocationSlide.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/LocationSlide.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/LocationSlide.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java b/session/src/main/java/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MediaNotFoundException.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MediaNotFoundException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MediaNotFoundException.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MediaNotFoundException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MediaStream.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MediaStream.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MediaStream.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MediaStream.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MediaTooLargeException.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MediaTooLargeException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MediaTooLargeException.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MediaTooLargeException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsConfigManager.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MmsConfigManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsConfigManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MmsConfigManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsException.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MmsException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsException.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MmsException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsMediaConstraints.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MmsMediaConstraints.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsMediaConstraints.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MmsMediaConstraints.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsRadio.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MmsRadio.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsRadio.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MmsRadio.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsRadioException.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MmsRadioException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsRadioException.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MmsRadioException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsSendResult.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MmsSendResult.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsSendResult.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MmsSendResult.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java b/session/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/MmsSlide.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java b/session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java b/session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java b/session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java b/session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java b/session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java b/session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java b/session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java b/session/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/PartAuthority.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/PartParser.java b/session/src/main/java/org/thoughtcrime/securesms/mms/PartParser.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/PartParser.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/PartParser.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/PartUriParser.java b/session/src/main/java/org/thoughtcrime/securesms/mms/PartUriParser.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/PartUriParser.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/PartUriParser.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java b/session/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java b/session/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.java b/session/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/QuoteModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java b/session/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/Slide.java b/session/src/main/java/org/thoughtcrime/securesms/mms/Slide.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/Slide.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/Slide.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/SlideClickListener.java b/session/src/main/java/org/thoughtcrime/securesms/mms/SlideClickListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/SlideClickListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/SlideClickListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java b/session/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/SlidesClickedListener.java b/session/src/main/java/org/thoughtcrime/securesms/mms/SlidesClickedListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/SlidesClickedListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/SlidesClickedListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/StickerSlide.java b/session/src/main/java/org/thoughtcrime/securesms/mms/StickerSlide.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/StickerSlide.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/StickerSlide.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java b/session/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/TextSlide.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/TextTransport.java b/session/src/main/java/org/thoughtcrime/securesms/mms/TextTransport.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/TextTransport.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/TextTransport.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java b/session/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java
rename to session/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java b/session/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java
rename to session/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/session/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java
rename to session/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/net/CompositeRequestController.java b/session/src/main/java/org/thoughtcrime/securesms/net/CompositeRequestController.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/net/CompositeRequestController.java
rename to session/src/main/java/org/thoughtcrime/securesms/net/CompositeRequestController.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java b/session/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java
rename to session/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java b/session/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java
rename to session/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/net/RequestController.java b/session/src/main/java/org/thoughtcrime/securesms/net/RequestController.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/net/RequestController.java
rename to session/src/main/java/org/thoughtcrime/securesms/net/RequestController.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/LocaleChangedReceiver.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/LocaleChangedReceiver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/LocaleChangedReceiver.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/LocaleChangedReceiver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/NotificationItem.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/NotificationItem.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/NotificationItem.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/NotificationItem.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/ReplyMethod.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/ReplyMethod.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/ReplyMethod.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/ReplyMethod.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/session/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
rename to session/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java b/session/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
rename to session/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/permissions/PermissionsRequest.java b/session/src/main/java/org/thoughtcrime/securesms/permissions/PermissionsRequest.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/permissions/PermissionsRequest.java
rename to session/src/main/java/org/thoughtcrime/securesms/permissions/PermissionsRequest.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/session/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
rename to session/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java b/session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java
rename to session/src/main/java/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java b/session/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java
rename to session/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java b/session/src/main/java/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java
rename to session/src/main/java/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java b/session/src/main/java/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java
rename to session/src/main/java/org/thoughtcrime/securesms/profiles/ProfileMediaConstraints.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java b/session/src/main/java/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/profiles/UnknownSenderView.java b/session/src/main/java/org/thoughtcrime/securesms/profiles/UnknownSenderView.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/profiles/UnknownSenderView.java
rename to session/src/main/java/org/thoughtcrime/securesms/profiles/UnknownSenderView.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java b/session/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java b/session/src/main/java/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/providers/MmsBodyProvider.java b/session/src/main/java/org/thoughtcrime/securesms/providers/MmsBodyProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/providers/MmsBodyProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/providers/MmsBodyProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java b/session/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java b/session/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
rename to session/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/push/DomainFrontingTrustStore.java b/session/src/main/java/org/thoughtcrime/securesms/push/DomainFrontingTrustStore.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/push/DomainFrontingTrustStore.java
rename to session/src/main/java/org/thoughtcrime/securesms/push/DomainFrontingTrustStore.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/push/IasTrustStore.java b/session/src/main/java/org/thoughtcrime/securesms/push/IasTrustStore.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/push/IasTrustStore.java
rename to session/src/main/java/org/thoughtcrime/securesms/push/IasTrustStore.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/push/MessageSenderEventListener.java b/session/src/main/java/org/thoughtcrime/securesms/push/MessageSenderEventListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/push/MessageSenderEventListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/push/MessageSenderEventListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java b/session/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java
rename to session/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/push/SignalServiceTrustStore.java b/session/src/main/java/org/thoughtcrime/securesms/push/SignalServiceTrustStore.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/push/SignalServiceTrustStore.java
rename to session/src/main/java/org/thoughtcrime/securesms/push/SignalServiceTrustStore.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/qr/QrCode.java b/session/src/main/java/org/thoughtcrime/securesms/qr/QrCode.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/qr/QrCode.java
rename to session/src/main/java/org/thoughtcrime/securesms/qr/QrCode.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/qr/ScanListener.java b/session/src/main/java/org/thoughtcrime/securesms/qr/ScanListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/qr/ScanListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/qr/ScanListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java b/session/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java
rename to session/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/session/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
rename to session/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/recipients/RecipientExporter.java b/session/src/main/java/org/thoughtcrime/securesms/recipients/RecipientExporter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/recipients/RecipientExporter.java
rename to session/src/main/java/org/thoughtcrime/securesms/recipients/RecipientExporter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/recipients/RecipientFormattingException.java b/session/src/main/java/org/thoughtcrime/securesms/recipients/RecipientFormattingException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/recipients/RecipientFormattingException.java
rename to session/src/main/java/org/thoughtcrime/securesms/recipients/RecipientFormattingException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java b/session/src/main/java/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/recipients/RecipientModifiedListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/recipients/RecipientProvider.java b/session/src/main/java/org/thoughtcrime/securesms/recipients/RecipientProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/recipients/RecipientProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/recipients/RecipientProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/recipients/RecipientsFormatter.java b/session/src/main/java/org/thoughtcrime/securesms/recipients/RecipientsFormatter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/recipients/RecipientsFormatter.java
rename to session/src/main/java/org/thoughtcrime/securesms/recipients/RecipientsFormatter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/registration/CaptchaActivity.java b/session/src/main/java/org/thoughtcrime/securesms/registration/CaptchaActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/registration/CaptchaActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/registration/CaptchaActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/registration/WelcomeActivity.java b/session/src/main/java/org/thoughtcrime/securesms/registration/WelcomeActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/registration/WelcomeActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/registration/WelcomeActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/session/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java b/session/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
rename to session/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java b/session/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java b/session/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java b/session/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java b/session/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
rename to session/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/scribbles/widget/VerticalSlideColorPicker.java b/session/src/main/java/org/thoughtcrime/securesms/scribbles/widget/VerticalSlideColorPicker.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/scribbles/widget/VerticalSlideColorPicker.java
rename to session/src/main/java/org/thoughtcrime/securesms/scribbles/widget/VerticalSlideColorPicker.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java b/session/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/search/SearchListAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/search/SearchListAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/search/SearchListAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/search/SearchListAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/session/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
rename to session/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/search/SearchViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/search/SearchViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/search/SearchViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/search/SearchViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/search/model/MessageResult.java b/session/src/main/java/org/thoughtcrime/securesms/search/model/MessageResult.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/search/model/MessageResult.java
rename to session/src/main/java/org/thoughtcrime/securesms/search/model/MessageResult.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/search/model/SearchResult.java b/session/src/main/java/org/thoughtcrime/securesms/search/model/SearchResult.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/search/model/SearchResult.java
rename to session/src/main/java/org/thoughtcrime/securesms/search/model/SearchResult.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/AccountVerificationTimeoutException.java b/session/src/main/java/org/thoughtcrime/securesms/service/AccountVerificationTimeoutException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/AccountVerificationTimeoutException.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/AccountVerificationTimeoutException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/session/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java b/session/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java b/session/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/session/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java b/session/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/IncomingMessageObserver.java b/session/src/main/java/org/thoughtcrime/securesms/service/IncomingMessageObserver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/IncomingMessageObserver.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/IncomingMessageObserver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/session/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/MmsListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/MmsListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/MmsListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/MmsListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/PanicResponderListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/PanicResponderListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/PanicResponderListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/PanicResponderListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java b/session/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/SmsListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/SmsListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/SmsListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/SmsListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java b/session/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/VerificationCodeParser.java b/session/src/main/java/org/thoughtcrime/securesms/service/VerificationCodeParser.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/VerificationCodeParser.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/VerificationCodeParser.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java b/session/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
rename to session/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingEncryptedMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/IncomingEncryptedMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingEncryptedMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/IncomingEncryptedMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingEndSessionMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/IncomingEndSessionMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingEndSessionMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/IncomingEndSessionMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityDefaultMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityDefaultMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityDefaultMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityDefaultMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityUpdateMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityUpdateMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityUpdateMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityUpdateMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityVerifiedMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityVerifiedMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityVerifiedMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/IncomingIdentityVerifiedMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingJoinedMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/IncomingJoinedMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingJoinedMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/IncomingJoinedMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingPreKeyBundleMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/IncomingPreKeyBundleMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingPreKeyBundleMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/IncomingPreKeyBundleMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/session/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEncryptedMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEncryptedMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEncryptedMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEncryptedMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEndSessionMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEndSessionMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEndSessionMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingEndSessionMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityDefaultMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingIdentityVerifiedMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingKeyExchangeMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingKeyExchangeMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingKeyExchangeMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingKeyExchangeMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingPrekeyBundleMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingPrekeyBundleMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingPrekeyBundleMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingPrekeyBundleMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java b/session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/sms/TelephonyServiceState.java b/session/src/main/java/org/thoughtcrime/securesms/sms/TelephonyServiceState.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/sms/TelephonyServiceState.java
rename to session/src/main/java/org/thoughtcrime/securesms/sms/TelephonyServiceState.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/BlessedPacks.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/BlessedPacks.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/BlessedPacks.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/BlessedPacks.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerLocator.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerLocator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerLocator.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerLocator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerManifest.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerManifest.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerManifest.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerManifest.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerUrl.java b/session/src/main/java/org/thoughtcrime/securesms/stickers/StickerUrl.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/stickers/StickerUrl.java
rename to session/src/main/java/org/thoughtcrime/securesms/stickers/StickerUrl.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/transport/InsecureFallbackApprovalException.java b/session/src/main/java/org/thoughtcrime/securesms/transport/InsecureFallbackApprovalException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/transport/InsecureFallbackApprovalException.java
rename to session/src/main/java/org/thoughtcrime/securesms/transport/InsecureFallbackApprovalException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/transport/RetryLaterException.java b/session/src/main/java/org/thoughtcrime/securesms/transport/RetryLaterException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/transport/RetryLaterException.java
rename to session/src/main/java/org/thoughtcrime/securesms/transport/RetryLaterException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java b/session/src/main/java/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java
rename to session/src/main/java/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java b/session/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/AsyncLoader.java b/session/src/main/java/org/thoughtcrime/securesms/util/AsyncLoader.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/AsyncLoader.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/AsyncLoader.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt b/session/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt
rename to session/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/BackupUtilOld.java b/session/src/main/java/org/thoughtcrime/securesms/util/BackupUtilOld.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/BackupUtilOld.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/BackupUtilOld.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/Base64.java b/session/src/main/java/org/thoughtcrime/securesms/util/Base64.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/Base64.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/Base64.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/BitmapDecodingException.java b/session/src/main/java/org/thoughtcrime/securesms/util/BitmapDecodingException.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/BitmapDecodingException.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/BitmapDecodingException.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/CharacterCalculator.java b/session/src/main/java/org/thoughtcrime/securesms/util/CharacterCalculator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/CharacterCalculator.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/CharacterCalculator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/CloseableLiveData.java b/session/src/main/java/org/thoughtcrime/securesms/util/CloseableLiveData.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/CloseableLiveData.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/CloseableLiveData.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java b/session/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ContextProvider.kt b/session/src/main/java/org/thoughtcrime/securesms/util/ContextProvider.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ContextProvider.kt
rename to session/src/main/java/org/thoughtcrime/securesms/util/ContextProvider.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/Conversions.java b/session/src/main/java/org/thoughtcrime/securesms/util/Conversions.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/Conversions.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/Conversions.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java b/session/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java b/session/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/DelimiterUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/DelimiterUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/DelimiterUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/DelimiterUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java b/session/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/DynamicLanguage.java b/session/src/main/java/org/thoughtcrime/securesms/util/DynamicLanguage.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/DynamicLanguage.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/DynamicLanguage.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java b/session/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java b/session/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ExpirationUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/ExpirationUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ExpirationUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/ExpirationUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ExternalStorageUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/ExternalStorageUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ExternalStorageUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/ExternalStorageUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/FileProviderUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/FileProviderUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/FileProviderUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/FileProviderUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/FileUtils.java b/session/src/main/java/org/thoughtcrime/securesms/util/FileUtils.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/FileUtils.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/FileUtils.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/FutureTaskListener.java b/session/src/main/java/org/thoughtcrime/securesms/util/FutureTaskListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/FutureTaskListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/FutureTaskListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/Hex.java b/session/src/main/java/org/thoughtcrime/securesms/util/Hex.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/Hex.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/Hex.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java b/session/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java b/session/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/LRUCache.java b/session/src/main/java/org/thoughtcrime/securesms/util/LRUCache.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/LRUCache.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/LRUCache.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/LimitedInputStream.java b/session/src/main/java/org/thoughtcrime/securesms/util/LimitedInputStream.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/LimitedInputStream.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/LimitedInputStream.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java b/session/src/main/java/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ListenableFutureTask.java b/session/src/main/java/org/thoughtcrime/securesms/util/ListenableFutureTask.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ListenableFutureTask.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/ListenableFutureTask.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java b/session/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java b/session/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/MathUtils.java b/session/src/main/java/org/thoughtcrime/securesms/util/MathUtils.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/MathUtils.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/MathUtils.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/MmsCharacterCalculator.java b/session/src/main/java/org/thoughtcrime/securesms/util/MmsCharacterCalculator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/MmsCharacterCalculator.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/MmsCharacterCalculator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/NumberUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/NumberUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/NumberUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/NumberUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ObservingLiveData.java b/session/src/main/java/org/thoughtcrime/securesms/util/ObservingLiveData.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ObservingLiveData.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/ObservingLiveData.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ParcelUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/ParcelUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ParcelUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/ParcelUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ParcelableUtil.kt b/session/src/main/java/org/thoughtcrime/securesms/util/ParcelableUtil.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ParcelableUtil.kt
rename to session/src/main/java/org/thoughtcrime/securesms/util/ParcelableUtil.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java b/session/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/PushCharacterCalculator.java b/session/src/main/java/org/thoughtcrime/securesms/util/PushCharacterCalculator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/PushCharacterCalculator.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/PushCharacterCalculator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/RealtimeSleepTimer.java b/session/src/main/java/org/thoughtcrime/securesms/util/RealtimeSleepTimer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/RealtimeSleepTimer.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/RealtimeSleepTimer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/RedPhoneCallTypes.java b/session/src/main/java/org/thoughtcrime/securesms/util/RedPhoneCallTypes.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/RedPhoneCallTypes.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/RedPhoneCallTypes.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/Rfc5724Uri.java b/session/src/main/java/org/thoughtcrime/securesms/util/Rfc5724Uri.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/Rfc5724Uri.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/Rfc5724Uri.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/session/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
rename to session/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java b/session/src/main/java/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java b/session/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java b/session/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/SoftHashMap.java b/session/src/main/java/org/thoughtcrime/securesms/util/SoftHashMap.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/SoftHashMap.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/SoftHashMap.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/StableIdGenerator.java b/session/src/main/java/org/thoughtcrime/securesms/util/StableIdGenerator.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/StableIdGenerator.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/StableIdGenerator.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java b/session/src/main/java/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java b/session/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/TaggedFutureTask.java b/session/src/main/java/org/thoughtcrime/securesms/util/TaggedFutureTask.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/TaggedFutureTask.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/TaggedFutureTask.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/session/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ThreadUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/ThreadUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ThreadUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/ThreadUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/Throttler.java b/session/src/main/java/org/thoughtcrime/securesms/util/Throttler.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/Throttler.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/Throttler.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/Trimmer.java b/session/src/main/java/org/thoughtcrime/securesms/util/Trimmer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/Trimmer.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/Trimmer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/Util.java b/session/src/main/java/org/thoughtcrime/securesms/util/Util.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/Util.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/Util.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/VerifySpan.java b/session/src/main/java/org/thoughtcrime/securesms/util/VerifySpan.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/VerifySpan.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/VerifySpan.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.java b/session/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java b/session/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/WorkerThread.java b/session/src/main/java/org/thoughtcrime/securesms/util/WorkerThread.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/WorkerThread.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/WorkerThread.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/concurrent/AssertedSuccessListener.java b/session/src/main/java/org/thoughtcrime/securesms/util/concurrent/AssertedSuccessListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/concurrent/AssertedSuccessListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/concurrent/AssertedSuccessListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java b/session/src/main/java/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java b/session/src/main/java/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java b/session/src/main/java/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java b/session/src/main/java/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java b/session/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java b/session/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java b/session/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper.java b/session/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java b/session/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java b/session/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java b/session/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java b/session/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java b/session/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java b/session/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java
rename to session/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java b/session/src/main/java/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java
rename to session/src/main/java/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java b/session/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
rename to session/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java b/session/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java
rename to session/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java b/session/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java
rename to session/src/main/java/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/video/exo/PartDataSource.java b/session/src/main/java/org/thoughtcrime/securesms/video/exo/PartDataSource.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/video/exo/PartDataSource.java
rename to session/src/main/java/org/thoughtcrime/securesms/video/exo/PartDataSource.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/CameraState.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/CameraState.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/CameraState.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/CameraState.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/IncomingPstnCallReceiver.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionFactoryOptions.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionFactoryOptions.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionFactoryOptions.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionFactoryOptions.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/UncaughtExceptionHandlerManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/WebRtcDataProtos.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/WebRtcDataProtos.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/WebRtcDataProtos.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/WebRtcDataProtos.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/locks/AccelerometerListener.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/locks/LockManager.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/locks/LockManager.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/locks/LockManager.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/locks/LockManager.java
diff --git a/messenger/src/main/java/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java b/session/src/main/java/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java
similarity index 100%
rename from messenger/src/main/java/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java
rename to session/src/main/java/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java
diff --git a/messenger/src/main/jni/Android.mk b/session/src/main/jni/Android.mk
similarity index 100%
rename from messenger/src/main/jni/Android.mk
rename to session/src/main/jni/Android.mk
diff --git a/messenger/src/main/jni/Application.mk b/session/src/main/jni/Application.mk
similarity index 100%
rename from messenger/src/main/jni/Application.mk
rename to session/src/main/jni/Application.mk
diff --git a/messenger/src/main/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp b/session/src/main/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp
similarity index 100%
rename from messenger/src/main/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp
rename to session/src/main/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp
diff --git a/messenger/src/main/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h b/session/src/main/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h
similarity index 100%
rename from messenger/src/main/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h
rename to session/src/main/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h
diff --git a/messenger/src/main/protobuf/Backups.proto b/session/src/main/protobuf/Backups.proto
similarity index 100%
rename from messenger/src/main/protobuf/Backups.proto
rename to session/src/main/protobuf/Backups.proto
diff --git a/messenger/src/main/protobuf/DeviceName.proto b/session/src/main/protobuf/DeviceName.proto
similarity index 100%
rename from messenger/src/main/protobuf/DeviceName.proto
rename to session/src/main/protobuf/DeviceName.proto
diff --git a/messenger/src/main/protobuf/Makefile b/session/src/main/protobuf/Makefile
similarity index 100%
rename from messenger/src/main/protobuf/Makefile
rename to session/src/main/protobuf/Makefile
diff --git a/messenger/src/main/protobuf/WebRtcData.proto b/session/src/main/protobuf/WebRtcData.proto
similarity index 100%
rename from messenger/src/main/protobuf/WebRtcData.proto
rename to session/src/main/protobuf/WebRtcData.proto
diff --git a/messenger/src/main/res/anim/animation_toggle_in.xml b/session/src/main/res/anim/animation_toggle_in.xml
similarity index 100%
rename from messenger/src/main/res/anim/animation_toggle_in.xml
rename to session/src/main/res/anim/animation_toggle_in.xml
diff --git a/messenger/src/main/res/anim/animation_toggle_out.xml b/session/src/main/res/anim/animation_toggle_out.xml
similarity index 100%
rename from messenger/src/main/res/anim/animation_toggle_out.xml
rename to session/src/main/res/anim/animation_toggle_out.xml
diff --git a/messenger/src/main/res/anim/camera_capture_button_grow.xml b/session/src/main/res/anim/camera_capture_button_grow.xml
similarity index 100%
rename from messenger/src/main/res/anim/camera_capture_button_grow.xml
rename to session/src/main/res/anim/camera_capture_button_grow.xml
diff --git a/messenger/src/main/res/anim/camera_capture_button_shrink.xml b/session/src/main/res/anim/camera_capture_button_shrink.xml
similarity index 100%
rename from messenger/src/main/res/anim/camera_capture_button_shrink.xml
rename to session/src/main/res/anim/camera_capture_button_shrink.xml
diff --git a/messenger/src/main/res/anim/camera_slide_from_bottom.xml b/session/src/main/res/anim/camera_slide_from_bottom.xml
similarity index 100%
rename from messenger/src/main/res/anim/camera_slide_from_bottom.xml
rename to session/src/main/res/anim/camera_slide_from_bottom.xml
diff --git a/messenger/src/main/res/anim/camera_slide_to_bottom.xml b/session/src/main/res/anim/camera_slide_to_bottom.xml
similarity index 100%
rename from messenger/src/main/res/anim/camera_slide_to_bottom.xml
rename to session/src/main/res/anim/camera_slide_to_bottom.xml
diff --git a/messenger/src/main/res/anim/fade_in.xml b/session/src/main/res/anim/fade_in.xml
similarity index 100%
rename from messenger/src/main/res/anim/fade_in.xml
rename to session/src/main/res/anim/fade_in.xml
diff --git a/messenger/src/main/res/anim/fade_out.xml b/session/src/main/res/anim/fade_out.xml
similarity index 100%
rename from messenger/src/main/res/anim/fade_out.xml
rename to session/src/main/res/anim/fade_out.xml
diff --git a/messenger/src/main/res/anim/fade_scale_in.xml b/session/src/main/res/anim/fade_scale_in.xml
similarity index 100%
rename from messenger/src/main/res/anim/fade_scale_in.xml
rename to session/src/main/res/anim/fade_scale_in.xml
diff --git a/messenger/src/main/res/anim/fade_scale_out.xml b/session/src/main/res/anim/fade_scale_out.xml
similarity index 100%
rename from messenger/src/main/res/anim/fade_scale_out.xml
rename to session/src/main/res/anim/fade_scale_out.xml
diff --git a/messenger/src/main/res/anim/slide_from_bottom.xml b/session/src/main/res/anim/slide_from_bottom.xml
similarity index 100%
rename from messenger/src/main/res/anim/slide_from_bottom.xml
rename to session/src/main/res/anim/slide_from_bottom.xml
diff --git a/messenger/src/main/res/anim/slide_from_left.xml b/session/src/main/res/anim/slide_from_left.xml
similarity index 100%
rename from messenger/src/main/res/anim/slide_from_left.xml
rename to session/src/main/res/anim/slide_from_left.xml
diff --git a/messenger/src/main/res/anim/slide_from_right.xml b/session/src/main/res/anim/slide_from_right.xml
similarity index 100%
rename from messenger/src/main/res/anim/slide_from_right.xml
rename to session/src/main/res/anim/slide_from_right.xml
diff --git a/messenger/src/main/res/anim/slide_from_top.xml b/session/src/main/res/anim/slide_from_top.xml
similarity index 100%
rename from messenger/src/main/res/anim/slide_from_top.xml
rename to session/src/main/res/anim/slide_from_top.xml
diff --git a/messenger/src/main/res/anim/slide_to_bottom.xml b/session/src/main/res/anim/slide_to_bottom.xml
similarity index 100%
rename from messenger/src/main/res/anim/slide_to_bottom.xml
rename to session/src/main/res/anim/slide_to_bottom.xml
diff --git a/messenger/src/main/res/anim/slide_to_left.xml b/session/src/main/res/anim/slide_to_left.xml
similarity index 100%
rename from messenger/src/main/res/anim/slide_to_left.xml
rename to session/src/main/res/anim/slide_to_left.xml
diff --git a/messenger/src/main/res/anim/slide_to_right.xml b/session/src/main/res/anim/slide_to_right.xml
similarity index 100%
rename from messenger/src/main/res/anim/slide_to_right.xml
rename to session/src/main/res/anim/slide_to_right.xml
diff --git a/messenger/src/main/res/anim/slide_to_top.xml b/session/src/main/res/anim/slide_to_top.xml
similarity index 100%
rename from messenger/src/main/res/anim/slide_to_top.xml
rename to session/src/main/res/anim/slide_to_top.xml
diff --git a/messenger/src/main/res/anim/stationary.xml b/session/src/main/res/anim/stationary.xml
similarity index 100%
rename from messenger/src/main/res/anim/stationary.xml
rename to session/src/main/res/anim/stationary.xml
diff --git a/messenger/src/main/res/animator/appbar_elevation.xml b/session/src/main/res/animator/appbar_elevation.xml
similarity index 100%
rename from messenger/src/main/res/animator/appbar_elevation.xml
rename to session/src/main/res/animator/appbar_elevation.xml
diff --git a/messenger/src/main/res/animator/bottom_pause_to_play_animation.xml b/session/src/main/res/animator/bottom_pause_to_play_animation.xml
similarity index 100%
rename from messenger/src/main/res/animator/bottom_pause_to_play_animation.xml
rename to session/src/main/res/animator/bottom_pause_to_play_animation.xml
diff --git a/messenger/src/main/res/animator/bottom_play_to_pause_animation.xml b/session/src/main/res/animator/bottom_play_to_pause_animation.xml
similarity index 100%
rename from messenger/src/main/res/animator/bottom_play_to_pause_animation.xml
rename to session/src/main/res/animator/bottom_play_to_pause_animation.xml
diff --git a/messenger/src/main/res/animator/rotate_90_animation.xml b/session/src/main/res/animator/rotate_90_animation.xml
similarity index 100%
rename from messenger/src/main/res/animator/rotate_90_animation.xml
rename to session/src/main/res/animator/rotate_90_animation.xml
diff --git a/messenger/src/main/res/animator/rotate_minus_90_animation.xml b/session/src/main/res/animator/rotate_minus_90_animation.xml
similarity index 100%
rename from messenger/src/main/res/animator/rotate_minus_90_animation.xml
rename to session/src/main/res/animator/rotate_minus_90_animation.xml
diff --git a/messenger/src/main/res/animator/upper_pause_to_play_animation.xml b/session/src/main/res/animator/upper_pause_to_play_animation.xml
similarity index 100%
rename from messenger/src/main/res/animator/upper_pause_to_play_animation.xml
rename to session/src/main/res/animator/upper_pause_to_play_animation.xml
diff --git a/messenger/src/main/res/animator/upper_play_to_pause_animation.xml b/session/src/main/res/animator/upper_play_to_pause_animation.xml
similarity index 100%
rename from messenger/src/main/res/animator/upper_play_to_pause_animation.xml
rename to session/src/main/res/animator/upper_play_to_pause_animation.xml
diff --git a/messenger/src/main/res/color/text_color_dark_theme.xml b/session/src/main/res/color/text_color_dark_theme.xml
similarity index 100%
rename from messenger/src/main/res/color/text_color_dark_theme.xml
rename to session/src/main/res/color/text_color_dark_theme.xml
diff --git a/messenger/src/main/res/color/text_color_secondary_dark_theme.xml b/session/src/main/res/color/text_color_secondary_dark_theme.xml
similarity index 100%
rename from messenger/src/main/res/color/text_color_secondary_dark_theme.xml
rename to session/src/main/res/color/text_color_secondary_dark_theme.xml
diff --git a/messenger/src/main/res/drawable-anydpi-v24/ic_notification.xml b/session/src/main/res/drawable-anydpi-v24/ic_notification.xml
similarity index 100%
rename from messenger/src/main/res/drawable-anydpi-v24/ic_notification.xml
rename to session/src/main/res/drawable-anydpi-v24/ic_notification.xml
diff --git a/messenger/src/main/res/drawable-hdpi/baseline_account_circle_white_24.png b/session/src/main/res/drawable-hdpi/baseline_account_circle_white_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/baseline_account_circle_white_24.png
rename to session/src/main/res/drawable-hdpi/baseline_account_circle_white_24.png
diff --git a/messenger/src/main/res/drawable-hdpi/baseline_email_white_24.png b/session/src/main/res/drawable-hdpi/baseline_email_white_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/baseline_email_white_24.png
rename to session/src/main/res/drawable-hdpi/baseline_email_white_24.png
diff --git a/messenger/src/main/res/drawable-hdpi/check.png b/session/src/main/res/drawable-hdpi/check.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/check.png
rename to session/src/main/res/drawable-hdpi/check.png
diff --git a/messenger/src/main/res/drawable-hdpi/clear_profile_avatar.png b/session/src/main/res/drawable-hdpi/clear_profile_avatar.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/clear_profile_avatar.png
rename to session/src/main/res/drawable-hdpi/clear_profile_avatar.png
diff --git a/messenger/src/main/res/drawable-hdpi/conversation_list_empty_state.png b/session/src/main/res/drawable-hdpi/conversation_list_empty_state.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/conversation_list_empty_state.png
rename to session/src/main/res/drawable-hdpi/conversation_list_empty_state.png
diff --git a/messenger/src/main/res/drawable-hdpi/divet_lower_right_dark.png b/session/src/main/res/drawable-hdpi/divet_lower_right_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/divet_lower_right_dark.png
rename to session/src/main/res/drawable-hdpi/divet_lower_right_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/divet_lower_right_light.png b/session/src/main/res/drawable-hdpi/divet_lower_right_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/divet_lower_right_light.png
rename to session/src/main/res/drawable-hdpi/divet_lower_right_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/empty_inbox_1.png b/session/src/main/res/drawable-hdpi/empty_inbox_1.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/empty_inbox_1.png
rename to session/src/main/res/drawable-hdpi/empty_inbox_1.png
diff --git a/messenger/src/main/res/drawable-hdpi/empty_inbox_2.png b/session/src/main/res/drawable-hdpi/empty_inbox_2.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/empty_inbox_2.png
rename to session/src/main/res/drawable-hdpi/empty_inbox_2.png
diff --git a/messenger/src/main/res/drawable-hdpi/empty_inbox_3.png b/session/src/main/res/drawable-hdpi/empty_inbox_3.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/empty_inbox_3.png
rename to session/src/main/res/drawable-hdpi/empty_inbox_3.png
diff --git a/messenger/src/main/res/drawable-hdpi/empty_inbox_4.png b/session/src/main/res/drawable-hdpi/empty_inbox_4.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/empty_inbox_4.png
rename to session/src/main/res/drawable-hdpi/empty_inbox_4.png
diff --git a/messenger/src/main/res/drawable-hdpi/empty_inbox_5.png b/session/src/main/res/drawable-hdpi/empty_inbox_5.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/empty_inbox_5.png
rename to session/src/main/res/drawable-hdpi/empty_inbox_5.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_account_box_dark.png b/session/src/main/res/drawable-hdpi/ic_account_box_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_account_box_dark.png
rename to session/src/main/res/drawable-hdpi/ic_account_box_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_account_box_light.png b/session/src/main/res/drawable-hdpi/ic_account_box_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_account_box_light.png
rename to session/src/main/res/drawable-hdpi/ic_account_box_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_action_name.png b/session/src/main/res/drawable-hdpi/ic_action_name.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_action_name.png
rename to session/src/main/res/drawable-hdpi/ic_action_name.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_action_warning_red.png b/session/src/main/res/drawable-hdpi/ic_action_warning_red.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_action_warning_red.png
rename to session/src/main/res/drawable-hdpi/ic_action_warning_red.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_add_caption_36.png b/session/src/main/res/drawable-hdpi/ic_add_caption_36.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_add_caption_36.png
rename to session/src/main/res/drawable-hdpi/ic_add_caption_36.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_add_photo.png b/session/src/main/res/drawable-hdpi/ic_add_photo.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_add_photo.png
rename to session/src/main/res/drawable-hdpi/ic_add_photo.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_add_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_add_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_add_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_add_white_original_24dp.png b/session/src/main/res/drawable-hdpi/ic_add_white_original_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_add_white_original_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_add_white_original_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_advanced_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_advanced_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_advanced_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_advanced_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_archive_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_archive_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_archive_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_archive_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_arrow_right.png b/session/src/main/res/drawable-hdpi/ic_arrow_right.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_arrow_right.png
rename to session/src/main/res/drawable-hdpi/ic_arrow_right.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_arrow_up.png b/session/src/main/res/drawable-hdpi/ic_arrow_up.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_arrow_up.png
rename to session/src/main/res/drawable-hdpi/ic_arrow_up.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_attach_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_attach_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_attach_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_attach_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_audio_dark.png b/session/src/main/res/drawable-hdpi/ic_audio_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_audio_dark.png
rename to session/src/main/res/drawable-hdpi/ic_audio_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_audio_light.png b/session/src/main/res/drawable-hdpi/ic_audio_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_audio_light.png
rename to session/src/main/res/drawable-hdpi/ic_audio_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_block_grey600_18dp.png b/session/src/main/res/drawable-hdpi/ic_block_grey600_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_block_grey600_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_block_grey600_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_block_white_18dp.png b/session/src/main/res/drawable-hdpi/ic_block_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_block_white_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_block_white_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_block_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_block_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_block_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_block_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_bluetooth_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_bluetooth_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_bluetooth_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_bluetooth_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_brightness_6_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_brightness_6_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_brightness_6_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_brightness_6_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_broken_link.png b/session/src/main/res/drawable-hdpi/ic_broken_link.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_broken_link.png
rename to session/src/main/res/drawable-hdpi/ic_broken_link.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_brush_highlight_32.png b/session/src/main/res/drawable-hdpi/ic_brush_highlight_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_brush_highlight_32.png
rename to session/src/main/res/drawable-hdpi/ic_brush_highlight_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_brush_marker_32.png b/session/src/main/res/drawable-hdpi/ic_brush_marker_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_brush_marker_32.png
rename to session/src/main/res/drawable-hdpi/ic_brush_marker_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_call_end_grey600_32dp.png b/session/src/main/res/drawable-hdpi/ic_call_end_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_call_end_grey600_32dp.png
rename to session/src/main/res/drawable-hdpi/ic_call_end_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_call_end_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_call_end_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_call_end_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_call_end_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_call_made_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_call_made_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_call_made_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_call_made_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_call_missed_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_call_missed_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_call_missed_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_call_missed_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_call_received_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_call_received_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_call_received_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_call_received_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_call_secure_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_call_secure_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_call_secure_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_call_secure_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_call_split_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_call_split_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_call_split_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_call_split_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_camera_filled_24.png b/session/src/main/res/drawable-hdpi/ic_camera_filled_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_camera_filled_24.png
rename to session/src/main/res/drawable-hdpi/ic_camera_filled_24.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_camera_shutter.png b/session/src/main/res/drawable-hdpi/ic_camera_shutter.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_camera_shutter.png
rename to session/src/main/res/drawable-hdpi/ic_camera_shutter.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_camera_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_camera_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_camera_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_camera_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_caption_28.png b/session/src/main/res/drawable-hdpi/ic_caption_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_caption_28.png
rename to session/src/main/res/drawable-hdpi/ic_caption_28.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_check_circle_32.png b/session/src/main/res/drawable-hdpi/ic_check_circle_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_check_circle_32.png
rename to session/src/main/res/drawable-hdpi/ic_check_circle_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_check_circle_white_18dp.png b/session/src/main/res/drawable-hdpi/ic_check_circle_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_check_circle_white_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_check_circle_white_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_check_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_check_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_check_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_check_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_check_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_check_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_check_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_check_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_circle_fill_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_clear_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_clear_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_clear_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_clear_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_close_grey600_32dp.png b/session/src/main/res/drawable-hdpi/ic_close_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_close_grey600_32dp.png
rename to session/src/main/res/drawable-hdpi/ic_close_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_close_white_18dp.png b/session/src/main/res/drawable-hdpi/ic_close_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_close_white_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_close_white_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_close_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_close_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_close_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_close_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_close_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_close_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_close_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_contact_picture.png b/session/src/main/res/drawable-hdpi/ic_contact_picture.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_contact_picture.png
rename to session/src/main/res/drawable-hdpi/ic_contact_picture.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_contact_picture_large.png b/session/src/main/res/drawable-hdpi/ic_contact_picture_large.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_contact_picture_large.png
rename to session/src/main/res/drawable-hdpi/ic_contact_picture_large.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_contacts_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_contacts_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_contacts_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_contacts_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_create_album_filled_32.png b/session/src/main/res/drawable-hdpi/ic_create_album_filled_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_create_album_filled_32.png
rename to session/src/main/res/drawable-hdpi/ic_create_album_filled_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_create_album_outline_32.png b/session/src/main/res/drawable-hdpi/ic_create_album_outline_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_create_album_outline_32.png
rename to session/src/main/res/drawable-hdpi/ic_create_album_outline_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_create_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_create_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_create_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_create_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_crop_32.png b/session/src/main/res/drawable-hdpi/ic_crop_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_crop_32.png
rename to session/src/main/res/drawable-hdpi/ic_crop_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_crop_lock_32.png b/session/src/main/res/drawable-hdpi/ic_crop_lock_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_crop_lock_32.png
rename to session/src/main/res/drawable-hdpi/ic_crop_lock_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_crop_unlock_32.png b/session/src/main/res/drawable-hdpi/ic_crop_unlock_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_crop_unlock_32.png
rename to session/src/main/res/drawable-hdpi/ic_crop_unlock_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_dashboard_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_dashboard_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_dashboard_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_dashboard_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_delivery_status_delivered.png b/session/src/main/res/drawable-hdpi/ic_delivery_status_delivered.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_delivery_status_delivered.png
rename to session/src/main/res/drawable-hdpi/ic_delivery_status_delivered.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_delivery_status_read.png b/session/src/main/res/drawable-hdpi/ic_delivery_status_read.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_delivery_status_read.png
rename to session/src/main/res/drawable-hdpi/ic_delivery_status_read.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_delivery_status_sending.png b/session/src/main/res/drawable-hdpi/ic_delivery_status_sending.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_delivery_status_sending.png
rename to session/src/main/res/drawable-hdpi/ic_delivery_status_sending.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_delivery_status_sent.png b/session/src/main/res/drawable-hdpi/ic_delivery_status_sent.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_delivery_status_sent.png
rename to session/src/main/res/drawable-hdpi/ic_delivery_status_sent.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_devices_white.png b/session/src/main/res/drawable-hdpi/ic_devices_white.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_devices_white.png
rename to session/src/main/res/drawable-hdpi/ic_devices_white.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_dialpad_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_dialpad_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_dialpad_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_dialpad_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_document_large_dark.png b/session/src/main/res/drawable-hdpi/ic_document_large_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_document_large_dark.png
rename to session/src/main/res/drawable-hdpi/ic_document_large_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_document_large_light.png b/session/src/main/res/drawable-hdpi/ic_document_large_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_document_large_light.png
rename to session/src/main/res/drawable-hdpi/ic_document_large_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_document_small_dark.png b/session/src/main/res/drawable-hdpi/ic_document_small_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_document_small_dark.png
rename to session/src/main/res/drawable-hdpi/ic_document_small_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_document_small_light.png b/session/src/main/res/drawable-hdpi/ic_document_small_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_document_small_light.png
rename to session/src/main/res/drawable-hdpi/ic_document_small_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_download_circle_fill_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_download_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_download_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_download_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_emoji_32.png b/session/src/main/res/drawable-hdpi/ic_emoji_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_emoji_32.png
rename to session/src/main/res/drawable-hdpi/ic_emoji_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_error.png b/session/src/main/res/drawable-hdpi/ic_error.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_error.png
rename to session/src/main/res/drawable-hdpi/ic_error.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_face_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_face_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_face_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_face_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_favorite_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_favorite_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_favorite_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_favorite_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png b/session/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png
rename to session/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_fingerprint_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_fingerprint_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_fingerprint_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_fingerprint_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_flip_32.png b/session/src/main/res/drawable-hdpi/ic_flip_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_flip_32.png
rename to session/src/main/res/drawable-hdpi/ic_flip_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_forum_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_forum_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_forum_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_forum_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_gif_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_gif_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_gif_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_gif_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_group_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_group_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_group_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_group_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_group_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_group_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_group_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_group_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_headset_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_headset_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_headset_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_headset_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_image_dark.png b/session/src/main/res/drawable-hdpi/ic_image_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_image_dark.png
rename to session/src/main/res/drawable-hdpi/ic_image_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_image_light.png b/session/src/main/res/drawable-hdpi/ic_image_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_image_light.png
rename to session/src/main/res/drawable-hdpi/ic_image_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_image_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_image_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_image_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_image_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_info_outline_dark.png b/session/src/main/res/drawable-hdpi/ic_info_outline_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_info_outline_dark.png
rename to session/src/main/res/drawable-hdpi/ic_info_outline_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_info_outline_light.png b/session/src/main/res/drawable-hdpi/ic_info_outline_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_info_outline_light.png
rename to session/src/main/res/drawable-hdpi/ic_info_outline_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_info_white_18dp.png b/session/src/main/res/drawable-hdpi/ic_info_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_info_white_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_info_white_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_insert_drive_file_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_keyboard_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_keyboard_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_keyboard_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_keyboard_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_laptop_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_laptop_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_laptop_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_laptop_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_launch_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_launch_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_launch_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_launch_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_local_dining_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_local_dining_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_local_dining_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_local_dining_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_lock_white_18dp.png b/session/src/main/res/drawable-hdpi/ic_lock_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_lock_white_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_lock_white_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_lock_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_lock_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_lock_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_lock_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_lock_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_lock_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_lock_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_lock_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_menu_add_field_holo_light.png b/session/src/main/res/drawable-hdpi/ic_menu_add_field_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_menu_add_field_holo_light.png
rename to session/src/main/res/drawable-hdpi/ic_menu_add_field_holo_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_menu_lock_dark.png b/session/src/main/res/drawable-hdpi/ic_menu_lock_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_menu_lock_dark.png
rename to session/src/main/res/drawable-hdpi/ic_menu_lock_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_menu_login.png b/session/src/main/res/drawable-hdpi/ic_menu_login.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_menu_login.png
rename to session/src/main/res/drawable-hdpi/ic_menu_login.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_menu_remove_holo_light.png b/session/src/main/res/drawable-hdpi/ic_menu_remove_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_menu_remove_holo_light.png
rename to session/src/main/res/drawable-hdpi/ic_menu_remove_holo_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_menu_search_holo_light.png b/session/src/main/res/drawable-hdpi/ic_menu_search_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_menu_search_holo_light.png
rename to session/src/main/res/drawable-hdpi/ic_menu_search_holo_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_message_black_18dp.png b/session/src/main/res/drawable-hdpi/ic_message_black_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_message_black_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_message_black_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_message_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_message_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_message_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_message_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_mic_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_mic_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_mic_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_mic_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_mic_off_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_mic_off_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_mic_off_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_mic_off_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_mic_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_mic_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_mic_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_mic_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_mic_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_mic_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_mic_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_mic_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_missing_thumbnail_picture.png b/session/src/main/res/drawable-hdpi/ic_missing_thumbnail_picture.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_missing_thumbnail_picture.png
rename to session/src/main/res/drawable-hdpi/ic_missing_thumbnail_picture.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_mood_grey600_24dp.png b/session/src/main/res/drawable-hdpi/ic_mood_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_mood_grey600_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_mood_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_mood_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_mood_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_mood_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_mood_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_movie_creation_dark.png b/session/src/main/res/drawable-hdpi/ic_movie_creation_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_movie_creation_dark.png
rename to session/src/main/res/drawable-hdpi/ic_movie_creation_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_movie_creation_light.png b/session/src/main/res/drawable-hdpi/ic_movie_creation_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_movie_creation_light.png
rename to session/src/main/res/drawable-hdpi/ic_movie_creation_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_note_to_self.png b/session/src/main/res/drawable-hdpi/ic_note_to_self.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_note_to_self.png
rename to session/src/main/res/drawable-hdpi/ic_note_to_self.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_notification.png b/session/src/main/res/drawable-hdpi/ic_notification.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_notification.png
rename to session/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_person_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_person_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_person_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_person_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_pets_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_pets_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_pets_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_pets_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_phone_grey600_32dp.png b/session/src/main/res/drawable-hdpi/ic_phone_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_phone_grey600_32dp.png
rename to session/src/main/res/drawable-hdpi/ic_phone_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_photo_camera_dark.png b/session/src/main/res/drawable-hdpi/ic_photo_camera_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_photo_camera_dark.png
rename to session/src/main/res/drawable-hdpi/ic_photo_camera_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_photo_camera_light.png b/session/src/main/res/drawable-hdpi/ic_photo_camera_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_photo_camera_light.png
rename to session/src/main/res/drawable-hdpi/ic_photo_camera_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_photo_camera_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_photo_camera_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_photo_camera_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_photo_camera_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_photo_library_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_photo_library_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_photo_library_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_photo_library_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_play_circle_fill_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_play_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_play_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_play_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_plus_28.png b/session/src/main/res/drawable-hdpi/ic_plus_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_plus_28.png
rename to session/src/main/res/drawable-hdpi/ic_plus_28.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_profile_camera.png b/session/src/main/res/drawable-hdpi/ic_profile_camera.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_profile_camera.png
rename to session/src/main/res/drawable-hdpi/ic_profile_camera.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_profile_default.png b/session/src/main/res/drawable-hdpi/ic_profile_default.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_profile_default.png
rename to session/src/main/res/drawable-hdpi/ic_profile_default.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_reply.png b/session/src/main/res/drawable-hdpi/ic_reply.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_reply.png
rename to session/src/main/res/drawable-hdpi/ic_reply.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_reply_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_reply_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_reply_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_reply_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_reply_white_36dp.png b/session/src/main/res/drawable-hdpi/ic_reply_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_reply_white_36dp.png
rename to session/src/main/res/drawable-hdpi/ic_reply_white_36dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_restore_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_restore_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_restore_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_restore_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_rotate_32.png b/session/src/main/res/drawable-hdpi/ic_rotate_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_rotate_32.png
rename to session/src/main/res/drawable-hdpi/ic_rotate_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_scribble_save.png b/session/src/main/res/drawable-hdpi/ic_scribble_save.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_scribble_save.png
rename to session/src/main/res/drawable-hdpi/ic_scribble_save.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_scroll_down.png b/session/src/main/res/drawable-hdpi/ic_scroll_down.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_scroll_down.png
rename to session/src/main/res/drawable-hdpi/ic_scroll_down.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_security_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_security_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_security_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_security_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_select_all_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_select_all_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_select_all_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_select_all_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_select_off.png b/session/src/main/res/drawable-hdpi/ic_select_off.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_select_off.png
rename to session/src/main/res/drawable-hdpi/ic_select_off.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_select_on.png b/session/src/main/res/drawable-hdpi/ic_select_on.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_select_on.png
rename to session/src/main/res/drawable-hdpi/ic_select_on.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_send_push.png b/session/src/main/res/drawable-hdpi/ic_send_push.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_send_push.png
rename to session/src/main/res/drawable-hdpi/ic_send_push.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_send_push_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_send_push_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_send_push_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_send_push_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_send_sms_insecure.png b/session/src/main/res/drawable-hdpi/ic_send_sms_insecure.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_send_sms_insecure.png
rename to session/src/main/res/drawable-hdpi/ic_send_sms_insecure.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_send_sms_insecure_dark.png b/session/src/main/res/drawable-hdpi/ic_send_sms_insecure_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_send_sms_insecure_dark.png
rename to session/src/main/res/drawable-hdpi/ic_send_sms_insecure_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_send_sms_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_send_sms_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_send_sms_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_send_sms_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_share_black_18dp.png b/session/src/main/res/drawable-hdpi/ic_share_black_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_share_black_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_share_black_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_share_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_share_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_share_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_signal_background_connection.png b/session/src/main/res/drawable-hdpi/ic_signal_background_connection.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_signal_background_connection.png
rename to session/src/main/res/drawable-hdpi/ic_signal_background_connection.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_signal_backup.png b/session/src/main/res/drawable-hdpi/ic_signal_backup.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_signal_backup.png
rename to session/src/main/res/drawable-hdpi/ic_signal_backup.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_signal_downloading.png b/session/src/main/res/drawable-hdpi/ic_signal_downloading.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_signal_downloading.png
rename to session/src/main/res/drawable-hdpi/ic_signal_downloading.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_switch_camera_32.png b/session/src/main/res/drawable-hdpi/ic_switch_camera_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_switch_camera_32.png
rename to session/src/main/res/drawable-hdpi/ic_switch_camera_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_tag_faces_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_tag_faces_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_tag_faces_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_tag_faces_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_text_32.png b/session/src/main/res/drawable-hdpi/ic_text_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_text_32.png
rename to session/src/main/res/drawable-hdpi/ic_text_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_textsms_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_textsms_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_textsms_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_textsms_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_textsms_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_textsms_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_textsms_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_textsms_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_timer.png b/session/src/main/res/drawable-hdpi/ic_timer.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_timer.png
rename to session/src/main/res/drawable-hdpi/ic_timer.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_timer_disabled.png b/session/src/main/res/drawable-hdpi/ic_timer_disabled.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_timer_disabled.png
rename to session/src/main/res/drawable-hdpi/ic_timer_disabled.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_timer_off_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_timer_off_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_timer_off_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_timer_off_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_trash_filled_32.png b/session/src/main/res/drawable-hdpi/ic_trash_filled_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_trash_filled_32.png
rename to session/src/main/res/drawable-hdpi/ic_trash_filled_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_unarchive_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_unarchive_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_unarchive_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_unarchive_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_unarchive_white_36dp.png b/session/src/main/res/drawable-hdpi/ic_unarchive_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_unarchive_white_36dp.png
rename to session/src/main/res/drawable-hdpi/ic_unarchive_white_36dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_undo_32.png b/session/src/main/res/drawable-hdpi/ic_undo_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_undo_32.png
rename to session/src/main/res/drawable-hdpi/ic_undo_32.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_unidentified_delivery.png b/session/src/main/res/drawable-hdpi/ic_unidentified_delivery.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_unidentified_delivery.png
rename to session/src/main/res/drawable-hdpi/ic_unidentified_delivery.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_unlocked_white_18dp.png b/session/src/main/res/drawable-hdpi/ic_unlocked_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_unlocked_white_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_unlocked_white_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_unlocked_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_unlocked_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_unlocked_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_unlocked_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_video_dark.png b/session/src/main/res/drawable-hdpi/ic_video_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_video_dark.png
rename to session/src/main/res/drawable-hdpi/ic_video_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_video_light.png b/session/src/main/res/drawable-hdpi/ic_video_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_video_light.png
rename to session/src/main/res/drawable-hdpi/ic_video_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_videocam_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_videocam_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_videocam_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_videocam_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_videocam_white_48dp.png b/session/src/main/res/drawable-hdpi/ic_videocam_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_videocam_white_48dp.png
rename to session/src/main/res/drawable-hdpi/ic_videocam_white_48dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_view_stream_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_view_stream_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_view_stream_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_view_stream_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_volume_off_grey600_18dp.png b/session/src/main/res/drawable-hdpi/ic_volume_off_grey600_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_volume_off_grey600_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_volume_off_grey600_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_volume_off_white_18dp.png b/session/src/main/res/drawable-hdpi/ic_volume_off_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_volume_off_white_18dp.png
rename to session/src/main/res/drawable-hdpi/ic_volume_off_white_18dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_volume_up_dark.png b/session/src/main/res/drawable-hdpi/ic_volume_up_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_volume_up_dark.png
rename to session/src/main/res/drawable-hdpi/ic_volume_up_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_volume_up_light.png b/session/src/main/res/drawable-hdpi/ic_volume_up_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_volume_up_light.png
rename to session/src/main/res/drawable-hdpi/ic_volume_up_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_warning_dark.png b/session/src/main/res/drawable-hdpi/ic_warning_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_warning_dark.png
rename to session/src/main/res/drawable-hdpi/ic_warning_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_warning_light.png b/session/src/main/res/drawable-hdpi/ic_warning_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_warning_light.png
rename to session/src/main/res/drawable-hdpi/ic_warning_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_wb_sunny_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_wb_sunny_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_wb_sunny_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_wb_sunny_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_work_white_24dp.png b/session/src/main/res/drawable-hdpi/ic_work_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_work_white_24dp.png
rename to session/src/main/res/drawable-hdpi/ic_work_white_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_x_28.png b/session/src/main/res/drawable-hdpi/ic_x_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_x_28.png
rename to session/src/main/res/drawable-hdpi/ic_x_28.png
diff --git a/messenger/src/main/res/drawable-hdpi/ic_x_circle.png b/session/src/main/res/drawable-hdpi/ic_x_circle.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/ic_x_circle.png
rename to session/src/main/res/drawable-hdpi/ic_x_circle.png
diff --git a/messenger/src/main/res/drawable-hdpi/icon_cached.png b/session/src/main/res/drawable-hdpi/icon_cached.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/icon_cached.png
rename to session/src/main/res/drawable-hdpi/icon_cached.png
diff --git a/messenger/src/main/res/drawable-hdpi/icon_dialog.png b/session/src/main/res/drawable-hdpi/icon_dialog.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/icon_dialog.png
rename to session/src/main/res/drawable-hdpi/icon_dialog.png
diff --git a/messenger/src/main/res/drawable-hdpi/icon_lock.png b/session/src/main/res/drawable-hdpi/icon_lock.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/icon_lock.png
rename to session/src/main/res/drawable-hdpi/icon_lock.png
diff --git a/messenger/src/main/res/drawable-hdpi/icon_transparent.png b/session/src/main/res/drawable-hdpi/icon_transparent.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/icon_transparent.png
rename to session/src/main/res/drawable-hdpi/icon_transparent.png
diff --git a/messenger/src/main/res/drawable-hdpi/import_database.png b/session/src/main/res/drawable-hdpi/import_database.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/import_database.png
rename to session/src/main/res/drawable-hdpi/import_database.png
diff --git a/messenger/src/main/res/drawable-hdpi/inbox_zero.png b/session/src/main/res/drawable-hdpi/inbox_zero.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/inbox_zero.png
rename to session/src/main/res/drawable-hdpi/inbox_zero.png
diff --git a/messenger/src/main/res/drawable-hdpi/link_preview_splash.png b/session/src/main/res/drawable-hdpi/link_preview_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/link_preview_splash.png
rename to session/src/main/res/drawable-hdpi/link_preview_splash.png
diff --git a/messenger/src/main/res/drawable-hdpi/lockscreen_watermark_dark.png b/session/src/main/res/drawable-hdpi/lockscreen_watermark_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/lockscreen_watermark_dark.png
rename to session/src/main/res/drawable-hdpi/lockscreen_watermark_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/lockscreen_watermark_light.png b/session/src/main/res/drawable-hdpi/lockscreen_watermark_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/lockscreen_watermark_light.png
rename to session/src/main/res/drawable-hdpi/lockscreen_watermark_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/love_heart.png b/session/src/main/res/drawable-hdpi/love_heart.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/love_heart.png
rename to session/src/main/res/drawable-hdpi/love_heart.png
diff --git a/messenger/src/main/res/drawable-hdpi/message_24dp.png b/session/src/main/res/drawable-hdpi/message_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/message_24dp.png
rename to session/src/main/res/drawable-hdpi/message_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/no_contacts.png b/session/src/main/res/drawable-hdpi/no_contacts.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/no_contacts.png
rename to session/src/main/res/drawable-hdpi/no_contacts.png
diff --git a/messenger/src/main/res/drawable-hdpi/notify_panel_notification_icon_bg.png b/session/src/main/res/drawable-hdpi/notify_panel_notification_icon_bg.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/notify_panel_notification_icon_bg.png
rename to session/src/main/res/drawable-hdpi/notify_panel_notification_icon_bg.png
diff --git a/messenger/src/main/res/drawable-hdpi/phone_24dp.png b/session/src/main/res/drawable-hdpi/phone_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/phone_24dp.png
rename to session/src/main/res/drawable-hdpi/phone_24dp.png
diff --git a/messenger/src/main/res/drawable-hdpi/poweredby_giphy.png b/session/src/main/res/drawable-hdpi/poweredby_giphy.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/poweredby_giphy.png
rename to session/src/main/res/drawable-hdpi/poweredby_giphy.png
diff --git a/messenger/src/main/res/drawable-hdpi/profile_splash.png b/session/src/main/res/drawable-hdpi/profile_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/profile_splash.png
rename to session/src/main/res/drawable-hdpi/profile_splash.png
diff --git a/messenger/src/main/res/drawable-hdpi/quick_camera_dark.png b/session/src/main/res/drawable-hdpi/quick_camera_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/quick_camera_dark.png
rename to session/src/main/res/drawable-hdpi/quick_camera_dark.png
diff --git a/messenger/src/main/res/drawable-hdpi/quick_camera_exit_fullscreen.png b/session/src/main/res/drawable-hdpi/quick_camera_exit_fullscreen.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/quick_camera_exit_fullscreen.png
rename to session/src/main/res/drawable-hdpi/quick_camera_exit_fullscreen.png
diff --git a/messenger/src/main/res/drawable-hdpi/quick_camera_front.png b/session/src/main/res/drawable-hdpi/quick_camera_front.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/quick_camera_front.png
rename to session/src/main/res/drawable-hdpi/quick_camera_front.png
diff --git a/messenger/src/main/res/drawable-hdpi/quick_camera_fullscreen.png b/session/src/main/res/drawable-hdpi/quick_camera_fullscreen.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/quick_camera_fullscreen.png
rename to session/src/main/res/drawable-hdpi/quick_camera_fullscreen.png
diff --git a/messenger/src/main/res/drawable-hdpi/quick_camera_hide.png b/session/src/main/res/drawable-hdpi/quick_camera_hide.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/quick_camera_hide.png
rename to session/src/main/res/drawable-hdpi/quick_camera_hide.png
diff --git a/messenger/src/main/res/drawable-hdpi/quick_camera_light.png b/session/src/main/res/drawable-hdpi/quick_camera_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/quick_camera_light.png
rename to session/src/main/res/drawable-hdpi/quick_camera_light.png
diff --git a/messenger/src/main/res/drawable-hdpi/quick_camera_rear.png b/session/src/main/res/drawable-hdpi/quick_camera_rear.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/quick_camera_rear.png
rename to session/src/main/res/drawable-hdpi/quick_camera_rear.png
diff --git a/messenger/src/main/res/drawable-hdpi/quick_shutter_button.png b/session/src/main/res/drawable-hdpi/quick_shutter_button.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/quick_shutter_button.png
rename to session/src/main/res/drawable-hdpi/quick_shutter_button.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer00.png b/session/src/main/res/drawable-hdpi/timer00.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer00.png
rename to session/src/main/res/drawable-hdpi/timer00.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer05.png b/session/src/main/res/drawable-hdpi/timer05.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer05.png
rename to session/src/main/res/drawable-hdpi/timer05.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer10.png b/session/src/main/res/drawable-hdpi/timer10.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer10.png
rename to session/src/main/res/drawable-hdpi/timer10.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer15.png b/session/src/main/res/drawable-hdpi/timer15.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer15.png
rename to session/src/main/res/drawable-hdpi/timer15.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer20.png b/session/src/main/res/drawable-hdpi/timer20.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer20.png
rename to session/src/main/res/drawable-hdpi/timer20.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer25.png b/session/src/main/res/drawable-hdpi/timer25.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer25.png
rename to session/src/main/res/drawable-hdpi/timer25.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer30.png b/session/src/main/res/drawable-hdpi/timer30.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer30.png
rename to session/src/main/res/drawable-hdpi/timer30.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer35.png b/session/src/main/res/drawable-hdpi/timer35.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer35.png
rename to session/src/main/res/drawable-hdpi/timer35.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer40.png b/session/src/main/res/drawable-hdpi/timer40.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer40.png
rename to session/src/main/res/drawable-hdpi/timer40.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer45.png b/session/src/main/res/drawable-hdpi/timer45.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer45.png
rename to session/src/main/res/drawable-hdpi/timer45.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer50.png b/session/src/main/res/drawable-hdpi/timer50.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer50.png
rename to session/src/main/res/drawable-hdpi/timer50.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer55.png b/session/src/main/res/drawable-hdpi/timer55.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer55.png
rename to session/src/main/res/drawable-hdpi/timer55.png
diff --git a/messenger/src/main/res/drawable-hdpi/timer60.png b/session/src/main/res/drawable-hdpi/timer60.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/timer60.png
rename to session/src/main/res/drawable-hdpi/timer60.png
diff --git a/messenger/src/main/res/drawable-hdpi/video_splash.png b/session/src/main/res/drawable-hdpi/video_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/video_splash.png
rename to session/src/main/res/drawable-hdpi/video_splash.png
diff --git a/messenger/src/main/res/drawable-hdpi/welcome.png b/session/src/main/res/drawable-hdpi/welcome.png
similarity index 100%
rename from messenger/src/main/res/drawable-hdpi/welcome.png
rename to session/src/main/res/drawable-hdpi/welcome.png
diff --git a/messenger/src/main/res/drawable-ldrtl-hdpi/ic_arrow_back_white_24dp.png b/session/src/main/res/drawable-ldrtl-hdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-ldrtl-hdpi/ic_arrow_back_white_24dp.png
rename to session/src/main/res/drawable-ldrtl-hdpi/ic_arrow_back_white_24dp.png
diff --git a/messenger/src/main/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png b/session/src/main/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
rename to session/src/main/res/drawable-ldrtl-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-ldrtl-mdpi/ic_arrow_back_white_24dp.png b/session/src/main/res/drawable-ldrtl-mdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-ldrtl-mdpi/ic_arrow_back_white_24dp.png
rename to session/src/main/res/drawable-ldrtl-mdpi/ic_arrow_back_white_24dp.png
diff --git a/messenger/src/main/res/drawable-ldrtl-xhdpi/ic_arrow_back_white_24dp.png b/session/src/main/res/drawable-ldrtl-xhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-ldrtl-xhdpi/ic_arrow_back_white_24dp.png
rename to session/src/main/res/drawable-ldrtl-xhdpi/ic_arrow_back_white_24dp.png
diff --git a/messenger/src/main/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/session/src/main/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
rename to session/src/main/res/drawable-ldrtl-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-ldrtl-xxhdpi/ic_arrow_back_white_24dp.png b/session/src/main/res/drawable-ldrtl-xxhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-ldrtl-xxhdpi/ic_arrow_back_white_24dp.png
rename to session/src/main/res/drawable-ldrtl-xxhdpi/ic_arrow_back_white_24dp.png
diff --git a/messenger/src/main/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/session/src/main/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
rename to session/src/main/res/drawable-ldrtl-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-ldrtl-xxxhdpi/ic_arrow_back_white_24dp.png b/session/src/main/res/drawable-ldrtl-xxxhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-ldrtl-xxxhdpi/ic_arrow_back_white_24dp.png
rename to session/src/main/res/drawable-ldrtl-xxxhdpi/ic_arrow_back_white_24dp.png
diff --git a/messenger/src/main/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/session/src/main/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
rename to session/src/main/res/drawable-ldrtl-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/baseline_account_circle_white_24.png b/session/src/main/res/drawable-mdpi/baseline_account_circle_white_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/baseline_account_circle_white_24.png
rename to session/src/main/res/drawable-mdpi/baseline_account_circle_white_24.png
diff --git a/messenger/src/main/res/drawable-mdpi/baseline_email_white_24.png b/session/src/main/res/drawable-mdpi/baseline_email_white_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/baseline_email_white_24.png
rename to session/src/main/res/drawable-mdpi/baseline_email_white_24.png
diff --git a/messenger/src/main/res/drawable-mdpi/check.png b/session/src/main/res/drawable-mdpi/check.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/check.png
rename to session/src/main/res/drawable-mdpi/check.png
diff --git a/messenger/src/main/res/drawable-mdpi/clear_profile_avatar.png b/session/src/main/res/drawable-mdpi/clear_profile_avatar.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/clear_profile_avatar.png
rename to session/src/main/res/drawable-mdpi/clear_profile_avatar.png
diff --git a/messenger/src/main/res/drawable-mdpi/conversation_list_empty_state.png b/session/src/main/res/drawable-mdpi/conversation_list_empty_state.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/conversation_list_empty_state.png
rename to session/src/main/res/drawable-mdpi/conversation_list_empty_state.png
diff --git a/messenger/src/main/res/drawable-mdpi/divet_lower_right_dark.png b/session/src/main/res/drawable-mdpi/divet_lower_right_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/divet_lower_right_dark.png
rename to session/src/main/res/drawable-mdpi/divet_lower_right_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/divet_lower_right_light.png b/session/src/main/res/drawable-mdpi/divet_lower_right_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/divet_lower_right_light.png
rename to session/src/main/res/drawable-mdpi/divet_lower_right_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/empty_inbox_1.png b/session/src/main/res/drawable-mdpi/empty_inbox_1.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/empty_inbox_1.png
rename to session/src/main/res/drawable-mdpi/empty_inbox_1.png
diff --git a/messenger/src/main/res/drawable-mdpi/empty_inbox_2.png b/session/src/main/res/drawable-mdpi/empty_inbox_2.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/empty_inbox_2.png
rename to session/src/main/res/drawable-mdpi/empty_inbox_2.png
diff --git a/messenger/src/main/res/drawable-mdpi/empty_inbox_3.png b/session/src/main/res/drawable-mdpi/empty_inbox_3.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/empty_inbox_3.png
rename to session/src/main/res/drawable-mdpi/empty_inbox_3.png
diff --git a/messenger/src/main/res/drawable-mdpi/empty_inbox_4.png b/session/src/main/res/drawable-mdpi/empty_inbox_4.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/empty_inbox_4.png
rename to session/src/main/res/drawable-mdpi/empty_inbox_4.png
diff --git a/messenger/src/main/res/drawable-mdpi/empty_inbox_5.png b/session/src/main/res/drawable-mdpi/empty_inbox_5.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/empty_inbox_5.png
rename to session/src/main/res/drawable-mdpi/empty_inbox_5.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_account_box_dark.png b/session/src/main/res/drawable-mdpi/ic_account_box_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_account_box_dark.png
rename to session/src/main/res/drawable-mdpi/ic_account_box_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_account_box_light.png b/session/src/main/res/drawable-mdpi/ic_account_box_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_account_box_light.png
rename to session/src/main/res/drawable-mdpi/ic_account_box_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_action_name.png b/session/src/main/res/drawable-mdpi/ic_action_name.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_action_name.png
rename to session/src/main/res/drawable-mdpi/ic_action_name.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_action_warning_red.png b/session/src/main/res/drawable-mdpi/ic_action_warning_red.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_action_warning_red.png
rename to session/src/main/res/drawable-mdpi/ic_action_warning_red.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_add_caption_36.png b/session/src/main/res/drawable-mdpi/ic_add_caption_36.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_add_caption_36.png
rename to session/src/main/res/drawable-mdpi/ic_add_caption_36.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_add_photo.png b/session/src/main/res/drawable-mdpi/ic_add_photo.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_add_photo.png
rename to session/src/main/res/drawable-mdpi/ic_add_photo.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_add_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_add_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_add_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_add_white_original_24dp.png b/session/src/main/res/drawable-mdpi/ic_add_white_original_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_add_white_original_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_add_white_original_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_advanced_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_advanced_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_advanced_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_advanced_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_archive_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_archive_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_archive_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_archive_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_arrow_right.png b/session/src/main/res/drawable-mdpi/ic_arrow_right.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_arrow_right.png
rename to session/src/main/res/drawable-mdpi/ic_arrow_right.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_arrow_up.png b/session/src/main/res/drawable-mdpi/ic_arrow_up.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_arrow_up.png
rename to session/src/main/res/drawable-mdpi/ic_arrow_up.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_attach_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_attach_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_attach_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_attach_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_audio_dark.png b/session/src/main/res/drawable-mdpi/ic_audio_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_audio_dark.png
rename to session/src/main/res/drawable-mdpi/ic_audio_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_audio_light.png b/session/src/main/res/drawable-mdpi/ic_audio_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_audio_light.png
rename to session/src/main/res/drawable-mdpi/ic_audio_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_block_grey600_18dp.png b/session/src/main/res/drawable-mdpi/ic_block_grey600_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_block_grey600_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_block_grey600_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_block_white_18dp.png b/session/src/main/res/drawable-mdpi/ic_block_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_block_white_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_block_white_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_block_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_block_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_block_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_block_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_bluetooth_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_bluetooth_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_bluetooth_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_bluetooth_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_brightness_6_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_brightness_6_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_brightness_6_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_brightness_6_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_broken_link.png b/session/src/main/res/drawable-mdpi/ic_broken_link.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_broken_link.png
rename to session/src/main/res/drawable-mdpi/ic_broken_link.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_brush_highlight_32.png b/session/src/main/res/drawable-mdpi/ic_brush_highlight_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_brush_highlight_32.png
rename to session/src/main/res/drawable-mdpi/ic_brush_highlight_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_brush_marker_32.png b/session/src/main/res/drawable-mdpi/ic_brush_marker_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_brush_marker_32.png
rename to session/src/main/res/drawable-mdpi/ic_brush_marker_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_call_end_grey600_32dp.png b/session/src/main/res/drawable-mdpi/ic_call_end_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_call_end_grey600_32dp.png
rename to session/src/main/res/drawable-mdpi/ic_call_end_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_call_end_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_call_end_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_call_end_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_call_end_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_call_made_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_call_made_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_call_made_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_call_made_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_call_missed_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_call_missed_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_call_missed_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_call_missed_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_call_received_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_call_received_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_call_received_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_call_received_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_call_secure_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_call_secure_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_call_secure_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_call_secure_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_call_split_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_call_split_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_call_split_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_call_split_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_camera_filled_24.png b/session/src/main/res/drawable-mdpi/ic_camera_filled_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_camera_filled_24.png
rename to session/src/main/res/drawable-mdpi/ic_camera_filled_24.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_camera_shutter.png b/session/src/main/res/drawable-mdpi/ic_camera_shutter.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_camera_shutter.png
rename to session/src/main/res/drawable-mdpi/ic_camera_shutter.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_camera_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_camera_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_camera_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_camera_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_caption_28.png b/session/src/main/res/drawable-mdpi/ic_caption_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_caption_28.png
rename to session/src/main/res/drawable-mdpi/ic_caption_28.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_check_circle_32.png b/session/src/main/res/drawable-mdpi/ic_check_circle_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_check_circle_32.png
rename to session/src/main/res/drawable-mdpi/ic_check_circle_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_check_circle_white_18dp.png b/session/src/main/res/drawable-mdpi/ic_check_circle_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_check_circle_white_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_check_circle_white_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_check_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_check_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_check_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_check_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_check_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_check_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_check_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_check_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_circle_fill_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_clear_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_clear_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_clear_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_clear_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_close_grey600_32dp.png b/session/src/main/res/drawable-mdpi/ic_close_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_close_grey600_32dp.png
rename to session/src/main/res/drawable-mdpi/ic_close_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_close_white_18dp.png b/session/src/main/res/drawable-mdpi/ic_close_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_close_white_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_close_white_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_close_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_close_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_close_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_close_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_close_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_close_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_close_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_contact_picture.png b/session/src/main/res/drawable-mdpi/ic_contact_picture.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_contact_picture.png
rename to session/src/main/res/drawable-mdpi/ic_contact_picture.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_contact_picture_large.png b/session/src/main/res/drawable-mdpi/ic_contact_picture_large.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_contact_picture_large.png
rename to session/src/main/res/drawable-mdpi/ic_contact_picture_large.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_contacts_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_contacts_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_contacts_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_contacts_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_create_album_filled_32.png b/session/src/main/res/drawable-mdpi/ic_create_album_filled_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_create_album_filled_32.png
rename to session/src/main/res/drawable-mdpi/ic_create_album_filled_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_create_album_outline_32.png b/session/src/main/res/drawable-mdpi/ic_create_album_outline_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_create_album_outline_32.png
rename to session/src/main/res/drawable-mdpi/ic_create_album_outline_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_create_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_create_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_create_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_create_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_crop_32.png b/session/src/main/res/drawable-mdpi/ic_crop_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_crop_32.png
rename to session/src/main/res/drawable-mdpi/ic_crop_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_crop_lock_32.png b/session/src/main/res/drawable-mdpi/ic_crop_lock_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_crop_lock_32.png
rename to session/src/main/res/drawable-mdpi/ic_crop_lock_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_crop_unlock_32.png b/session/src/main/res/drawable-mdpi/ic_crop_unlock_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_crop_unlock_32.png
rename to session/src/main/res/drawable-mdpi/ic_crop_unlock_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_dashboard_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_dashboard_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_dashboard_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_dashboard_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_delivery_status_delivered.png b/session/src/main/res/drawable-mdpi/ic_delivery_status_delivered.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_delivery_status_delivered.png
rename to session/src/main/res/drawable-mdpi/ic_delivery_status_delivered.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_delivery_status_read.png b/session/src/main/res/drawable-mdpi/ic_delivery_status_read.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_delivery_status_read.png
rename to session/src/main/res/drawable-mdpi/ic_delivery_status_read.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_delivery_status_sending.png b/session/src/main/res/drawable-mdpi/ic_delivery_status_sending.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_delivery_status_sending.png
rename to session/src/main/res/drawable-mdpi/ic_delivery_status_sending.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_delivery_status_sent.png b/session/src/main/res/drawable-mdpi/ic_delivery_status_sent.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_delivery_status_sent.png
rename to session/src/main/res/drawable-mdpi/ic_delivery_status_sent.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_devices_white.png b/session/src/main/res/drawable-mdpi/ic_devices_white.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_devices_white.png
rename to session/src/main/res/drawable-mdpi/ic_devices_white.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_dialpad_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_dialpad_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_dialpad_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_dialpad_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_document_large_dark.png b/session/src/main/res/drawable-mdpi/ic_document_large_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_document_large_dark.png
rename to session/src/main/res/drawable-mdpi/ic_document_large_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_document_large_light.png b/session/src/main/res/drawable-mdpi/ic_document_large_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_document_large_light.png
rename to session/src/main/res/drawable-mdpi/ic_document_large_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_document_small_dark.png b/session/src/main/res/drawable-mdpi/ic_document_small_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_document_small_dark.png
rename to session/src/main/res/drawable-mdpi/ic_document_small_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_document_small_light.png b/session/src/main/res/drawable-mdpi/ic_document_small_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_document_small_light.png
rename to session/src/main/res/drawable-mdpi/ic_document_small_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_download_circle_fill_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_download_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_download_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_download_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_emoji_32.png b/session/src/main/res/drawable-mdpi/ic_emoji_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_emoji_32.png
rename to session/src/main/res/drawable-mdpi/ic_emoji_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_error.png b/session/src/main/res/drawable-mdpi/ic_error.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_error.png
rename to session/src/main/res/drawable-mdpi/ic_error.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_face_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_face_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_face_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_face_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_favorite_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_favorite_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_favorite_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_favorite_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png b/session/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png
rename to session/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_fingerprint_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_fingerprint_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_fingerprint_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_fingerprint_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_flip_32.png b/session/src/main/res/drawable-mdpi/ic_flip_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_flip_32.png
rename to session/src/main/res/drawable-mdpi/ic_flip_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_forum_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_forum_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_forum_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_forum_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_gif_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_gif_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_gif_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_gif_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_group_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_group_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_group_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_group_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_group_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_group_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_group_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_group_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_headset_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_headset_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_headset_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_headset_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_image_dark.png b/session/src/main/res/drawable-mdpi/ic_image_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_image_dark.png
rename to session/src/main/res/drawable-mdpi/ic_image_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_image_light.png b/session/src/main/res/drawable-mdpi/ic_image_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_image_light.png
rename to session/src/main/res/drawable-mdpi/ic_image_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_image_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_image_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_image_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_image_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_info_outline_dark.png b/session/src/main/res/drawable-mdpi/ic_info_outline_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_info_outline_dark.png
rename to session/src/main/res/drawable-mdpi/ic_info_outline_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_info_outline_light.png b/session/src/main/res/drawable-mdpi/ic_info_outline_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_info_outline_light.png
rename to session/src/main/res/drawable-mdpi/ic_info_outline_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_info_white_18dp.png b/session/src/main/res/drawable-mdpi/ic_info_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_info_white_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_info_white_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_insert_drive_file_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_insert_drive_file_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_insert_drive_file_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_insert_drive_file_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_keyboard_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_keyboard_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_keyboard_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_keyboard_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_laptop_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_laptop_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_laptop_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_laptop_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_launch_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_launch_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_launch_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_launch_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_local_dining_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_local_dining_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_local_dining_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_local_dining_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_lock_white_18dp.png b/session/src/main/res/drawable-mdpi/ic_lock_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_lock_white_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_lock_white_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_lock_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_lock_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_lock_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_lock_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_lock_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_lock_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_lock_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_lock_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_menu_add_field_holo_light.png b/session/src/main/res/drawable-mdpi/ic_menu_add_field_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_menu_add_field_holo_light.png
rename to session/src/main/res/drawable-mdpi/ic_menu_add_field_holo_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_menu_lock_dark.png b/session/src/main/res/drawable-mdpi/ic_menu_lock_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_menu_lock_dark.png
rename to session/src/main/res/drawable-mdpi/ic_menu_lock_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_menu_login.png b/session/src/main/res/drawable-mdpi/ic_menu_login.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_menu_login.png
rename to session/src/main/res/drawable-mdpi/ic_menu_login.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_menu_remove_holo_light.png b/session/src/main/res/drawable-mdpi/ic_menu_remove_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_menu_remove_holo_light.png
rename to session/src/main/res/drawable-mdpi/ic_menu_remove_holo_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_menu_search_holo_light.png b/session/src/main/res/drawable-mdpi/ic_menu_search_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_menu_search_holo_light.png
rename to session/src/main/res/drawable-mdpi/ic_menu_search_holo_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_message_black_18dp.png b/session/src/main/res/drawable-mdpi/ic_message_black_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_message_black_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_message_black_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_message_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_message_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_message_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_message_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_mic_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_mic_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_mic_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_mic_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_mic_off_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_mic_off_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_mic_off_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_mic_off_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_mic_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_mic_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_mic_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_mic_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_mic_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_mic_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_mic_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_mic_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_missing_thumbnail_picture.png b/session/src/main/res/drawable-mdpi/ic_missing_thumbnail_picture.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_missing_thumbnail_picture.png
rename to session/src/main/res/drawable-mdpi/ic_missing_thumbnail_picture.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_mood_grey600_24dp.png b/session/src/main/res/drawable-mdpi/ic_mood_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_mood_grey600_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_mood_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_mood_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_mood_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_mood_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_mood_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_movie_creation_dark.png b/session/src/main/res/drawable-mdpi/ic_movie_creation_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_movie_creation_dark.png
rename to session/src/main/res/drawable-mdpi/ic_movie_creation_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_movie_creation_light.png b/session/src/main/res/drawable-mdpi/ic_movie_creation_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_movie_creation_light.png
rename to session/src/main/res/drawable-mdpi/ic_movie_creation_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_note_to_self.png b/session/src/main/res/drawable-mdpi/ic_note_to_self.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_note_to_self.png
rename to session/src/main/res/drawable-mdpi/ic_note_to_self.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_notification.png b/session/src/main/res/drawable-mdpi/ic_notification.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_notification.png
rename to session/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_person_add_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_person_add_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_person_add_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_person_add_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_person_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_person_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_person_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_person_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_pets_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_pets_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_pets_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_pets_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_phone_grey600_32dp.png b/session/src/main/res/drawable-mdpi/ic_phone_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_phone_grey600_32dp.png
rename to session/src/main/res/drawable-mdpi/ic_phone_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_photo_camera_dark.png b/session/src/main/res/drawable-mdpi/ic_photo_camera_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_photo_camera_dark.png
rename to session/src/main/res/drawable-mdpi/ic_photo_camera_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_photo_camera_light.png b/session/src/main/res/drawable-mdpi/ic_photo_camera_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_photo_camera_light.png
rename to session/src/main/res/drawable-mdpi/ic_photo_camera_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_photo_camera_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_photo_camera_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_photo_camera_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_photo_camera_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_photo_library_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_photo_library_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_photo_library_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_photo_library_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_play_circle_fill_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_play_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_play_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_play_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_plus_28.png b/session/src/main/res/drawable-mdpi/ic_plus_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_plus_28.png
rename to session/src/main/res/drawable-mdpi/ic_plus_28.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_profile_camera.png b/session/src/main/res/drawable-mdpi/ic_profile_camera.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_profile_camera.png
rename to session/src/main/res/drawable-mdpi/ic_profile_camera.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_profile_default.png b/session/src/main/res/drawable-mdpi/ic_profile_default.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_profile_default.png
rename to session/src/main/res/drawable-mdpi/ic_profile_default.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_reply.png b/session/src/main/res/drawable-mdpi/ic_reply.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_reply.png
rename to session/src/main/res/drawable-mdpi/ic_reply.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_reply_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_reply_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_reply_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_reply_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_reply_white_36dp.png b/session/src/main/res/drawable-mdpi/ic_reply_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_reply_white_36dp.png
rename to session/src/main/res/drawable-mdpi/ic_reply_white_36dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_restore_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_restore_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_restore_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_restore_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_rotate_32.png b/session/src/main/res/drawable-mdpi/ic_rotate_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_rotate_32.png
rename to session/src/main/res/drawable-mdpi/ic_rotate_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_scribble_save.png b/session/src/main/res/drawable-mdpi/ic_scribble_save.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_scribble_save.png
rename to session/src/main/res/drawable-mdpi/ic_scribble_save.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_scroll_down.png b/session/src/main/res/drawable-mdpi/ic_scroll_down.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_scroll_down.png
rename to session/src/main/res/drawable-mdpi/ic_scroll_down.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_security_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_security_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_security_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_security_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_select_all_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_select_all_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_select_all_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_select_all_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_select_off.png b/session/src/main/res/drawable-mdpi/ic_select_off.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_select_off.png
rename to session/src/main/res/drawable-mdpi/ic_select_off.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_select_on.png b/session/src/main/res/drawable-mdpi/ic_select_on.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_select_on.png
rename to session/src/main/res/drawable-mdpi/ic_select_on.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_send_push.png b/session/src/main/res/drawable-mdpi/ic_send_push.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_send_push.png
rename to session/src/main/res/drawable-mdpi/ic_send_push.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_send_push_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_send_push_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_send_push_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_send_push_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_send_sms_insecure.png b/session/src/main/res/drawable-mdpi/ic_send_sms_insecure.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_send_sms_insecure.png
rename to session/src/main/res/drawable-mdpi/ic_send_sms_insecure.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_send_sms_insecure_dark.png b/session/src/main/res/drawable-mdpi/ic_send_sms_insecure_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_send_sms_insecure_dark.png
rename to session/src/main/res/drawable-mdpi/ic_send_sms_insecure_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_send_sms_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_send_sms_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_send_sms_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_send_sms_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_share_black_18dp.png b/session/src/main/res/drawable-mdpi/ic_share_black_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_share_black_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_share_black_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_share_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_share_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_share_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_signal_background_connection.png b/session/src/main/res/drawable-mdpi/ic_signal_background_connection.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_signal_background_connection.png
rename to session/src/main/res/drawable-mdpi/ic_signal_background_connection.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_signal_backup.png b/session/src/main/res/drawable-mdpi/ic_signal_backup.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_signal_backup.png
rename to session/src/main/res/drawable-mdpi/ic_signal_backup.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_signal_downloading.png b/session/src/main/res/drawable-mdpi/ic_signal_downloading.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_signal_downloading.png
rename to session/src/main/res/drawable-mdpi/ic_signal_downloading.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_switch_camera_32.png b/session/src/main/res/drawable-mdpi/ic_switch_camera_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_switch_camera_32.png
rename to session/src/main/res/drawable-mdpi/ic_switch_camera_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_tag_faces_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_tag_faces_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_tag_faces_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_tag_faces_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_text_32.png b/session/src/main/res/drawable-mdpi/ic_text_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_text_32.png
rename to session/src/main/res/drawable-mdpi/ic_text_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_textsms_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_textsms_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_textsms_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_textsms_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_textsms_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_textsms_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_textsms_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_textsms_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_timer.png b/session/src/main/res/drawable-mdpi/ic_timer.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_timer.png
rename to session/src/main/res/drawable-mdpi/ic_timer.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_timer_disabled.png b/session/src/main/res/drawable-mdpi/ic_timer_disabled.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_timer_disabled.png
rename to session/src/main/res/drawable-mdpi/ic_timer_disabled.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_timer_off_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_timer_off_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_timer_off_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_timer_off_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_trash_filled_32.png b/session/src/main/res/drawable-mdpi/ic_trash_filled_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_trash_filled_32.png
rename to session/src/main/res/drawable-mdpi/ic_trash_filled_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_unarchive_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_unarchive_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_unarchive_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_unarchive_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_unarchive_white_36dp.png b/session/src/main/res/drawable-mdpi/ic_unarchive_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_unarchive_white_36dp.png
rename to session/src/main/res/drawable-mdpi/ic_unarchive_white_36dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_undo_32.png b/session/src/main/res/drawable-mdpi/ic_undo_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_undo_32.png
rename to session/src/main/res/drawable-mdpi/ic_undo_32.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_unidentified_delivery.png b/session/src/main/res/drawable-mdpi/ic_unidentified_delivery.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_unidentified_delivery.png
rename to session/src/main/res/drawable-mdpi/ic_unidentified_delivery.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_unlocked_white_18dp.png b/session/src/main/res/drawable-mdpi/ic_unlocked_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_unlocked_white_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_unlocked_white_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_unlocked_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_unlocked_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_unlocked_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_unlocked_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_video_dark.png b/session/src/main/res/drawable-mdpi/ic_video_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_video_dark.png
rename to session/src/main/res/drawable-mdpi/ic_video_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_video_light.png b/session/src/main/res/drawable-mdpi/ic_video_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_video_light.png
rename to session/src/main/res/drawable-mdpi/ic_video_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_videocam_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_videocam_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_videocam_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_videocam_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_videocam_white_48dp.png b/session/src/main/res/drawable-mdpi/ic_videocam_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_videocam_white_48dp.png
rename to session/src/main/res/drawable-mdpi/ic_videocam_white_48dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_view_stream_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_view_stream_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_view_stream_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_view_stream_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_volume_off_grey600_18dp.png b/session/src/main/res/drawable-mdpi/ic_volume_off_grey600_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_volume_off_grey600_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_volume_off_grey600_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_volume_off_white_18dp.png b/session/src/main/res/drawable-mdpi/ic_volume_off_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_volume_off_white_18dp.png
rename to session/src/main/res/drawable-mdpi/ic_volume_off_white_18dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_volume_up_dark.png b/session/src/main/res/drawable-mdpi/ic_volume_up_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_volume_up_dark.png
rename to session/src/main/res/drawable-mdpi/ic_volume_up_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_volume_up_light.png b/session/src/main/res/drawable-mdpi/ic_volume_up_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_volume_up_light.png
rename to session/src/main/res/drawable-mdpi/ic_volume_up_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_warning_dark.png b/session/src/main/res/drawable-mdpi/ic_warning_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_warning_dark.png
rename to session/src/main/res/drawable-mdpi/ic_warning_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_warning_light.png b/session/src/main/res/drawable-mdpi/ic_warning_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_warning_light.png
rename to session/src/main/res/drawable-mdpi/ic_warning_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_wb_sunny_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_wb_sunny_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_wb_sunny_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_wb_sunny_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_work_white_24dp.png b/session/src/main/res/drawable-mdpi/ic_work_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_work_white_24dp.png
rename to session/src/main/res/drawable-mdpi/ic_work_white_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_x_28.png b/session/src/main/res/drawable-mdpi/ic_x_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_x_28.png
rename to session/src/main/res/drawable-mdpi/ic_x_28.png
diff --git a/messenger/src/main/res/drawable-mdpi/ic_x_circle.png b/session/src/main/res/drawable-mdpi/ic_x_circle.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/ic_x_circle.png
rename to session/src/main/res/drawable-mdpi/ic_x_circle.png
diff --git a/messenger/src/main/res/drawable-mdpi/icon_cached.png b/session/src/main/res/drawable-mdpi/icon_cached.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/icon_cached.png
rename to session/src/main/res/drawable-mdpi/icon_cached.png
diff --git a/messenger/src/main/res/drawable-mdpi/icon_dialog.png b/session/src/main/res/drawable-mdpi/icon_dialog.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/icon_dialog.png
rename to session/src/main/res/drawable-mdpi/icon_dialog.png
diff --git a/messenger/src/main/res/drawable-mdpi/icon_lock.png b/session/src/main/res/drawable-mdpi/icon_lock.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/icon_lock.png
rename to session/src/main/res/drawable-mdpi/icon_lock.png
diff --git a/messenger/src/main/res/drawable-mdpi/icon_transparent.png b/session/src/main/res/drawable-mdpi/icon_transparent.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/icon_transparent.png
rename to session/src/main/res/drawable-mdpi/icon_transparent.png
diff --git a/messenger/src/main/res/drawable-mdpi/import_database.png b/session/src/main/res/drawable-mdpi/import_database.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/import_database.png
rename to session/src/main/res/drawable-mdpi/import_database.png
diff --git a/messenger/src/main/res/drawable-mdpi/inbox_zero.png b/session/src/main/res/drawable-mdpi/inbox_zero.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/inbox_zero.png
rename to session/src/main/res/drawable-mdpi/inbox_zero.png
diff --git a/messenger/src/main/res/drawable-mdpi/link_preview_splash.png b/session/src/main/res/drawable-mdpi/link_preview_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/link_preview_splash.png
rename to session/src/main/res/drawable-mdpi/link_preview_splash.png
diff --git a/messenger/src/main/res/drawable-mdpi/lockscreen_watermark_dark.png b/session/src/main/res/drawable-mdpi/lockscreen_watermark_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/lockscreen_watermark_dark.png
rename to session/src/main/res/drawable-mdpi/lockscreen_watermark_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/lockscreen_watermark_light.png b/session/src/main/res/drawable-mdpi/lockscreen_watermark_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/lockscreen_watermark_light.png
rename to session/src/main/res/drawable-mdpi/lockscreen_watermark_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/love_heart.png b/session/src/main/res/drawable-mdpi/love_heart.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/love_heart.png
rename to session/src/main/res/drawable-mdpi/love_heart.png
diff --git a/messenger/src/main/res/drawable-mdpi/message_24dp.png b/session/src/main/res/drawable-mdpi/message_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/message_24dp.png
rename to session/src/main/res/drawable-mdpi/message_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/no_contacts.png b/session/src/main/res/drawable-mdpi/no_contacts.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/no_contacts.png
rename to session/src/main/res/drawable-mdpi/no_contacts.png
diff --git a/messenger/src/main/res/drawable-mdpi/notify_panel_notification_icon_bg.png b/session/src/main/res/drawable-mdpi/notify_panel_notification_icon_bg.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/notify_panel_notification_icon_bg.png
rename to session/src/main/res/drawable-mdpi/notify_panel_notification_icon_bg.png
diff --git a/messenger/src/main/res/drawable-mdpi/phone_24dp.png b/session/src/main/res/drawable-mdpi/phone_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/phone_24dp.png
rename to session/src/main/res/drawable-mdpi/phone_24dp.png
diff --git a/messenger/src/main/res/drawable-mdpi/poweredby_giphy.png b/session/src/main/res/drawable-mdpi/poweredby_giphy.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/poweredby_giphy.png
rename to session/src/main/res/drawable-mdpi/poweredby_giphy.png
diff --git a/messenger/src/main/res/drawable-mdpi/profile_splash.png b/session/src/main/res/drawable-mdpi/profile_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/profile_splash.png
rename to session/src/main/res/drawable-mdpi/profile_splash.png
diff --git a/messenger/src/main/res/drawable-mdpi/quick_camera_dark.png b/session/src/main/res/drawable-mdpi/quick_camera_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/quick_camera_dark.png
rename to session/src/main/res/drawable-mdpi/quick_camera_dark.png
diff --git a/messenger/src/main/res/drawable-mdpi/quick_camera_exit_fullscreen.png b/session/src/main/res/drawable-mdpi/quick_camera_exit_fullscreen.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/quick_camera_exit_fullscreen.png
rename to session/src/main/res/drawable-mdpi/quick_camera_exit_fullscreen.png
diff --git a/messenger/src/main/res/drawable-mdpi/quick_camera_front.png b/session/src/main/res/drawable-mdpi/quick_camera_front.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/quick_camera_front.png
rename to session/src/main/res/drawable-mdpi/quick_camera_front.png
diff --git a/messenger/src/main/res/drawable-mdpi/quick_camera_fullscreen.png b/session/src/main/res/drawable-mdpi/quick_camera_fullscreen.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/quick_camera_fullscreen.png
rename to session/src/main/res/drawable-mdpi/quick_camera_fullscreen.png
diff --git a/messenger/src/main/res/drawable-mdpi/quick_camera_hide.png b/session/src/main/res/drawable-mdpi/quick_camera_hide.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/quick_camera_hide.png
rename to session/src/main/res/drawable-mdpi/quick_camera_hide.png
diff --git a/messenger/src/main/res/drawable-mdpi/quick_camera_light.png b/session/src/main/res/drawable-mdpi/quick_camera_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/quick_camera_light.png
rename to session/src/main/res/drawable-mdpi/quick_camera_light.png
diff --git a/messenger/src/main/res/drawable-mdpi/quick_camera_rear.png b/session/src/main/res/drawable-mdpi/quick_camera_rear.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/quick_camera_rear.png
rename to session/src/main/res/drawable-mdpi/quick_camera_rear.png
diff --git a/messenger/src/main/res/drawable-mdpi/quick_shutter_button.png b/session/src/main/res/drawable-mdpi/quick_shutter_button.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/quick_shutter_button.png
rename to session/src/main/res/drawable-mdpi/quick_shutter_button.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer00.png b/session/src/main/res/drawable-mdpi/timer00.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer00.png
rename to session/src/main/res/drawable-mdpi/timer00.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer05.png b/session/src/main/res/drawable-mdpi/timer05.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer05.png
rename to session/src/main/res/drawable-mdpi/timer05.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer10.png b/session/src/main/res/drawable-mdpi/timer10.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer10.png
rename to session/src/main/res/drawable-mdpi/timer10.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer15.png b/session/src/main/res/drawable-mdpi/timer15.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer15.png
rename to session/src/main/res/drawable-mdpi/timer15.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer20.png b/session/src/main/res/drawable-mdpi/timer20.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer20.png
rename to session/src/main/res/drawable-mdpi/timer20.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer25.png b/session/src/main/res/drawable-mdpi/timer25.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer25.png
rename to session/src/main/res/drawable-mdpi/timer25.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer30.png b/session/src/main/res/drawable-mdpi/timer30.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer30.png
rename to session/src/main/res/drawable-mdpi/timer30.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer35.png b/session/src/main/res/drawable-mdpi/timer35.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer35.png
rename to session/src/main/res/drawable-mdpi/timer35.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer40.png b/session/src/main/res/drawable-mdpi/timer40.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer40.png
rename to session/src/main/res/drawable-mdpi/timer40.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer45.png b/session/src/main/res/drawable-mdpi/timer45.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer45.png
rename to session/src/main/res/drawable-mdpi/timer45.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer50.png b/session/src/main/res/drawable-mdpi/timer50.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer50.png
rename to session/src/main/res/drawable-mdpi/timer50.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer55.png b/session/src/main/res/drawable-mdpi/timer55.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer55.png
rename to session/src/main/res/drawable-mdpi/timer55.png
diff --git a/messenger/src/main/res/drawable-mdpi/timer60.png b/session/src/main/res/drawable-mdpi/timer60.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/timer60.png
rename to session/src/main/res/drawable-mdpi/timer60.png
diff --git a/messenger/src/main/res/drawable-mdpi/video_splash.png b/session/src/main/res/drawable-mdpi/video_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/video_splash.png
rename to session/src/main/res/drawable-mdpi/video_splash.png
diff --git a/messenger/src/main/res/drawable-mdpi/welcome.png b/session/src/main/res/drawable-mdpi/welcome.png
similarity index 100%
rename from messenger/src/main/res/drawable-mdpi/welcome.png
rename to session/src/main/res/drawable-mdpi/welcome.png
diff --git a/messenger/src/main/res/drawable-notnight/prominent_filled_button_medium_background.xml b/session/src/main/res/drawable-notnight/prominent_filled_button_medium_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable-notnight/prominent_filled_button_medium_background.xml
rename to session/src/main/res/drawable-notnight/prominent_filled_button_medium_background.xml
diff --git a/messenger/src/main/res/drawable-notnight/prominent_outline_button_medium_background.xml b/session/src/main/res/drawable-notnight/prominent_outline_button_medium_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable-notnight/prominent_outline_button_medium_background.xml
rename to session/src/main/res/drawable-notnight/prominent_outline_button_medium_background.xml
diff --git a/messenger/src/main/res/drawable-notnight/unimportant_filled_button_medium_background.xml b/session/src/main/res/drawable-notnight/unimportant_filled_button_medium_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable-notnight/unimportant_filled_button_medium_background.xml
rename to session/src/main/res/drawable-notnight/unimportant_filled_button_medium_background.xml
diff --git a/messenger/src/main/res/drawable-xhdpi/baseline_account_circle_white_24.png b/session/src/main/res/drawable-xhdpi/baseline_account_circle_white_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/baseline_account_circle_white_24.png
rename to session/src/main/res/drawable-xhdpi/baseline_account_circle_white_24.png
diff --git a/messenger/src/main/res/drawable-xhdpi/baseline_email_white_24.png b/session/src/main/res/drawable-xhdpi/baseline_email_white_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/baseline_email_white_24.png
rename to session/src/main/res/drawable-xhdpi/baseline_email_white_24.png
diff --git a/messenger/src/main/res/drawable-xhdpi/check.png b/session/src/main/res/drawable-xhdpi/check.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/check.png
rename to session/src/main/res/drawable-xhdpi/check.png
diff --git a/messenger/src/main/res/drawable-xhdpi/clear_profile_avatar.png b/session/src/main/res/drawable-xhdpi/clear_profile_avatar.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/clear_profile_avatar.png
rename to session/src/main/res/drawable-xhdpi/clear_profile_avatar.png
diff --git a/messenger/src/main/res/drawable-xhdpi/conversation_list_empty_state.png b/session/src/main/res/drawable-xhdpi/conversation_list_empty_state.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/conversation_list_empty_state.png
rename to session/src/main/res/drawable-xhdpi/conversation_list_empty_state.png
diff --git a/messenger/src/main/res/drawable-xhdpi/divet_lower_right_dark.png b/session/src/main/res/drawable-xhdpi/divet_lower_right_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/divet_lower_right_dark.png
rename to session/src/main/res/drawable-xhdpi/divet_lower_right_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/divet_lower_right_light.png b/session/src/main/res/drawable-xhdpi/divet_lower_right_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/divet_lower_right_light.png
rename to session/src/main/res/drawable-xhdpi/divet_lower_right_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/empty_inbox_1.png b/session/src/main/res/drawable-xhdpi/empty_inbox_1.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/empty_inbox_1.png
rename to session/src/main/res/drawable-xhdpi/empty_inbox_1.png
diff --git a/messenger/src/main/res/drawable-xhdpi/empty_inbox_2.png b/session/src/main/res/drawable-xhdpi/empty_inbox_2.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/empty_inbox_2.png
rename to session/src/main/res/drawable-xhdpi/empty_inbox_2.png
diff --git a/messenger/src/main/res/drawable-xhdpi/empty_inbox_3.png b/session/src/main/res/drawable-xhdpi/empty_inbox_3.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/empty_inbox_3.png
rename to session/src/main/res/drawable-xhdpi/empty_inbox_3.png
diff --git a/messenger/src/main/res/drawable-xhdpi/empty_inbox_4.png b/session/src/main/res/drawable-xhdpi/empty_inbox_4.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/empty_inbox_4.png
rename to session/src/main/res/drawable-xhdpi/empty_inbox_4.png
diff --git a/messenger/src/main/res/drawable-xhdpi/empty_inbox_5.png b/session/src/main/res/drawable-xhdpi/empty_inbox_5.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/empty_inbox_5.png
rename to session/src/main/res/drawable-xhdpi/empty_inbox_5.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_account_box_dark.png b/session/src/main/res/drawable-xhdpi/ic_account_box_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_account_box_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_account_box_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_account_box_light.png b/session/src/main/res/drawable-xhdpi/ic_account_box_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_account_box_light.png
rename to session/src/main/res/drawable-xhdpi/ic_account_box_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_action_name.png b/session/src/main/res/drawable-xhdpi/ic_action_name.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_action_name.png
rename to session/src/main/res/drawable-xhdpi/ic_action_name.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_action_warning_red.png b/session/src/main/res/drawable-xhdpi/ic_action_warning_red.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_action_warning_red.png
rename to session/src/main/res/drawable-xhdpi/ic_action_warning_red.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_add_caption_36.png b/session/src/main/res/drawable-xhdpi/ic_add_caption_36.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_add_caption_36.png
rename to session/src/main/res/drawable-xhdpi/ic_add_caption_36.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_add_photo.png b/session/src/main/res/drawable-xhdpi/ic_add_photo.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_add_photo.png
rename to session/src/main/res/drawable-xhdpi/ic_add_photo.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_add_white_original_24dp.png b/session/src/main/res/drawable-xhdpi/ic_add_white_original_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_add_white_original_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_add_white_original_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_advanced_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_advanced_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_advanced_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_advanced_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_archive_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_archive_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_archive_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_archive_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_arrow_right.png b/session/src/main/res/drawable-xhdpi/ic_arrow_right.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_arrow_right.png
rename to session/src/main/res/drawable-xhdpi/ic_arrow_right.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_arrow_up.png b/session/src/main/res/drawable-xhdpi/ic_arrow_up.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_arrow_up.png
rename to session/src/main/res/drawable-xhdpi/ic_arrow_up.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_attach_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_attach_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_attach_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_attach_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_audio_dark.png b/session/src/main/res/drawable-xhdpi/ic_audio_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_audio_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_audio_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_audio_light.png b/session/src/main/res/drawable-xhdpi/ic_audio_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_audio_light.png
rename to session/src/main/res/drawable-xhdpi/ic_audio_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_block_grey600_18dp.png b/session/src/main/res/drawable-xhdpi/ic_block_grey600_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_block_grey600_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_block_grey600_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_block_white_18dp.png b/session/src/main/res/drawable-xhdpi/ic_block_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_block_white_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_block_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_block_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_block_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_block_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_block_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_bluetooth_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_bluetooth_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_bluetooth_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_bluetooth_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_brightness_6_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_brightness_6_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_brightness_6_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_brightness_6_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_broken_link.png b/session/src/main/res/drawable-xhdpi/ic_broken_link.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_broken_link.png
rename to session/src/main/res/drawable-xhdpi/ic_broken_link.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_brush_highlight_32.png b/session/src/main/res/drawable-xhdpi/ic_brush_highlight_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_brush_highlight_32.png
rename to session/src/main/res/drawable-xhdpi/ic_brush_highlight_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_brush_marker_32.png b/session/src/main/res/drawable-xhdpi/ic_brush_marker_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_brush_marker_32.png
rename to session/src/main/res/drawable-xhdpi/ic_brush_marker_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_call_end_grey600_32dp.png b/session/src/main/res/drawable-xhdpi/ic_call_end_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_call_end_grey600_32dp.png
rename to session/src/main/res/drawable-xhdpi/ic_call_end_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_call_end_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_call_end_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_call_end_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_call_end_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_call_made_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_call_made_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_call_made_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_call_made_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_call_missed_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_call_missed_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_call_missed_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_call_missed_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_call_received_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_call_received_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_call_received_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_call_received_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_call_secure_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_call_secure_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_call_secure_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_call_secure_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_call_split_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_call_split_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_call_split_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_call_split_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_camera_filled_24.png b/session/src/main/res/drawable-xhdpi/ic_camera_filled_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_camera_filled_24.png
rename to session/src/main/res/drawable-xhdpi/ic_camera_filled_24.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_camera_shutter.png b/session/src/main/res/drawable-xhdpi/ic_camera_shutter.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_camera_shutter.png
rename to session/src/main/res/drawable-xhdpi/ic_camera_shutter.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_camera_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_camera_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_camera_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_camera_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_caption_28.png b/session/src/main/res/drawable-xhdpi/ic_caption_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_caption_28.png
rename to session/src/main/res/drawable-xhdpi/ic_caption_28.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_check_circle_32.png b/session/src/main/res/drawable-xhdpi/ic_check_circle_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_check_circle_32.png
rename to session/src/main/res/drawable-xhdpi/ic_check_circle_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_check_circle_white_18dp.png b/session/src/main/res/drawable-xhdpi/ic_check_circle_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_check_circle_white_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_check_circle_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_check_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_check_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_check_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_check_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_circle_fill_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_clear_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_clear_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_clear_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_clear_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_close_grey600_32dp.png b/session/src/main/res/drawable-xhdpi/ic_close_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_close_grey600_32dp.png
rename to session/src/main/res/drawable-xhdpi/ic_close_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_close_white_18dp.png b/session/src/main/res/drawable-xhdpi/ic_close_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_close_white_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_close_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_close_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_close_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_close_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_close_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_contact_picture.png b/session/src/main/res/drawable-xhdpi/ic_contact_picture.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_contact_picture.png
rename to session/src/main/res/drawable-xhdpi/ic_contact_picture.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_contact_picture_large.png b/session/src/main/res/drawable-xhdpi/ic_contact_picture_large.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_contact_picture_large.png
rename to session/src/main/res/drawable-xhdpi/ic_contact_picture_large.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_contacts_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_contacts_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_contacts_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_contacts_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_create_album_filled_32.png b/session/src/main/res/drawable-xhdpi/ic_create_album_filled_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_create_album_filled_32.png
rename to session/src/main/res/drawable-xhdpi/ic_create_album_filled_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_create_album_outline_32.png b/session/src/main/res/drawable-xhdpi/ic_create_album_outline_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_create_album_outline_32.png
rename to session/src/main/res/drawable-xhdpi/ic_create_album_outline_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_create_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_create_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_create_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_create_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_crop_32.png b/session/src/main/res/drawable-xhdpi/ic_crop_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_crop_32.png
rename to session/src/main/res/drawable-xhdpi/ic_crop_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_crop_lock_32.png b/session/src/main/res/drawable-xhdpi/ic_crop_lock_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_crop_lock_32.png
rename to session/src/main/res/drawable-xhdpi/ic_crop_lock_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_crop_unlock_32.png b/session/src/main/res/drawable-xhdpi/ic_crop_unlock_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_crop_unlock_32.png
rename to session/src/main/res/drawable-xhdpi/ic_crop_unlock_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_dashboard_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_dashboard_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_dashboard_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_dashboard_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_delivery_status_delivered.png b/session/src/main/res/drawable-xhdpi/ic_delivery_status_delivered.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_delivery_status_delivered.png
rename to session/src/main/res/drawable-xhdpi/ic_delivery_status_delivered.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_delivery_status_read.png b/session/src/main/res/drawable-xhdpi/ic_delivery_status_read.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_delivery_status_read.png
rename to session/src/main/res/drawable-xhdpi/ic_delivery_status_read.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_delivery_status_sending.png b/session/src/main/res/drawable-xhdpi/ic_delivery_status_sending.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_delivery_status_sending.png
rename to session/src/main/res/drawable-xhdpi/ic_delivery_status_sending.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_delivery_status_sent.png b/session/src/main/res/drawable-xhdpi/ic_delivery_status_sent.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_delivery_status_sent.png
rename to session/src/main/res/drawable-xhdpi/ic_delivery_status_sent.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_devices_white.png b/session/src/main/res/drawable-xhdpi/ic_devices_white.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_devices_white.png
rename to session/src/main/res/drawable-xhdpi/ic_devices_white.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_dialpad_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_dialpad_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_dialpad_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_dialpad_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_document_large_dark.png b/session/src/main/res/drawable-xhdpi/ic_document_large_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_document_large_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_document_large_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_document_large_light.png b/session/src/main/res/drawable-xhdpi/ic_document_large_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_document_large_light.png
rename to session/src/main/res/drawable-xhdpi/ic_document_large_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_document_small_dark.png b/session/src/main/res/drawable-xhdpi/ic_document_small_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_document_small_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_document_small_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_document_small_light.png b/session/src/main/res/drawable-xhdpi/ic_document_small_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_document_small_light.png
rename to session/src/main/res/drawable-xhdpi/ic_document_small_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_download_circle_fill_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_download_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_download_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_download_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_emoji_32.png b/session/src/main/res/drawable-xhdpi/ic_emoji_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_emoji_32.png
rename to session/src/main/res/drawable-xhdpi/ic_emoji_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_error.png b/session/src/main/res/drawable-xhdpi/ic_error.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_error.png
rename to session/src/main/res/drawable-xhdpi/ic_error.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_face_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_face_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_face_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_face_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_favorite_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_favorite_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_favorite_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_favorite_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png b/session/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png
rename to session/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_fingerprint_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_fingerprint_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_fingerprint_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_fingerprint_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_flip_32.png b/session/src/main/res/drawable-xhdpi/ic_flip_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_flip_32.png
rename to session/src/main/res/drawable-xhdpi/ic_flip_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_forum_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_forum_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_forum_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_forum_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_gif_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_gif_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_gif_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_gif_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_group_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_group_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_group_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_group_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_group_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_group_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_group_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_group_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_image_dark.png b/session/src/main/res/drawable-xhdpi/ic_image_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_image_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_image_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_image_light.png b/session/src/main/res/drawable-xhdpi/ic_image_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_image_light.png
rename to session/src/main/res/drawable-xhdpi/ic_image_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_image_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_image_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_image_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_image_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_info_outline_dark.png b/session/src/main/res/drawable-xhdpi/ic_info_outline_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_info_outline_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_info_outline_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_info_outline_light.png b/session/src/main/res/drawable-xhdpi/ic_info_outline_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_info_outline_light.png
rename to session/src/main/res/drawable-xhdpi/ic_info_outline_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_info_white_18dp.png b/session/src/main/res/drawable-xhdpi/ic_info_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_info_white_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_info_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_insert_drive_file_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_keyboard_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_keyboard_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_keyboard_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_keyboard_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_laptop_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_laptop_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_laptop_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_laptop_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_launch_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_launch_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_launch_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_launch_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_local_dining_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_local_dining_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_local_dining_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_local_dining_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png b/session/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_lock_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_lock_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_lock_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_lock_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_menu_add_field_holo_light.png b/session/src/main/res/drawable-xhdpi/ic_menu_add_field_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_menu_add_field_holo_light.png
rename to session/src/main/res/drawable-xhdpi/ic_menu_add_field_holo_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_menu_lock_dark.png b/session/src/main/res/drawable-xhdpi/ic_menu_lock_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_menu_lock_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_menu_lock_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_menu_login.png b/session/src/main/res/drawable-xhdpi/ic_menu_login.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_menu_login.png
rename to session/src/main/res/drawable-xhdpi/ic_menu_login.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_menu_remove_holo_light.png b/session/src/main/res/drawable-xhdpi/ic_menu_remove_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_menu_remove_holo_light.png
rename to session/src/main/res/drawable-xhdpi/ic_menu_remove_holo_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_menu_search_holo_light.png b/session/src/main/res/drawable-xhdpi/ic_menu_search_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_menu_search_holo_light.png
rename to session/src/main/res/drawable-xhdpi/ic_menu_search_holo_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_message_black_18dp.png b/session/src/main/res/drawable-xhdpi/ic_message_black_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_message_black_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_message_black_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_message_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_message_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_message_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_message_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_mic_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_mic_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_mic_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_mic_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_mic_off_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_mic_off_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_mic_off_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_mic_off_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_mic_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_mic_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_mic_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_mic_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_missing_thumbnail_picture.png b/session/src/main/res/drawable-xhdpi/ic_missing_thumbnail_picture.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_missing_thumbnail_picture.png
rename to session/src/main/res/drawable-xhdpi/ic_missing_thumbnail_picture.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_mood_grey600_24dp.png b/session/src/main/res/drawable-xhdpi/ic_mood_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_mood_grey600_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_mood_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_mood_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_mood_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_mood_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_mood_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_movie_creation_dark.png b/session/src/main/res/drawable-xhdpi/ic_movie_creation_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_movie_creation_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_movie_creation_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_movie_creation_light.png b/session/src/main/res/drawable-xhdpi/ic_movie_creation_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_movie_creation_light.png
rename to session/src/main/res/drawable-xhdpi/ic_movie_creation_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_note_to_self.png b/session/src/main/res/drawable-xhdpi/ic_note_to_self.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_note_to_self.png
rename to session/src/main/res/drawable-xhdpi/ic_note_to_self.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_notification.png b/session/src/main/res/drawable-xhdpi/ic_notification.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_notification.png
rename to session/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_person_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_person_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_person_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_person_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_pets_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_pets_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_pets_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_pets_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_phone_grey600_32dp.png b/session/src/main/res/drawable-xhdpi/ic_phone_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_phone_grey600_32dp.png
rename to session/src/main/res/drawable-xhdpi/ic_phone_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_photo_camera_dark.png b/session/src/main/res/drawable-xhdpi/ic_photo_camera_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_photo_camera_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_photo_camera_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_photo_camera_light.png b/session/src/main/res/drawable-xhdpi/ic_photo_camera_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_photo_camera_light.png
rename to session/src/main/res/drawable-xhdpi/ic_photo_camera_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_photo_camera_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_photo_camera_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_photo_camera_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_photo_camera_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_photo_library_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_photo_library_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_photo_library_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_photo_library_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_plus_28.png b/session/src/main/res/drawable-xhdpi/ic_plus_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_plus_28.png
rename to session/src/main/res/drawable-xhdpi/ic_plus_28.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_profile_camera.png b/session/src/main/res/drawable-xhdpi/ic_profile_camera.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_profile_camera.png
rename to session/src/main/res/drawable-xhdpi/ic_profile_camera.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_profile_default.png b/session/src/main/res/drawable-xhdpi/ic_profile_default.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_profile_default.png
rename to session/src/main/res/drawable-xhdpi/ic_profile_default.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_reply.png b/session/src/main/res/drawable-xhdpi/ic_reply.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_reply.png
rename to session/src/main/res/drawable-xhdpi/ic_reply.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_reply_white_36dp.png b/session/src/main/res/drawable-xhdpi/ic_reply_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_reply_white_36dp.png
rename to session/src/main/res/drawable-xhdpi/ic_reply_white_36dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_restore_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_restore_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_restore_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_restore_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_rotate_32.png b/session/src/main/res/drawable-xhdpi/ic_rotate_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_rotate_32.png
rename to session/src/main/res/drawable-xhdpi/ic_rotate_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_scribble_save.png b/session/src/main/res/drawable-xhdpi/ic_scribble_save.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_scribble_save.png
rename to session/src/main/res/drawable-xhdpi/ic_scribble_save.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_scroll_down.png b/session/src/main/res/drawable-xhdpi/ic_scroll_down.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_scroll_down.png
rename to session/src/main/res/drawable-xhdpi/ic_scroll_down.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_security_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_security_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_security_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_security_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_select_all_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_select_all_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_select_all_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_select_all_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_select_off.png b/session/src/main/res/drawable-xhdpi/ic_select_off.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_select_off.png
rename to session/src/main/res/drawable-xhdpi/ic_select_off.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_select_on.png b/session/src/main/res/drawable-xhdpi/ic_select_on.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_select_on.png
rename to session/src/main/res/drawable-xhdpi/ic_select_on.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_send_push.png b/session/src/main/res/drawable-xhdpi/ic_send_push.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_send_push.png
rename to session/src/main/res/drawable-xhdpi/ic_send_push.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_send_push_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_send_push_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_send_push_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_send_push_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_send_sms_insecure.png b/session/src/main/res/drawable-xhdpi/ic_send_sms_insecure.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_send_sms_insecure.png
rename to session/src/main/res/drawable-xhdpi/ic_send_sms_insecure.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_send_sms_insecure_dark.png b/session/src/main/res/drawable-xhdpi/ic_send_sms_insecure_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_send_sms_insecure_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_send_sms_insecure_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_send_sms_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_send_sms_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_send_sms_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_send_sms_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_share_black_18dp.png b/session/src/main/res/drawable-xhdpi/ic_share_black_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_share_black_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_share_black_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_signal_background_connection.png b/session/src/main/res/drawable-xhdpi/ic_signal_background_connection.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_signal_background_connection.png
rename to session/src/main/res/drawable-xhdpi/ic_signal_background_connection.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_signal_backup.png b/session/src/main/res/drawable-xhdpi/ic_signal_backup.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_signal_backup.png
rename to session/src/main/res/drawable-xhdpi/ic_signal_backup.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_signal_downloading.png b/session/src/main/res/drawable-xhdpi/ic_signal_downloading.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_signal_downloading.png
rename to session/src/main/res/drawable-xhdpi/ic_signal_downloading.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_switch_camera_32.png b/session/src/main/res/drawable-xhdpi/ic_switch_camera_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_switch_camera_32.png
rename to session/src/main/res/drawable-xhdpi/ic_switch_camera_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_tag_faces_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_tag_faces_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_tag_faces_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_tag_faces_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_text_32.png b/session/src/main/res/drawable-xhdpi/ic_text_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_text_32.png
rename to session/src/main/res/drawable-xhdpi/ic_text_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_textsms_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_textsms_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_textsms_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_textsms_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_textsms_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_textsms_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_textsms_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_textsms_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_timer.png b/session/src/main/res/drawable-xhdpi/ic_timer.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_timer.png
rename to session/src/main/res/drawable-xhdpi/ic_timer.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_timer_disabled.png b/session/src/main/res/drawable-xhdpi/ic_timer_disabled.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_timer_disabled.png
rename to session/src/main/res/drawable-xhdpi/ic_timer_disabled.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_timer_off_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_timer_off_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_timer_off_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_timer_off_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_trash_filled_32.png b/session/src/main/res/drawable-xhdpi/ic_trash_filled_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_trash_filled_32.png
rename to session/src/main/res/drawable-xhdpi/ic_trash_filled_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_unarchive_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_unarchive_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_unarchive_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_unarchive_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_unarchive_white_36dp.png b/session/src/main/res/drawable-xhdpi/ic_unarchive_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_unarchive_white_36dp.png
rename to session/src/main/res/drawable-xhdpi/ic_unarchive_white_36dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_undo_32.png b/session/src/main/res/drawable-xhdpi/ic_undo_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_undo_32.png
rename to session/src/main/res/drawable-xhdpi/ic_undo_32.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_unidentified_delivery.png b/session/src/main/res/drawable-xhdpi/ic_unidentified_delivery.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_unidentified_delivery.png
rename to session/src/main/res/drawable-xhdpi/ic_unidentified_delivery.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_unlocked_white_18dp.png b/session/src/main/res/drawable-xhdpi/ic_unlocked_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_unlocked_white_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_unlocked_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_unlocked_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_video_dark.png b/session/src/main/res/drawable-xhdpi/ic_video_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_video_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_video_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_video_light.png b/session/src/main/res/drawable-xhdpi/ic_video_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_video_light.png
rename to session/src/main/res/drawable-xhdpi/ic_video_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_videocam_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_videocam_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_videocam_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_videocam_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_videocam_white_48dp.png b/session/src/main/res/drawable-xhdpi/ic_videocam_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_videocam_white_48dp.png
rename to session/src/main/res/drawable-xhdpi/ic_videocam_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_view_stream_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_view_stream_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_view_stream_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_view_stream_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_volume_off_grey600_18dp.png b/session/src/main/res/drawable-xhdpi/ic_volume_off_grey600_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_volume_off_grey600_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_volume_off_grey600_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_volume_off_white_18dp.png b/session/src/main/res/drawable-xhdpi/ic_volume_off_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_volume_off_white_18dp.png
rename to session/src/main/res/drawable-xhdpi/ic_volume_off_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_volume_up_dark.png b/session/src/main/res/drawable-xhdpi/ic_volume_up_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_volume_up_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_volume_up_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_volume_up_light.png b/session/src/main/res/drawable-xhdpi/ic_volume_up_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_volume_up_light.png
rename to session/src/main/res/drawable-xhdpi/ic_volume_up_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_warning_dark.png b/session/src/main/res/drawable-xhdpi/ic_warning_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_warning_dark.png
rename to session/src/main/res/drawable-xhdpi/ic_warning_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_warning_light.png b/session/src/main/res/drawable-xhdpi/ic_warning_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_warning_light.png
rename to session/src/main/res/drawable-xhdpi/ic_warning_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_wb_sunny_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_wb_sunny_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_wb_sunny_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_wb_sunny_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_work_white_24dp.png b/session/src/main/res/drawable-xhdpi/ic_work_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_work_white_24dp.png
rename to session/src/main/res/drawable-xhdpi/ic_work_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_x_28.png b/session/src/main/res/drawable-xhdpi/ic_x_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_x_28.png
rename to session/src/main/res/drawable-xhdpi/ic_x_28.png
diff --git a/messenger/src/main/res/drawable-xhdpi/ic_x_circle.png b/session/src/main/res/drawable-xhdpi/ic_x_circle.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/ic_x_circle.png
rename to session/src/main/res/drawable-xhdpi/ic_x_circle.png
diff --git a/messenger/src/main/res/drawable-xhdpi/icon_cached.png b/session/src/main/res/drawable-xhdpi/icon_cached.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/icon_cached.png
rename to session/src/main/res/drawable-xhdpi/icon_cached.png
diff --git a/messenger/src/main/res/drawable-xhdpi/icon_dialog.png b/session/src/main/res/drawable-xhdpi/icon_dialog.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/icon_dialog.png
rename to session/src/main/res/drawable-xhdpi/icon_dialog.png
diff --git a/messenger/src/main/res/drawable-xhdpi/icon_lock.png b/session/src/main/res/drawable-xhdpi/icon_lock.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/icon_lock.png
rename to session/src/main/res/drawable-xhdpi/icon_lock.png
diff --git a/messenger/src/main/res/drawable-xhdpi/icon_transparent.png b/session/src/main/res/drawable-xhdpi/icon_transparent.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/icon_transparent.png
rename to session/src/main/res/drawable-xhdpi/icon_transparent.png
diff --git a/messenger/src/main/res/drawable-xhdpi/import_database.png b/session/src/main/res/drawable-xhdpi/import_database.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/import_database.png
rename to session/src/main/res/drawable-xhdpi/import_database.png
diff --git a/messenger/src/main/res/drawable-xhdpi/inbox_zero.png b/session/src/main/res/drawable-xhdpi/inbox_zero.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/inbox_zero.png
rename to session/src/main/res/drawable-xhdpi/inbox_zero.png
diff --git a/messenger/src/main/res/drawable-xhdpi/link_preview_splash.png b/session/src/main/res/drawable-xhdpi/link_preview_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/link_preview_splash.png
rename to session/src/main/res/drawable-xhdpi/link_preview_splash.png
diff --git a/messenger/src/main/res/drawable-xhdpi/lockscreen_watermark_dark.png b/session/src/main/res/drawable-xhdpi/lockscreen_watermark_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/lockscreen_watermark_dark.png
rename to session/src/main/res/drawable-xhdpi/lockscreen_watermark_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/lockscreen_watermark_light.png b/session/src/main/res/drawable-xhdpi/lockscreen_watermark_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/lockscreen_watermark_light.png
rename to session/src/main/res/drawable-xhdpi/lockscreen_watermark_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/love_heart.png b/session/src/main/res/drawable-xhdpi/love_heart.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/love_heart.png
rename to session/src/main/res/drawable-xhdpi/love_heart.png
diff --git a/messenger/src/main/res/drawable-xhdpi/message_24dp.png b/session/src/main/res/drawable-xhdpi/message_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/message_24dp.png
rename to session/src/main/res/drawable-xhdpi/message_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/no_contacts.png b/session/src/main/res/drawable-xhdpi/no_contacts.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/no_contacts.png
rename to session/src/main/res/drawable-xhdpi/no_contacts.png
diff --git a/messenger/src/main/res/drawable-xhdpi/notify_panel_notification_icon_bg.png b/session/src/main/res/drawable-xhdpi/notify_panel_notification_icon_bg.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/notify_panel_notification_icon_bg.png
rename to session/src/main/res/drawable-xhdpi/notify_panel_notification_icon_bg.png
diff --git a/messenger/src/main/res/drawable-xhdpi/phone_24dp.png b/session/src/main/res/drawable-xhdpi/phone_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/phone_24dp.png
rename to session/src/main/res/drawable-xhdpi/phone_24dp.png
diff --git a/messenger/src/main/res/drawable-xhdpi/poweredby_giphy.png b/session/src/main/res/drawable-xhdpi/poweredby_giphy.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/poweredby_giphy.png
rename to session/src/main/res/drawable-xhdpi/poweredby_giphy.png
diff --git a/messenger/src/main/res/drawable-xhdpi/profile_splash.png b/session/src/main/res/drawable-xhdpi/profile_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/profile_splash.png
rename to session/src/main/res/drawable-xhdpi/profile_splash.png
diff --git a/messenger/src/main/res/drawable-xhdpi/quick_camera_dark.png b/session/src/main/res/drawable-xhdpi/quick_camera_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/quick_camera_dark.png
rename to session/src/main/res/drawable-xhdpi/quick_camera_dark.png
diff --git a/messenger/src/main/res/drawable-xhdpi/quick_camera_exit_fullscreen.png b/session/src/main/res/drawable-xhdpi/quick_camera_exit_fullscreen.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/quick_camera_exit_fullscreen.png
rename to session/src/main/res/drawable-xhdpi/quick_camera_exit_fullscreen.png
diff --git a/messenger/src/main/res/drawable-xhdpi/quick_camera_front.png b/session/src/main/res/drawable-xhdpi/quick_camera_front.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/quick_camera_front.png
rename to session/src/main/res/drawable-xhdpi/quick_camera_front.png
diff --git a/messenger/src/main/res/drawable-xhdpi/quick_camera_fullscreen.png b/session/src/main/res/drawable-xhdpi/quick_camera_fullscreen.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/quick_camera_fullscreen.png
rename to session/src/main/res/drawable-xhdpi/quick_camera_fullscreen.png
diff --git a/messenger/src/main/res/drawable-xhdpi/quick_camera_hide.png b/session/src/main/res/drawable-xhdpi/quick_camera_hide.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/quick_camera_hide.png
rename to session/src/main/res/drawable-xhdpi/quick_camera_hide.png
diff --git a/messenger/src/main/res/drawable-xhdpi/quick_camera_light.png b/session/src/main/res/drawable-xhdpi/quick_camera_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/quick_camera_light.png
rename to session/src/main/res/drawable-xhdpi/quick_camera_light.png
diff --git a/messenger/src/main/res/drawable-xhdpi/quick_camera_rear.png b/session/src/main/res/drawable-xhdpi/quick_camera_rear.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/quick_camera_rear.png
rename to session/src/main/res/drawable-xhdpi/quick_camera_rear.png
diff --git a/messenger/src/main/res/drawable-xhdpi/quick_shutter_button.png b/session/src/main/res/drawable-xhdpi/quick_shutter_button.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/quick_shutter_button.png
rename to session/src/main/res/drawable-xhdpi/quick_shutter_button.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer00.png b/session/src/main/res/drawable-xhdpi/timer00.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer00.png
rename to session/src/main/res/drawable-xhdpi/timer00.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer05.png b/session/src/main/res/drawable-xhdpi/timer05.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer05.png
rename to session/src/main/res/drawable-xhdpi/timer05.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer10.png b/session/src/main/res/drawable-xhdpi/timer10.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer10.png
rename to session/src/main/res/drawable-xhdpi/timer10.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer15.png b/session/src/main/res/drawable-xhdpi/timer15.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer15.png
rename to session/src/main/res/drawable-xhdpi/timer15.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer20.png b/session/src/main/res/drawable-xhdpi/timer20.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer20.png
rename to session/src/main/res/drawable-xhdpi/timer20.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer25.png b/session/src/main/res/drawable-xhdpi/timer25.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer25.png
rename to session/src/main/res/drawable-xhdpi/timer25.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer30.png b/session/src/main/res/drawable-xhdpi/timer30.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer30.png
rename to session/src/main/res/drawable-xhdpi/timer30.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer35.png b/session/src/main/res/drawable-xhdpi/timer35.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer35.png
rename to session/src/main/res/drawable-xhdpi/timer35.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer40.png b/session/src/main/res/drawable-xhdpi/timer40.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer40.png
rename to session/src/main/res/drawable-xhdpi/timer40.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer45.png b/session/src/main/res/drawable-xhdpi/timer45.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer45.png
rename to session/src/main/res/drawable-xhdpi/timer45.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer50.png b/session/src/main/res/drawable-xhdpi/timer50.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer50.png
rename to session/src/main/res/drawable-xhdpi/timer50.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer55.png b/session/src/main/res/drawable-xhdpi/timer55.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer55.png
rename to session/src/main/res/drawable-xhdpi/timer55.png
diff --git a/messenger/src/main/res/drawable-xhdpi/timer60.png b/session/src/main/res/drawable-xhdpi/timer60.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/timer60.png
rename to session/src/main/res/drawable-xhdpi/timer60.png
diff --git a/messenger/src/main/res/drawable-xhdpi/video_splash.png b/session/src/main/res/drawable-xhdpi/video_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/video_splash.png
rename to session/src/main/res/drawable-xhdpi/video_splash.png
diff --git a/messenger/src/main/res/drawable-xhdpi/welcome.png b/session/src/main/res/drawable-xhdpi/welcome.png
similarity index 100%
rename from messenger/src/main/res/drawable-xhdpi/welcome.png
rename to session/src/main/res/drawable-xhdpi/welcome.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/baseline_account_circle_white_24.png b/session/src/main/res/drawable-xxhdpi/baseline_account_circle_white_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/baseline_account_circle_white_24.png
rename to session/src/main/res/drawable-xxhdpi/baseline_account_circle_white_24.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/baseline_email_white_24.png b/session/src/main/res/drawable-xxhdpi/baseline_email_white_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/baseline_email_white_24.png
rename to session/src/main/res/drawable-xxhdpi/baseline_email_white_24.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/check.png b/session/src/main/res/drawable-xxhdpi/check.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/check.png
rename to session/src/main/res/drawable-xxhdpi/check.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/clear_profile_avatar.png b/session/src/main/res/drawable-xxhdpi/clear_profile_avatar.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/clear_profile_avatar.png
rename to session/src/main/res/drawable-xxhdpi/clear_profile_avatar.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/conversation_list_empty_state.png b/session/src/main/res/drawable-xxhdpi/conversation_list_empty_state.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/conversation_list_empty_state.png
rename to session/src/main/res/drawable-xxhdpi/conversation_list_empty_state.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png b/session/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png
rename to session/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/divet_lower_right_light.png b/session/src/main/res/drawable-xxhdpi/divet_lower_right_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/divet_lower_right_light.png
rename to session/src/main/res/drawable-xxhdpi/divet_lower_right_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/empty_inbox_1.png b/session/src/main/res/drawable-xxhdpi/empty_inbox_1.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/empty_inbox_1.png
rename to session/src/main/res/drawable-xxhdpi/empty_inbox_1.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/empty_inbox_2.png b/session/src/main/res/drawable-xxhdpi/empty_inbox_2.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/empty_inbox_2.png
rename to session/src/main/res/drawable-xxhdpi/empty_inbox_2.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/empty_inbox_3.png b/session/src/main/res/drawable-xxhdpi/empty_inbox_3.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/empty_inbox_3.png
rename to session/src/main/res/drawable-xxhdpi/empty_inbox_3.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/empty_inbox_4.png b/session/src/main/res/drawable-xxhdpi/empty_inbox_4.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/empty_inbox_4.png
rename to session/src/main/res/drawable-xxhdpi/empty_inbox_4.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/empty_inbox_5.png b/session/src/main/res/drawable-xxhdpi/empty_inbox_5.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/empty_inbox_5.png
rename to session/src/main/res/drawable-xxhdpi/empty_inbox_5.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_account_box_dark.png b/session/src/main/res/drawable-xxhdpi/ic_account_box_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_account_box_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_account_box_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_account_box_light.png b/session/src/main/res/drawable-xxhdpi/ic_account_box_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_account_box_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_account_box_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_action_name.png b/session/src/main/res/drawable-xxhdpi/ic_action_name.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_action_name.png
rename to session/src/main/res/drawable-xxhdpi/ic_action_name.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_action_warning_red.png b/session/src/main/res/drawable-xxhdpi/ic_action_warning_red.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_action_warning_red.png
rename to session/src/main/res/drawable-xxhdpi/ic_action_warning_red.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_add_caption_36.png b/session/src/main/res/drawable-xxhdpi/ic_add_caption_36.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_add_caption_36.png
rename to session/src/main/res/drawable-xxhdpi/ic_add_caption_36.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_add_photo.png b/session/src/main/res/drawable-xxhdpi/ic_add_photo.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_add_photo.png
rename to session/src/main/res/drawable-xxhdpi/ic_add_photo.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_add_white_original_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_add_white_original_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_add_white_original_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_add_white_original_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_advanced_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_advanced_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_advanced_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_advanced_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_archive_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_archive_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_archive_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_archive_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_arrow_right.png b/session/src/main/res/drawable-xxhdpi/ic_arrow_right.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_arrow_right.png
rename to session/src/main/res/drawable-xxhdpi/ic_arrow_right.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_arrow_up.png b/session/src/main/res/drawable-xxhdpi/ic_arrow_up.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_arrow_up.png
rename to session/src/main/res/drawable-xxhdpi/ic_arrow_up.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_attach_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_attach_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_attach_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_attach_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_audio_dark.png b/session/src/main/res/drawable-xxhdpi/ic_audio_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_audio_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_audio_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_audio_light.png b/session/src/main/res/drawable-xxhdpi/ic_audio_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_audio_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_audio_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_block_grey600_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_block_grey600_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_block_grey600_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_block_grey600_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_block_white_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_block_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_block_white_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_block_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_block_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_block_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_block_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_block_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_bluetooth_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_bluetooth_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_bluetooth_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_bluetooth_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_brightness_6_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_brightness_6_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_brightness_6_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_brightness_6_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_broken_link.png b/session/src/main/res/drawable-xxhdpi/ic_broken_link.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_broken_link.png
rename to session/src/main/res/drawable-xxhdpi/ic_broken_link.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_brush_highlight_32.png b/session/src/main/res/drawable-xxhdpi/ic_brush_highlight_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_brush_highlight_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_brush_highlight_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_brush_marker_32.png b/session/src/main/res/drawable-xxhdpi/ic_brush_marker_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_brush_marker_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_brush_marker_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_call_end_grey600_32dp.png b/session/src/main/res/drawable-xxhdpi/ic_call_end_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_call_end_grey600_32dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_call_end_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_call_end_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_call_end_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_call_end_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_call_end_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_call_made_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_call_made_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_call_made_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_call_made_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_call_missed_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_call_missed_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_call_missed_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_call_missed_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_call_received_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_call_received_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_call_received_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_call_received_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_call_secure_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_call_secure_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_call_secure_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_call_secure_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_call_split_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_call_split_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_call_split_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_call_split_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_call_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_call_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_call_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_call_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_camera_filled_24.png b/session/src/main/res/drawable-xxhdpi/ic_camera_filled_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_camera_filled_24.png
rename to session/src/main/res/drawable-xxhdpi/ic_camera_filled_24.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_camera_shutter.png b/session/src/main/res/drawable-xxhdpi/ic_camera_shutter.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_camera_shutter.png
rename to session/src/main/res/drawable-xxhdpi/ic_camera_shutter.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_camera_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_camera_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_camera_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_camera_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_caption_28.png b/session/src/main/res/drawable-xxhdpi/ic_caption_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_caption_28.png
rename to session/src/main/res/drawable-xxhdpi/ic_caption_28.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_check_circle_32.png b/session/src/main/res/drawable-xxhdpi/ic_check_circle_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_check_circle_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_check_circle_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_check_circle_white_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_check_circle_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_check_circle_white_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_check_circle_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_check_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_check_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_check_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_check_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_circle_fill_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_close_grey600_32dp.png b/session/src/main/res/drawable-xxhdpi/ic_close_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_close_grey600_32dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_close_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_close_white_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_close_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_close_white_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_close_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_close_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_close_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_close_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_close_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_contact_picture.png b/session/src/main/res/drawable-xxhdpi/ic_contact_picture.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_contact_picture.png
rename to session/src/main/res/drawable-xxhdpi/ic_contact_picture.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_contact_picture_large.png b/session/src/main/res/drawable-xxhdpi/ic_contact_picture_large.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_contact_picture_large.png
rename to session/src/main/res/drawable-xxhdpi/ic_contact_picture_large.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_contacts_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_contacts_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_contacts_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_contacts_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_create_album_filled_32.png b/session/src/main/res/drawable-xxhdpi/ic_create_album_filled_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_create_album_filled_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_create_album_filled_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_create_album_outline_32.png b/session/src/main/res/drawable-xxhdpi/ic_create_album_outline_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_create_album_outline_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_create_album_outline_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_create_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_create_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_create_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_create_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_crop_32.png b/session/src/main/res/drawable-xxhdpi/ic_crop_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_crop_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_crop_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_crop_lock_32.png b/session/src/main/res/drawable-xxhdpi/ic_crop_lock_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_crop_lock_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_crop_lock_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_crop_unlock_32.png b/session/src/main/res/drawable-xxhdpi/ic_crop_unlock_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_crop_unlock_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_crop_unlock_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_dashboard_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_dashboard_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_dashboard_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_dashboard_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_delivery_status_delivered.png b/session/src/main/res/drawable-xxhdpi/ic_delivery_status_delivered.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_delivery_status_delivered.png
rename to session/src/main/res/drawable-xxhdpi/ic_delivery_status_delivered.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_delivery_status_read.png b/session/src/main/res/drawable-xxhdpi/ic_delivery_status_read.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_delivery_status_read.png
rename to session/src/main/res/drawable-xxhdpi/ic_delivery_status_read.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_delivery_status_sending.png b/session/src/main/res/drawable-xxhdpi/ic_delivery_status_sending.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_delivery_status_sending.png
rename to session/src/main/res/drawable-xxhdpi/ic_delivery_status_sending.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_delivery_status_sent.png b/session/src/main/res/drawable-xxhdpi/ic_delivery_status_sent.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_delivery_status_sent.png
rename to session/src/main/res/drawable-xxhdpi/ic_delivery_status_sent.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_devices_white.png b/session/src/main/res/drawable-xxhdpi/ic_devices_white.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_devices_white.png
rename to session/src/main/res/drawable-xxhdpi/ic_devices_white.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_dialpad_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_dialpad_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_dialpad_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_dialpad_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_document_large_dark.png b/session/src/main/res/drawable-xxhdpi/ic_document_large_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_document_large_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_document_large_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_document_large_light.png b/session/src/main/res/drawable-xxhdpi/ic_document_large_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_document_large_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_document_large_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_document_small_dark.png b/session/src/main/res/drawable-xxhdpi/ic_document_small_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_document_small_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_document_small_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_document_small_light.png b/session/src/main/res/drawable-xxhdpi/ic_document_small_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_document_small_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_document_small_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_download_circle_fill_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_download_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_download_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_download_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_emoji_32.png b/session/src/main/res/drawable-xxhdpi/ic_emoji_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_emoji_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_emoji_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_error.png b/session/src/main/res/drawable-xxhdpi/ic_error.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_error.png
rename to session/src/main/res/drawable-xxhdpi/ic_error.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_error_white_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_error_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_error_white_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_error_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_face_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_face_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_face_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_face_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_favorite_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_favorite_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_favorite_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_favorite_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png b/session/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_fingerprint_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_fingerprint_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_fingerprint_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_fingerprint_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_flip_32.png b/session/src/main/res/drawable-xxhdpi/ic_flip_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_flip_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_flip_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_forum_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_forum_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_forum_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_forum_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_gif_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_gif_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_gif_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_gif_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_group_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_group_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_group_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_group_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_group_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_group_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_group_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_group_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_image_dark.png b/session/src/main/res/drawable-xxhdpi/ic_image_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_image_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_image_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_image_light.png b/session/src/main/res/drawable-xxhdpi/ic_image_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_image_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_image_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_info_outline_dark.png b/session/src/main/res/drawable-xxhdpi/ic_info_outline_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_info_outline_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_info_outline_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_info_outline_light.png b/session/src/main/res/drawable-xxhdpi/ic_info_outline_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_info_outline_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_info_outline_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_info_white_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_info_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_info_white_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_info_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_insert_drive_file_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_laptop_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_laptop_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_laptop_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_laptop_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_local_dining_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_local_dining_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_local_dining_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_local_dining_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_lock_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_lock_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_lock_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_lock_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_menu_lock_dark.png b/session/src/main/res/drawable-xxhdpi/ic_menu_lock_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_menu_lock_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_menu_lock_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_menu_remove_holo_light.png b/session/src/main/res/drawable-xxhdpi/ic_menu_remove_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_menu_remove_holo_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_menu_remove_holo_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_menu_search_holo_light.png b/session/src/main/res/drawable-xxhdpi/ic_menu_search_holo_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_menu_search_holo_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_menu_search_holo_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_message_black_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_message_black_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_message_black_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_message_black_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_message_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_message_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_message_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_message_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_mic_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_mic_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_mic_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_mic_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_mic_off_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_mic_off_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_mic_off_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_mic_off_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_mic_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_mic_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_mic_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_mic_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_missing_thumbnail_picture.png b/session/src/main/res/drawable-xxhdpi/ic_missing_thumbnail_picture.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_missing_thumbnail_picture.png
rename to session/src/main/res/drawable-xxhdpi/ic_missing_thumbnail_picture.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_mood_grey600_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_mood_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_mood_grey600_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_mood_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_mood_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_mood_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_mood_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_mood_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_movie_creation_dark.png b/session/src/main/res/drawable-xxhdpi/ic_movie_creation_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_movie_creation_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_movie_creation_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_movie_creation_light.png b/session/src/main/res/drawable-xxhdpi/ic_movie_creation_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_movie_creation_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_movie_creation_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_note_to_self.png b/session/src/main/res/drawable-xxhdpi/ic_note_to_self.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_note_to_self.png
rename to session/src/main/res/drawable-xxhdpi/ic_note_to_self.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_notification.png b/session/src/main/res/drawable-xxhdpi/ic_notification.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_notification.png
rename to session/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_pets_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_pets_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_pets_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_pets_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_phone_grey600_32dp.png b/session/src/main/res/drawable-xxhdpi/ic_phone_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_phone_grey600_32dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_phone_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_photo_camera_dark.png b/session/src/main/res/drawable-xxhdpi/ic_photo_camera_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_photo_camera_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_photo_camera_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_photo_camera_light.png b/session/src/main/res/drawable-xxhdpi/ic_photo_camera_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_photo_camera_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_photo_camera_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_photo_camera_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_photo_camera_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_photo_camera_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_photo_camera_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_photo_library_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_photo_library_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_photo_library_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_photo_library_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_plus_28.png b/session/src/main/res/drawable-xxhdpi/ic_plus_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_plus_28.png
rename to session/src/main/res/drawable-xxhdpi/ic_plus_28.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_profile_camera.png b/session/src/main/res/drawable-xxhdpi/ic_profile_camera.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_profile_camera.png
rename to session/src/main/res/drawable-xxhdpi/ic_profile_camera.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_profile_default.png b/session/src/main/res/drawable-xxhdpi/ic_profile_default.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_profile_default.png
rename to session/src/main/res/drawable-xxhdpi/ic_profile_default.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_reply.png b/session/src/main/res/drawable-xxhdpi/ic_reply.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_reply.png
rename to session/src/main/res/drawable-xxhdpi/ic_reply.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_reply_white_36dp.png b/session/src/main/res/drawable-xxhdpi/ic_reply_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_reply_white_36dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_reply_white_36dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_restore_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_restore_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_restore_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_restore_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_rotate_32.png b/session/src/main/res/drawable-xxhdpi/ic_rotate_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_rotate_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_rotate_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_scribble_save.png b/session/src/main/res/drawable-xxhdpi/ic_scribble_save.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_scribble_save.png
rename to session/src/main/res/drawable-xxhdpi/ic_scribble_save.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_scroll_down.png b/session/src/main/res/drawable-xxhdpi/ic_scroll_down.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_scroll_down.png
rename to session/src/main/res/drawable-xxhdpi/ic_scroll_down.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_security_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_security_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_security_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_security_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_select_all_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_select_all_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_select_all_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_select_all_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_select_off.png b/session/src/main/res/drawable-xxhdpi/ic_select_off.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_select_off.png
rename to session/src/main/res/drawable-xxhdpi/ic_select_off.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_select_on.png b/session/src/main/res/drawable-xxhdpi/ic_select_on.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_select_on.png
rename to session/src/main/res/drawable-xxhdpi/ic_select_on.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_send_push.png b/session/src/main/res/drawable-xxhdpi/ic_send_push.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_send_push.png
rename to session/src/main/res/drawable-xxhdpi/ic_send_push.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_send_push_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_send_push_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_send_push_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_send_push_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_send_sms_insecure.png b/session/src/main/res/drawable-xxhdpi/ic_send_sms_insecure.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_send_sms_insecure.png
rename to session/src/main/res/drawable-xxhdpi/ic_send_sms_insecure.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_send_sms_insecure_dark.png b/session/src/main/res/drawable-xxhdpi/ic_send_sms_insecure_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_send_sms_insecure_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_send_sms_insecure_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_send_sms_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_send_sms_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_send_sms_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_send_sms_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_share_black_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_share_black_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_share_black_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_share_black_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_signal_background_connection.png b/session/src/main/res/drawable-xxhdpi/ic_signal_background_connection.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_signal_background_connection.png
rename to session/src/main/res/drawable-xxhdpi/ic_signal_background_connection.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_signal_backup.png b/session/src/main/res/drawable-xxhdpi/ic_signal_backup.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_signal_backup.png
rename to session/src/main/res/drawable-xxhdpi/ic_signal_backup.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_signal_downloading.png b/session/src/main/res/drawable-xxhdpi/ic_signal_downloading.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_signal_downloading.png
rename to session/src/main/res/drawable-xxhdpi/ic_signal_downloading.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_switch_camera_32.png b/session/src/main/res/drawable-xxhdpi/ic_switch_camera_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_switch_camera_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_switch_camera_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_tag_faces_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_tag_faces_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_tag_faces_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_tag_faces_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_text_32.png b/session/src/main/res/drawable-xxhdpi/ic_text_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_text_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_text_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_textsms_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_textsms_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_textsms_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_textsms_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_textsms_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_textsms_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_textsms_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_textsms_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_timer.png b/session/src/main/res/drawable-xxhdpi/ic_timer.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_timer.png
rename to session/src/main/res/drawable-xxhdpi/ic_timer.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_timer_disabled.png b/session/src/main/res/drawable-xxhdpi/ic_timer_disabled.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_timer_disabled.png
rename to session/src/main/res/drawable-xxhdpi/ic_timer_disabled.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_timer_off_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_timer_off_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_timer_off_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_timer_off_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_trash_filled_32.png b/session/src/main/res/drawable-xxhdpi/ic_trash_filled_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_trash_filled_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_trash_filled_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_unarchive_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_unarchive_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_unarchive_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_unarchive_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_unarchive_white_36dp.png b/session/src/main/res/drawable-xxhdpi/ic_unarchive_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_unarchive_white_36dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_unarchive_white_36dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_undo_32.png b/session/src/main/res/drawable-xxhdpi/ic_undo_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_undo_32.png
rename to session/src/main/res/drawable-xxhdpi/ic_undo_32.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_unidentified_delivery.png b/session/src/main/res/drawable-xxhdpi/ic_unidentified_delivery.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_unidentified_delivery.png
rename to session/src/main/res/drawable-xxhdpi/ic_unidentified_delivery.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_unlocked_white_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_unlocked_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_unlocked_white_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_unlocked_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_unlocked_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_video_dark.png b/session/src/main/res/drawable-xxhdpi/ic_video_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_video_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_video_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_video_light.png b/session/src/main/res/drawable-xxhdpi/ic_video_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_video_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_video_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_videocam_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_videocam_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_videocam_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_videocam_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_videocam_white_48dp.png b/session/src/main/res/drawable-xxhdpi/ic_videocam_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_videocam_white_48dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_videocam_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_view_stream_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_view_stream_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_view_stream_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_view_stream_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_volume_off_grey600_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_volume_off_grey600_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_volume_off_grey600_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_volume_off_grey600_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_volume_off_white_18dp.png b/session/src/main/res/drawable-xxhdpi/ic_volume_off_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_volume_off_white_18dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_volume_off_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_volume_up_dark.png b/session/src/main/res/drawable-xxhdpi/ic_volume_up_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_volume_up_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_volume_up_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_volume_up_light.png b/session/src/main/res/drawable-xxhdpi/ic_volume_up_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_volume_up_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_volume_up_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_warning_dark.png b/session/src/main/res/drawable-xxhdpi/ic_warning_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_warning_dark.png
rename to session/src/main/res/drawable-xxhdpi/ic_warning_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_warning_light.png b/session/src/main/res/drawable-xxhdpi/ic_warning_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_warning_light.png
rename to session/src/main/res/drawable-xxhdpi/ic_warning_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_work_white_24dp.png b/session/src/main/res/drawable-xxhdpi/ic_work_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_work_white_24dp.png
rename to session/src/main/res/drawable-xxhdpi/ic_work_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_x_28.png b/session/src/main/res/drawable-xxhdpi/ic_x_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_x_28.png
rename to session/src/main/res/drawable-xxhdpi/ic_x_28.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/ic_x_circle.png b/session/src/main/res/drawable-xxhdpi/ic_x_circle.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/ic_x_circle.png
rename to session/src/main/res/drawable-xxhdpi/ic_x_circle.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/icon_cached.png b/session/src/main/res/drawable-xxhdpi/icon_cached.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/icon_cached.png
rename to session/src/main/res/drawable-xxhdpi/icon_cached.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/icon_dialog.png b/session/src/main/res/drawable-xxhdpi/icon_dialog.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/icon_dialog.png
rename to session/src/main/res/drawable-xxhdpi/icon_dialog.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/icon_transparent.png b/session/src/main/res/drawable-xxhdpi/icon_transparent.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/icon_transparent.png
rename to session/src/main/res/drawable-xxhdpi/icon_transparent.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/inbox_zero.png b/session/src/main/res/drawable-xxhdpi/inbox_zero.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/inbox_zero.png
rename to session/src/main/res/drawable-xxhdpi/inbox_zero.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/link_preview_splash.png b/session/src/main/res/drawable-xxhdpi/link_preview_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/link_preview_splash.png
rename to session/src/main/res/drawable-xxhdpi/link_preview_splash.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/lockscreen_watermark_dark.png b/session/src/main/res/drawable-xxhdpi/lockscreen_watermark_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/lockscreen_watermark_dark.png
rename to session/src/main/res/drawable-xxhdpi/lockscreen_watermark_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/lockscreen_watermark_light.png b/session/src/main/res/drawable-xxhdpi/lockscreen_watermark_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/lockscreen_watermark_light.png
rename to session/src/main/res/drawable-xxhdpi/lockscreen_watermark_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/love_heart.png b/session/src/main/res/drawable-xxhdpi/love_heart.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/love_heart.png
rename to session/src/main/res/drawable-xxhdpi/love_heart.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/message_24dp.png b/session/src/main/res/drawable-xxhdpi/message_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/message_24dp.png
rename to session/src/main/res/drawable-xxhdpi/message_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/no_contacts.png b/session/src/main/res/drawable-xxhdpi/no_contacts.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/no_contacts.png
rename to session/src/main/res/drawable-xxhdpi/no_contacts.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/phone_24dp.png b/session/src/main/res/drawable-xxhdpi/phone_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/phone_24dp.png
rename to session/src/main/res/drawable-xxhdpi/phone_24dp.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/poweredby_giphy.png b/session/src/main/res/drawable-xxhdpi/poweredby_giphy.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/poweredby_giphy.png
rename to session/src/main/res/drawable-xxhdpi/poweredby_giphy.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/profile_splash.png b/session/src/main/res/drawable-xxhdpi/profile_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/profile_splash.png
rename to session/src/main/res/drawable-xxhdpi/profile_splash.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/quick_camera_dark.png b/session/src/main/res/drawable-xxhdpi/quick_camera_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/quick_camera_dark.png
rename to session/src/main/res/drawable-xxhdpi/quick_camera_dark.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png b/session/src/main/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png
rename to session/src/main/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/quick_camera_front.png b/session/src/main/res/drawable-xxhdpi/quick_camera_front.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/quick_camera_front.png
rename to session/src/main/res/drawable-xxhdpi/quick_camera_front.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/quick_camera_fullscreen.png b/session/src/main/res/drawable-xxhdpi/quick_camera_fullscreen.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/quick_camera_fullscreen.png
rename to session/src/main/res/drawable-xxhdpi/quick_camera_fullscreen.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/quick_camera_hide.png b/session/src/main/res/drawable-xxhdpi/quick_camera_hide.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/quick_camera_hide.png
rename to session/src/main/res/drawable-xxhdpi/quick_camera_hide.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/quick_camera_light.png b/session/src/main/res/drawable-xxhdpi/quick_camera_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/quick_camera_light.png
rename to session/src/main/res/drawable-xxhdpi/quick_camera_light.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/quick_camera_rear.png b/session/src/main/res/drawable-xxhdpi/quick_camera_rear.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/quick_camera_rear.png
rename to session/src/main/res/drawable-xxhdpi/quick_camera_rear.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/quick_shutter_button.png b/session/src/main/res/drawable-xxhdpi/quick_shutter_button.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/quick_shutter_button.png
rename to session/src/main/res/drawable-xxhdpi/quick_shutter_button.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/splash_logo.png b/session/src/main/res/drawable-xxhdpi/splash_logo.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/splash_logo.png
rename to session/src/main/res/drawable-xxhdpi/splash_logo.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer00.png b/session/src/main/res/drawable-xxhdpi/timer00.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer00.png
rename to session/src/main/res/drawable-xxhdpi/timer00.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer05.png b/session/src/main/res/drawable-xxhdpi/timer05.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer05.png
rename to session/src/main/res/drawable-xxhdpi/timer05.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer10.png b/session/src/main/res/drawable-xxhdpi/timer10.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer10.png
rename to session/src/main/res/drawable-xxhdpi/timer10.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer15.png b/session/src/main/res/drawable-xxhdpi/timer15.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer15.png
rename to session/src/main/res/drawable-xxhdpi/timer15.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer20.png b/session/src/main/res/drawable-xxhdpi/timer20.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer20.png
rename to session/src/main/res/drawable-xxhdpi/timer20.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer25.png b/session/src/main/res/drawable-xxhdpi/timer25.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer25.png
rename to session/src/main/res/drawable-xxhdpi/timer25.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer30.png b/session/src/main/res/drawable-xxhdpi/timer30.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer30.png
rename to session/src/main/res/drawable-xxhdpi/timer30.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer35.png b/session/src/main/res/drawable-xxhdpi/timer35.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer35.png
rename to session/src/main/res/drawable-xxhdpi/timer35.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer40.png b/session/src/main/res/drawable-xxhdpi/timer40.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer40.png
rename to session/src/main/res/drawable-xxhdpi/timer40.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer45.png b/session/src/main/res/drawable-xxhdpi/timer45.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer45.png
rename to session/src/main/res/drawable-xxhdpi/timer45.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer50.png b/session/src/main/res/drawable-xxhdpi/timer50.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer50.png
rename to session/src/main/res/drawable-xxhdpi/timer50.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer55.png b/session/src/main/res/drawable-xxhdpi/timer55.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer55.png
rename to session/src/main/res/drawable-xxhdpi/timer55.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/timer60.png b/session/src/main/res/drawable-xxhdpi/timer60.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/timer60.png
rename to session/src/main/res/drawable-xxhdpi/timer60.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/video_splash.png b/session/src/main/res/drawable-xxhdpi/video_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/video_splash.png
rename to session/src/main/res/drawable-xxhdpi/video_splash.png
diff --git a/messenger/src/main/res/drawable-xxhdpi/welcome.png b/session/src/main/res/drawable-xxhdpi/welcome.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxhdpi/welcome.png
rename to session/src/main/res/drawable-xxhdpi/welcome.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/baseline_account_circle_white_24.png b/session/src/main/res/drawable-xxxhdpi/baseline_account_circle_white_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/baseline_account_circle_white_24.png
rename to session/src/main/res/drawable-xxxhdpi/baseline_account_circle_white_24.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/baseline_email_white_24.png b/session/src/main/res/drawable-xxxhdpi/baseline_email_white_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/baseline_email_white_24.png
rename to session/src/main/res/drawable-xxxhdpi/baseline_email_white_24.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/clear_profile_avatar.png b/session/src/main/res/drawable-xxxhdpi/clear_profile_avatar.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/clear_profile_avatar.png
rename to session/src/main/res/drawable-xxxhdpi/clear_profile_avatar.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/conversation_list_empty_state.png b/session/src/main/res/drawable-xxxhdpi/conversation_list_empty_state.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/conversation_list_empty_state.png
rename to session/src/main/res/drawable-xxxhdpi/conversation_list_empty_state.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/empty_inbox_1.png b/session/src/main/res/drawable-xxxhdpi/empty_inbox_1.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/empty_inbox_1.png
rename to session/src/main/res/drawable-xxxhdpi/empty_inbox_1.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/empty_inbox_2.png b/session/src/main/res/drawable-xxxhdpi/empty_inbox_2.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/empty_inbox_2.png
rename to session/src/main/res/drawable-xxxhdpi/empty_inbox_2.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/empty_inbox_3.png b/session/src/main/res/drawable-xxxhdpi/empty_inbox_3.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/empty_inbox_3.png
rename to session/src/main/res/drawable-xxxhdpi/empty_inbox_3.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/empty_inbox_4.png b/session/src/main/res/drawable-xxxhdpi/empty_inbox_4.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/empty_inbox_4.png
rename to session/src/main/res/drawable-xxxhdpi/empty_inbox_4.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/empty_inbox_5.png b/session/src/main/res/drawable-xxxhdpi/empty_inbox_5.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/empty_inbox_5.png
rename to session/src/main/res/drawable-xxxhdpi/empty_inbox_5.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_add_caption_36.png b/session/src/main/res/drawable-xxxhdpi/ic_add_caption_36.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_add_caption_36.png
rename to session/src/main/res/drawable-xxxhdpi/ic_add_caption_36.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_add_photo.png b/session/src/main/res/drawable-xxxhdpi/ic_add_photo.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_add_photo.png
rename to session/src/main/res/drawable-xxxhdpi/ic_add_photo.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_add_white_original_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_add_white_original_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_add_white_original_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_add_white_original_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_advanced_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_advanced_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_advanced_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_advanced_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_archive_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_archive_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_archive_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_archive_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_archive_white_36dp.png b/session/src/main/res/drawable-xxxhdpi/ic_archive_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_archive_white_36dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_archive_white_36dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_arrow_right.png b/session/src/main/res/drawable-xxxhdpi/ic_arrow_right.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_arrow_right.png
rename to session/src/main/res/drawable-xxxhdpi/ic_arrow_right.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_arrow_up.png b/session/src/main/res/drawable-xxxhdpi/ic_arrow_up.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_arrow_up.png
rename to session/src/main/res/drawable-xxxhdpi/ic_arrow_up.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_block_grey600_18dp.png b/session/src/main/res/drawable-xxxhdpi/ic_block_grey600_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_block_grey600_18dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_block_grey600_18dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_block_white_18dp.png b/session/src/main/res/drawable-xxxhdpi/ic_block_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_block_white_18dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_block_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_block_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_block_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_block_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_block_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_bluetooth_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_bluetooth_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_bluetooth_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_bluetooth_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_broken_link.png b/session/src/main/res/drawable-xxxhdpi/ic_broken_link.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_broken_link.png
rename to session/src/main/res/drawable-xxxhdpi/ic_broken_link.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_brush_highlight_32.png b/session/src/main/res/drawable-xxxhdpi/ic_brush_highlight_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_brush_highlight_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_brush_highlight_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_brush_marker_32.png b/session/src/main/res/drawable-xxxhdpi/ic_brush_marker_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_brush_marker_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_brush_marker_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_call_end_grey600_32dp.png b/session/src/main/res/drawable-xxxhdpi/ic_call_end_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_call_end_grey600_32dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_call_end_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_call_end_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_call_end_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_call_end_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_call_end_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_camera_filled_24.png b/session/src/main/res/drawable-xxxhdpi/ic_camera_filled_24.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_camera_filled_24.png
rename to session/src/main/res/drawable-xxxhdpi/ic_camera_filled_24.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_camera_shutter.png b/session/src/main/res/drawable-xxxhdpi/ic_camera_shutter.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_camera_shutter.png
rename to session/src/main/res/drawable-xxxhdpi/ic_camera_shutter.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_camera_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_camera_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_camera_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_camera_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_caption_28.png b/session/src/main/res/drawable-xxxhdpi/ic_caption_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_caption_28.png
rename to session/src/main/res/drawable-xxxhdpi/ic_caption_28.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_check_circle_32.png b/session/src/main/res/drawable-xxxhdpi/ic_check_circle_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_check_circle_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_check_circle_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_check_circle_white_18dp.png b/session/src/main/res/drawable-xxxhdpi/ic_check_circle_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_check_circle_white_18dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_check_circle_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_check_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_check_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_check_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_check_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_close_grey600_32dp.png b/session/src/main/res/drawable-xxxhdpi/ic_close_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_close_grey600_32dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_close_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_close_white_18dp.png b/session/src/main/res/drawable-xxxhdpi/ic_close_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_close_white_18dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_close_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_close_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_close_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_close_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_close_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_contact_picture_large.png b/session/src/main/res/drawable-xxxhdpi/ic_contact_picture_large.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_contact_picture_large.png
rename to session/src/main/res/drawable-xxxhdpi/ic_contact_picture_large.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_contacts_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_contacts_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_contacts_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_contacts_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_create_album_filled_32.png b/session/src/main/res/drawable-xxxhdpi/ic_create_album_filled_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_create_album_filled_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_create_album_filled_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_create_album_outline_32.png b/session/src/main/res/drawable-xxxhdpi/ic_create_album_outline_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_create_album_outline_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_create_album_outline_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_crop_32.png b/session/src/main/res/drawable-xxxhdpi/ic_crop_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_crop_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_crop_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_crop_lock_32.png b/session/src/main/res/drawable-xxxhdpi/ic_crop_lock_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_crop_lock_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_crop_lock_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_crop_unlock_32.png b/session/src/main/res/drawable-xxxhdpi/ic_crop_unlock_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_crop_unlock_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_crop_unlock_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_dashboard_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_dashboard_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_dashboard_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_dashboard_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_delivery_status_delivered.png b/session/src/main/res/drawable-xxxhdpi/ic_delivery_status_delivered.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_delivery_status_delivered.png
rename to session/src/main/res/drawable-xxxhdpi/ic_delivery_status_delivered.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_delivery_status_read.png b/session/src/main/res/drawable-xxxhdpi/ic_delivery_status_read.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_delivery_status_read.png
rename to session/src/main/res/drawable-xxxhdpi/ic_delivery_status_read.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_delivery_status_sending.png b/session/src/main/res/drawable-xxxhdpi/ic_delivery_status_sending.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_delivery_status_sending.png
rename to session/src/main/res/drawable-xxxhdpi/ic_delivery_status_sending.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_delivery_status_sent.png b/session/src/main/res/drawable-xxxhdpi/ic_delivery_status_sent.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_delivery_status_sent.png
rename to session/src/main/res/drawable-xxxhdpi/ic_delivery_status_sent.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_devices_white.png b/session/src/main/res/drawable-xxxhdpi/ic_devices_white.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_devices_white.png
rename to session/src/main/res/drawable-xxxhdpi/ic_devices_white.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_dialpad_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_dialpad_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_dialpad_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_dialpad_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_document_large_dark.png b/session/src/main/res/drawable-xxxhdpi/ic_document_large_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_document_large_dark.png
rename to session/src/main/res/drawable-xxxhdpi/ic_document_large_dark.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_document_large_light.png b/session/src/main/res/drawable-xxxhdpi/ic_document_large_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_document_large_light.png
rename to session/src/main/res/drawable-xxxhdpi/ic_document_large_light.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_document_small_dark.png b/session/src/main/res/drawable-xxxhdpi/ic_document_small_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_document_small_dark.png
rename to session/src/main/res/drawable-xxxhdpi/ic_document_small_dark.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_document_small_light.png b/session/src/main/res/drawable-xxxhdpi/ic_document_small_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_document_small_light.png
rename to session/src/main/res/drawable-xxxhdpi/ic_document_small_light.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_download_circle_fill_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_download_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_download_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_download_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_emoji_32.png b/session/src/main/res/drawable-xxxhdpi/ic_emoji_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_emoji_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_emoji_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_error.png b/session/src/main/res/drawable-xxxhdpi/ic_error.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_error.png
rename to session/src/main/res/drawable-xxxhdpi/ic_error.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_face_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_face_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_face_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_face_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_favorite_grey600_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_favorite_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_favorite_grey600_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_favorite_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png b/session/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_fingerprint_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_fingerprint_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_fingerprint_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_fingerprint_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_flip_32.png b/session/src/main/res/drawable-xxxhdpi/ic_flip_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_flip_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_flip_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_forum_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_forum_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_forum_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_forum_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_gif_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_gif_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_gif_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_gif_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_info_white_18dp.png b/session/src/main/res/drawable-xxxhdpi/ic_info_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_info_white_18dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_info_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_insert_drive_file_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_laptop_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_laptop_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_laptop_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_laptop_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_local_dining_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_local_dining_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_local_dining_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_local_dining_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_lock_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_lock_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_lock_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_lock_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_menu_lock_dark.png b/session/src/main/res/drawable-xxxhdpi/ic_menu_lock_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_menu_lock_dark.png
rename to session/src/main/res/drawable-xxxhdpi/ic_menu_lock_dark.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_message_black_18dp.png b/session/src/main/res/drawable-xxxhdpi/ic_message_black_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_message_black_18dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_message_black_18dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_message_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_message_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_message_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_message_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_mic_off_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_mic_off_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_mic_off_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_mic_off_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_mic_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_mic_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_mic_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_mic_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_note_to_self.png b/session/src/main/res/drawable-xxxhdpi/ic_note_to_self.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_note_to_self.png
rename to session/src/main/res/drawable-xxxhdpi/ic_note_to_self.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_person_add_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_person_add_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_person_add_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_person_add_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_pets_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_pets_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_pets_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_pets_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_phone_grey600_32dp.png b/session/src/main/res/drawable-xxxhdpi/ic_phone_grey600_32dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_phone_grey600_32dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_phone_grey600_32dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_photo_camera_dark.png b/session/src/main/res/drawable-xxxhdpi/ic_photo_camera_dark.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_photo_camera_dark.png
rename to session/src/main/res/drawable-xxxhdpi/ic_photo_camera_dark.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_photo_camera_light.png b/session/src/main/res/drawable-xxxhdpi/ic_photo_camera_light.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_photo_camera_light.png
rename to session/src/main/res/drawable-xxxhdpi/ic_photo_camera_light.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_photo_camera_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_photo_camera_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_photo_camera_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_photo_camera_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_photo_library_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_photo_library_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_photo_library_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_photo_library_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_profile_camera.png b/session/src/main/res/drawable-xxxhdpi/ic_profile_camera.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_profile_camera.png
rename to session/src/main/res/drawable-xxxhdpi/ic_profile_camera.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_profile_default.png b/session/src/main/res/drawable-xxxhdpi/ic_profile_default.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_profile_default.png
rename to session/src/main/res/drawable-xxxhdpi/ic_profile_default.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.png b/session/src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_reply_white_36dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_restore_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_restore_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_restore_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_restore_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_rotate_32.png b/session/src/main/res/drawable-xxxhdpi/ic_rotate_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_rotate_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_rotate_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_scribble_save.png b/session/src/main/res/drawable-xxxhdpi/ic_scribble_save.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_scribble_save.png
rename to session/src/main/res/drawable-xxxhdpi/ic_scribble_save.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_scroll_down.png b/session/src/main/res/drawable-xxxhdpi/ic_scroll_down.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_scroll_down.png
rename to session/src/main/res/drawable-xxxhdpi/ic_scroll_down.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_select_off.png b/session/src/main/res/drawable-xxxhdpi/ic_select_off.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_select_off.png
rename to session/src/main/res/drawable-xxxhdpi/ic_select_off.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_select_on.png b/session/src/main/res/drawable-xxxhdpi/ic_select_on.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_select_on.png
rename to session/src/main/res/drawable-xxxhdpi/ic_select_on.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_send_push_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_send_push_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_send_push_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_send_push_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_send_sms_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_send_sms_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_send_sms_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_send_sms_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_share_black_18dp.png b/session/src/main/res/drawable-xxxhdpi/ic_share_black_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_share_black_18dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_share_black_18dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.png b/session/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.png
rename to session/src/main/res/drawable-xxxhdpi/ic_signal_background_connection.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_signal_backup.png b/session/src/main/res/drawable-xxxhdpi/ic_signal_backup.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_signal_backup.png
rename to session/src/main/res/drawable-xxxhdpi/ic_signal_backup.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_signal_downloading.png b/session/src/main/res/drawable-xxxhdpi/ic_signal_downloading.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_signal_downloading.png
rename to session/src/main/res/drawable-xxxhdpi/ic_signal_downloading.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_switch_camera_32.png b/session/src/main/res/drawable-xxxhdpi/ic_switch_camera_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_switch_camera_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_switch_camera_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_text_32.png b/session/src/main/res/drawable-xxxhdpi/ic_text_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_text_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_text_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_textsms_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_textsms_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_textsms_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_textsms_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_textsms_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_textsms_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_textsms_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_textsms_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_timer.png b/session/src/main/res/drawable-xxxhdpi/ic_timer.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_timer.png
rename to session/src/main/res/drawable-xxxhdpi/ic_timer.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_timer_disabled.png b/session/src/main/res/drawable-xxxhdpi/ic_timer_disabled.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_timer_disabled.png
rename to session/src/main/res/drawable-xxxhdpi/ic_timer_disabled.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_timer_off_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_timer_off_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_timer_off_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_timer_off_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_trash_filled_32.png b/session/src/main/res/drawable-xxxhdpi/ic_trash_filled_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_trash_filled_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_trash_filled_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_unarchive_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_unarchive_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_unarchive_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_unarchive_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_unarchive_white_36dp.png b/session/src/main/res/drawable-xxxhdpi/ic_unarchive_white_36dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_unarchive_white_36dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_unarchive_white_36dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_undo_32.png b/session/src/main/res/drawable-xxxhdpi/ic_undo_32.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_undo_32.png
rename to session/src/main/res/drawable-xxxhdpi/ic_undo_32.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_unidentified_delivery.png b/session/src/main/res/drawable-xxxhdpi/ic_unidentified_delivery.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_unidentified_delivery.png
rename to session/src/main/res/drawable-xxxhdpi/ic_unidentified_delivery.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_unlocked_white_18dp.png b/session/src/main/res/drawable-xxxhdpi/ic_unlocked_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_unlocked_white_18dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_unlocked_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_videocam_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_videocam_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_videocam_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_videocam_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_videocam_white_48dp.png b/session/src/main/res/drawable-xxxhdpi/ic_videocam_white_48dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_videocam_white_48dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_videocam_white_48dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_view_stream_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_view_stream_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_view_stream_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_view_stream_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.png b/session/src/main/res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_volume_off_grey600_18dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_volume_off_white_18dp.png b/session/src/main/res/drawable-xxxhdpi/ic_volume_off_white_18dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_volume_off_white_18dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_volume_off_white_18dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_work_white_24dp.png b/session/src/main/res/drawable-xxxhdpi/ic_work_white_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_work_white_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/ic_work_white_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_x_28.png b/session/src/main/res/drawable-xxxhdpi/ic_x_28.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_x_28.png
rename to session/src/main/res/drawable-xxxhdpi/ic_x_28.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/ic_x_circle.png b/session/src/main/res/drawable-xxxhdpi/ic_x_circle.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/ic_x_circle.png
rename to session/src/main/res/drawable-xxxhdpi/ic_x_circle.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/icon_cached.png b/session/src/main/res/drawable-xxxhdpi/icon_cached.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/icon_cached.png
rename to session/src/main/res/drawable-xxxhdpi/icon_cached.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/icon_transparent.png b/session/src/main/res/drawable-xxxhdpi/icon_transparent.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/icon_transparent.png
rename to session/src/main/res/drawable-xxxhdpi/icon_transparent.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/inbox_zero.png b/session/src/main/res/drawable-xxxhdpi/inbox_zero.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/inbox_zero.png
rename to session/src/main/res/drawable-xxxhdpi/inbox_zero.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/link_preview_splash.png b/session/src/main/res/drawable-xxxhdpi/link_preview_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/link_preview_splash.png
rename to session/src/main/res/drawable-xxxhdpi/link_preview_splash.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/love_heart.png b/session/src/main/res/drawable-xxxhdpi/love_heart.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/love_heart.png
rename to session/src/main/res/drawable-xxxhdpi/love_heart.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/message_24dp.png b/session/src/main/res/drawable-xxxhdpi/message_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/message_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/message_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/no_contacts.png b/session/src/main/res/drawable-xxxhdpi/no_contacts.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/no_contacts.png
rename to session/src/main/res/drawable-xxxhdpi/no_contacts.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/phone_24dp.png b/session/src/main/res/drawable-xxxhdpi/phone_24dp.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/phone_24dp.png
rename to session/src/main/res/drawable-xxxhdpi/phone_24dp.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/poweredby_giphy.png b/session/src/main/res/drawable-xxxhdpi/poweredby_giphy.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/poweredby_giphy.png
rename to session/src/main/res/drawable-xxxhdpi/poweredby_giphy.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/profile_splash.png b/session/src/main/res/drawable-xxxhdpi/profile_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/profile_splash.png
rename to session/src/main/res/drawable-xxxhdpi/profile_splash.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer00.png b/session/src/main/res/drawable-xxxhdpi/timer00.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer00.png
rename to session/src/main/res/drawable-xxxhdpi/timer00.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer05.png b/session/src/main/res/drawable-xxxhdpi/timer05.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer05.png
rename to session/src/main/res/drawable-xxxhdpi/timer05.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer10.png b/session/src/main/res/drawable-xxxhdpi/timer10.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer10.png
rename to session/src/main/res/drawable-xxxhdpi/timer10.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer15.png b/session/src/main/res/drawable-xxxhdpi/timer15.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer15.png
rename to session/src/main/res/drawable-xxxhdpi/timer15.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer20.png b/session/src/main/res/drawable-xxxhdpi/timer20.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer20.png
rename to session/src/main/res/drawable-xxxhdpi/timer20.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer25.png b/session/src/main/res/drawable-xxxhdpi/timer25.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer25.png
rename to session/src/main/res/drawable-xxxhdpi/timer25.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer30.png b/session/src/main/res/drawable-xxxhdpi/timer30.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer30.png
rename to session/src/main/res/drawable-xxxhdpi/timer30.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer35.png b/session/src/main/res/drawable-xxxhdpi/timer35.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer35.png
rename to session/src/main/res/drawable-xxxhdpi/timer35.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer40.png b/session/src/main/res/drawable-xxxhdpi/timer40.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer40.png
rename to session/src/main/res/drawable-xxxhdpi/timer40.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer45.png b/session/src/main/res/drawable-xxxhdpi/timer45.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer45.png
rename to session/src/main/res/drawable-xxxhdpi/timer45.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer50.png b/session/src/main/res/drawable-xxxhdpi/timer50.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer50.png
rename to session/src/main/res/drawable-xxxhdpi/timer50.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer55.png b/session/src/main/res/drawable-xxxhdpi/timer55.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer55.png
rename to session/src/main/res/drawable-xxxhdpi/timer55.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/timer60.png b/session/src/main/res/drawable-xxxhdpi/timer60.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/timer60.png
rename to session/src/main/res/drawable-xxxhdpi/timer60.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/video_splash.png b/session/src/main/res/drawable-xxxhdpi/video_splash.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/video_splash.png
rename to session/src/main/res/drawable-xxxhdpi/video_splash.png
diff --git a/messenger/src/main/res/drawable-xxxhdpi/welcome.png b/session/src/main/res/drawable-xxxhdpi/welcome.png
similarity index 100%
rename from messenger/src/main/res/drawable-xxxhdpi/welcome.png
rename to session/src/main/res/drawable-xxxhdpi/welcome.png
diff --git a/messenger/src/main/res/drawable/accent_dot.xml b/session/src/main/res/drawable/accent_dot.xml
similarity index 100%
rename from messenger/src/main/res/drawable/accent_dot.xml
rename to session/src/main/res/drawable/accent_dot.xml
diff --git a/messenger/src/main/res/drawable/archived_indicator_background.xml b/session/src/main/res/drawable/archived_indicator_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/archived_indicator_background.xml
rename to session/src/main/res/drawable/archived_indicator_background.xml
diff --git a/messenger/src/main/res/drawable/avatar_gradient_dark.xml b/session/src/main/res/drawable/avatar_gradient_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/avatar_gradient_dark.xml
rename to session/src/main/res/drawable/avatar_gradient_dark.xml
diff --git a/messenger/src/main/res/drawable/avatar_gradient_light.xml b/session/src/main/res/drawable/avatar_gradient_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/avatar_gradient_light.xml
rename to session/src/main/res/drawable/avatar_gradient_light.xml
diff --git a/messenger/src/main/res/drawable/background_pattern.png b/session/src/main/res/drawable/background_pattern.png
similarity index 100%
rename from messenger/src/main/res/drawable/background_pattern.png
rename to session/src/main/res/drawable/background_pattern.png
diff --git a/messenger/src/main/res/drawable/background_pattern_repeat.xml b/session/src/main/res/drawable/background_pattern_repeat.xml
similarity index 100%
rename from messenger/src/main/res/drawable/background_pattern_repeat.xml
rename to session/src/main/res/drawable/background_pattern_repeat.xml
diff --git a/messenger/src/main/res/drawable/circle_alpha.xml b/session/src/main/res/drawable/circle_alpha.xml
similarity index 100%
rename from messenger/src/main/res/drawable/circle_alpha.xml
rename to session/src/main/res/drawable/circle_alpha.xml
diff --git a/messenger/src/main/res/drawable/circle_tintable.xml b/session/src/main/res/drawable/circle_tintable.xml
similarity index 100%
rename from messenger/src/main/res/drawable/circle_tintable.xml
rename to session/src/main/res/drawable/circle_tintable.xml
diff --git a/messenger/src/main/res/drawable/circle_tintable_4dp_inset.xml b/session/src/main/res/drawable/circle_tintable_4dp_inset.xml
similarity index 100%
rename from messenger/src/main/res/drawable/circle_tintable_4dp_inset.xml
rename to session/src/main/res/drawable/circle_tintable_4dp_inset.xml
diff --git a/messenger/src/main/res/drawable/circle_touch_highlight_background.xml b/session/src/main/res/drawable/circle_touch_highlight_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/circle_touch_highlight_background.xml
rename to session/src/main/res/drawable/circle_touch_highlight_background.xml
diff --git a/messenger/src/main/res/drawable/circle_white.xml b/session/src/main/res/drawable/circle_white.xml
similarity index 100%
rename from messenger/src/main/res/drawable/circle_white.xml
rename to session/src/main/res/drawable/circle_white.xml
diff --git a/messenger/src/main/res/drawable/clickable_card_dark.xml b/session/src/main/res/drawable/clickable_card_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/clickable_card_dark.xml
rename to session/src/main/res/drawable/clickable_card_dark.xml
diff --git a/messenger/src/main/res/drawable/clickable_card_light.xml b/session/src/main/res/drawable/clickable_card_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/clickable_card_light.xml
rename to session/src/main/res/drawable/clickable_card_light.xml
diff --git a/messenger/src/main/res/drawable/colorpickerpreference_pref_swatch.xml b/session/src/main/res/drawable/colorpickerpreference_pref_swatch.xml
similarity index 100%
rename from messenger/src/main/res/drawable/colorpickerpreference_pref_swatch.xml
rename to session/src/main/res/drawable/colorpickerpreference_pref_swatch.xml
diff --git a/messenger/src/main/res/drawable/compose_background_camera.xml b/session/src/main/res/drawable/compose_background_camera.xml
similarity index 100%
rename from messenger/src/main/res/drawable/compose_background_camera.xml
rename to session/src/main/res/drawable/compose_background_camera.xml
diff --git a/messenger/src/main/res/drawable/compose_background_dark.xml b/session/src/main/res/drawable/compose_background_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/compose_background_dark.xml
rename to session/src/main/res/drawable/compose_background_dark.xml
diff --git a/messenger/src/main/res/drawable/compose_background_light.xml b/session/src/main/res/drawable/compose_background_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/compose_background_light.xml
rename to session/src/main/res/drawable/compose_background_light.xml
diff --git a/messenger/src/main/res/drawable/compose_divider_background.xml b/session/src/main/res/drawable/compose_divider_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/compose_divider_background.xml
rename to session/src/main/res/drawable/compose_divider_background.xml
diff --git a/messenger/src/main/res/drawable/contact_list_divider_dark.xml b/session/src/main/res/drawable/contact_list_divider_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/contact_list_divider_dark.xml
rename to session/src/main/res/drawable/contact_list_divider_dark.xml
diff --git a/messenger/src/main/res/drawable/contact_list_divider_light.xml b/session/src/main/res/drawable/contact_list_divider_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/contact_list_divider_light.xml
rename to session/src/main/res/drawable/contact_list_divider_light.xml
diff --git a/messenger/src/main/res/drawable/contact_photo_background.xml b/session/src/main/res/drawable/contact_photo_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/contact_photo_background.xml
rename to session/src/main/res/drawable/contact_photo_background.xml
diff --git a/messenger/src/main/res/drawable/conversation_attachment_close_circle.xml b/session/src/main/res/drawable/conversation_attachment_close_circle.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_attachment_close_circle.xml
rename to session/src/main/res/drawable/conversation_attachment_close_circle.xml
diff --git a/messenger/src/main/res/drawable/conversation_attachment_edit.xml b/session/src/main/res/drawable/conversation_attachment_edit.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_attachment_edit.xml
rename to session/src/main/res/drawable/conversation_attachment_edit.xml
diff --git a/messenger/src/main/res/drawable/conversation_home_touch_highlight.xml b/session/src/main/res/drawable/conversation_home_touch_highlight.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_home_touch_highlight.xml
rename to session/src/main/res/drawable/conversation_home_touch_highlight.xml
diff --git a/messenger/src/main/res/drawable/conversation_item_background.xml b/session/src/main/res/drawable/conversation_item_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_item_background.xml
rename to session/src/main/res/drawable/conversation_item_background.xml
diff --git a/messenger/src/main/res/drawable/conversation_item_background_animated.xml b/session/src/main/res/drawable/conversation_item_background_animated.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_item_background_animated.xml
rename to session/src/main/res/drawable/conversation_item_background_animated.xml
diff --git a/messenger/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml b/session/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml
rename to session/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml
diff --git a/messenger/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml b/session/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml
rename to session/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml
diff --git a/messenger/src/main/res/drawable/conversation_list_divider_shape.xml b/session/src/main/res/drawable/conversation_list_divider_shape.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_list_divider_shape.xml
rename to session/src/main/res/drawable/conversation_list_divider_shape.xml
diff --git a/messenger/src/main/res/drawable/conversation_list_divider_shape_dark.xml b/session/src/main/res/drawable/conversation_list_divider_shape_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_list_divider_shape_dark.xml
rename to session/src/main/res/drawable/conversation_list_divider_shape_dark.xml
diff --git a/messenger/src/main/res/drawable/conversation_list_item_background.xml b/session/src/main/res/drawable/conversation_list_item_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_list_item_background.xml
rename to session/src/main/res/drawable/conversation_list_item_background.xml
diff --git a/messenger/src/main/res/drawable/conversation_list_item_background_dark.xml b/session/src/main/res/drawable/conversation_list_item_background_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_list_item_background_dark.xml
rename to session/src/main/res/drawable/conversation_list_item_background_dark.xml
diff --git a/messenger/src/main/res/drawable/conversation_view_background.xml b/session/src/main/res/drawable/conversation_view_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/conversation_view_background.xml
rename to session/src/main/res/drawable/conversation_view_background.xml
diff --git a/messenger/src/main/res/drawable/default_bottom_sheet_background.xml b/session/src/main/res/drawable/default_bottom_sheet_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/default_bottom_sheet_background.xml
rename to session/src/main/res/drawable/default_bottom_sheet_background.xml
diff --git a/messenger/src/main/res/drawable/default_bottom_sheet_background_inset.xml b/session/src/main/res/drawable/default_bottom_sheet_background_inset.xml
similarity index 100%
rename from messenger/src/main/res/drawable/default_bottom_sheet_background_inset.xml
rename to session/src/main/res/drawable/default_bottom_sheet_background_inset.xml
diff --git a/messenger/src/main/res/drawable/default_dialog_background.xml b/session/src/main/res/drawable/default_dialog_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/default_dialog_background.xml
rename to session/src/main/res/drawable/default_dialog_background.xml
diff --git a/messenger/src/main/res/drawable/default_dialog_background_inset.xml b/session/src/main/res/drawable/default_dialog_background_inset.xml
similarity index 100%
rename from messenger/src/main/res/drawable/default_dialog_background_inset.xml
rename to session/src/main/res/drawable/default_dialog_background_inset.xml
diff --git a/messenger/src/main/res/drawable/default_session_background.xml b/session/src/main/res/drawable/default_session_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/default_session_background.xml
rename to session/src/main/res/drawable/default_session_background.xml
diff --git a/messenger/src/main/res/drawable/default_session_progress.xml b/session/src/main/res/drawable/default_session_progress.xml
similarity index 100%
rename from messenger/src/main/res/drawable/default_session_progress.xml
rename to session/src/main/res/drawable/default_session_progress.xml
diff --git a/messenger/src/main/res/drawable/destructive_dialog_button_background.xml b/session/src/main/res/drawable/destructive_dialog_button_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/destructive_dialog_button_background.xml
rename to session/src/main/res/drawable/destructive_dialog_button_background.xml
diff --git a/messenger/src/main/res/drawable/dialog_background.xml b/session/src/main/res/drawable/dialog_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/dialog_background.xml
rename to session/src/main/res/drawable/dialog_background.xml
diff --git a/messenger/src/main/res/drawable/dismiss_background.xml b/session/src/main/res/drawable/dismiss_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/dismiss_background.xml
rename to session/src/main/res/drawable/dismiss_background.xml
diff --git a/messenger/src/main/res/drawable/emoji_variation_selector_background_dark.xml b/session/src/main/res/drawable/emoji_variation_selector_background_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/emoji_variation_selector_background_dark.xml
rename to session/src/main/res/drawable/emoji_variation_selector_background_dark.xml
diff --git a/messenger/src/main/res/drawable/emoji_variation_selector_background_light.xml b/session/src/main/res/drawable/emoji_variation_selector_background_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/emoji_variation_selector_background_light.xml
rename to session/src/main/res/drawable/emoji_variation_selector_background_light.xml
diff --git a/messenger/src/main/res/drawable/error_round.xml b/session/src/main/res/drawable/error_round.xml
similarity index 100%
rename from messenger/src/main/res/drawable/error_round.xml
rename to session/src/main/res/drawable/error_round.xml
diff --git a/messenger/src/main/res/drawable/fake_chat_view_incoming_message_background.xml b/session/src/main/res/drawable/fake_chat_view_incoming_message_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/fake_chat_view_incoming_message_background.xml
rename to session/src/main/res/drawable/fake_chat_view_incoming_message_background.xml
diff --git a/messenger/src/main/res/drawable/fake_chat_view_outgoing_message_background.xml b/session/src/main/res/drawable/fake_chat_view_outgoing_message_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/fake_chat_view_outgoing_message_background.xml
rename to session/src/main/res/drawable/fake_chat_view_outgoing_message_background.xml
diff --git a/messenger/src/main/res/drawable/home_activity_gradient.xml b/session/src/main/res/drawable/home_activity_gradient.xml
similarity index 100%
rename from messenger/src/main/res/drawable/home_activity_gradient.xml
rename to session/src/main/res/drawable/home_activity_gradient.xml
diff --git a/messenger/src/main/res/drawable/ic_advanced_24dp.xml b/session/src/main/res/drawable/ic_advanced_24dp.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_advanced_24dp.xml
rename to session/src/main/res/drawable/ic_advanced_24dp.xml
diff --git a/messenger/src/main/res/drawable/ic_arrow_down.xml b/session/src/main/res/drawable/ic_arrow_down.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_arrow_down.xml
rename to session/src/main/res/drawable/ic_arrow_down.xml
diff --git a/messenger/src/main/res/drawable/ic_arrow_down_circle_filled.xml b/session/src/main/res/drawable/ic_arrow_down_circle_filled.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_arrow_down_circle_filled.xml
rename to session/src/main/res/drawable/ic_arrow_down_circle_filled.xml
diff --git a/messenger/src/main/res/drawable/ic_arrow_up_circle_24.xml b/session/src/main/res/drawable/ic_arrow_up_circle_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_arrow_up_circle_24.xml
rename to session/src/main/res/drawable/ic_arrow_up_circle_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_add_24.xml b/session/src/main/res/drawable/ic_baseline_add_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_add_24.xml
rename to session/src/main/res/drawable/ic_baseline_add_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/session/src/main/res/drawable/ic_baseline_arrow_back_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_arrow_back_24.xml
rename to session/src/main/res/drawable/ic_baseline_arrow_back_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_arrow_back_compact_24.xml b/session/src/main/res/drawable/ic_baseline_arrow_back_compact_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_arrow_back_compact_24.xml
rename to session/src/main/res/drawable/ic_baseline_arrow_back_compact_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_arrow_forward_24.xml b/session/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
rename to session/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_block_24.xml b/session/src/main/res/drawable/ic_baseline_block_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_block_24.xml
rename to session/src/main/res/drawable/ic_baseline_block_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_call_split_24.xml b/session/src/main/res/drawable/ic_baseline_call_split_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_call_split_24.xml
rename to session/src/main/res/drawable/ic_baseline_call_split_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_clear_24.xml b/session/src/main/res/drawable/ic_baseline_clear_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_clear_24.xml
rename to session/src/main/res/drawable/ic_baseline_clear_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_dashboard_24.xml b/session/src/main/res/drawable/ic_baseline_dashboard_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_dashboard_24.xml
rename to session/src/main/res/drawable/ic_baseline_dashboard_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_delete_24.xml b/session/src/main/res/drawable/ic_baseline_delete_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_delete_24.xml
rename to session/src/main/res/drawable/ic_baseline_delete_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_done_24.xml b/session/src/main/res/drawable/ic_baseline_done_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_done_24.xml
rename to session/src/main/res/drawable/ic_baseline_done_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_edit_24.xml b/session/src/main/res/drawable/ic_baseline_edit_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_edit_24.xml
rename to session/src/main/res/drawable/ic_baseline_edit_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_file_copy_24.xml b/session/src/main/res/drawable/ic_baseline_file_copy_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_file_copy_24.xml
rename to session/src/main/res/drawable/ic_baseline_file_copy_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_folder_24.xml b/session/src/main/res/drawable/ic_baseline_folder_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_folder_24.xml
rename to session/src/main/res/drawable/ic_baseline_folder_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_folder_48.xml b/session/src/main/res/drawable/ic_baseline_folder_48.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_folder_48.xml
rename to session/src/main/res/drawable/ic_baseline_folder_48.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_forward_24.xml b/session/src/main/res/drawable/ic_baseline_forward_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_forward_24.xml
rename to session/src/main/res/drawable/ic_baseline_forward_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_info_24.xml b/session/src/main/res/drawable/ic_baseline_info_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_info_24.xml
rename to session/src/main/res/drawable/ic_baseline_info_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_key_24.xml b/session/src/main/res/drawable/ic_baseline_key_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_key_24.xml
rename to session/src/main/res/drawable/ic_baseline_key_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_keyboard_24.xml b/session/src/main/res/drawable/ic_baseline_keyboard_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_keyboard_24.xml
rename to session/src/main/res/drawable/ic_baseline_keyboard_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml b/session/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
rename to session/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_keyboard_arrow_up_24.xml b/session/src/main/res/drawable/ic_baseline_keyboard_arrow_up_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_keyboard_arrow_up_24.xml
rename to session/src/main/res/drawable/ic_baseline_keyboard_arrow_up_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_launch_24.xml b/session/src/main/res/drawable/ic_baseline_launch_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_launch_24.xml
rename to session/src/main/res/drawable/ic_baseline_launch_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_mic_24.xml b/session/src/main/res/drawable/ic_baseline_mic_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_mic_24.xml
rename to session/src/main/res/drawable/ic_baseline_mic_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_mic_48.xml b/session/src/main/res/drawable/ic_baseline_mic_48.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_mic_48.xml
rename to session/src/main/res/drawable/ic_baseline_mic_48.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_night_mode_24.xml b/session/src/main/res/drawable/ic_baseline_night_mode_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_night_mode_24.xml
rename to session/src/main/res/drawable/ic_baseline_night_mode_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_pause_circle_filled_48.xml b/session/src/main/res/drawable/ic_baseline_pause_circle_filled_48.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_pause_circle_filled_48.xml
rename to session/src/main/res/drawable/ic_baseline_pause_circle_filled_48.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_photo_camera_24.xml b/session/src/main/res/drawable/ic_baseline_photo_camera_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_photo_camera_24.xml
rename to session/src/main/res/drawable/ic_baseline_photo_camera_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_photo_camera_48.xml b/session/src/main/res/drawable/ic_baseline_photo_camera_48.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_photo_camera_48.xml
rename to session/src/main/res/drawable/ic_baseline_photo_camera_48.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_photo_library_24.xml b/session/src/main/res/drawable/ic_baseline_photo_library_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_photo_library_24.xml
rename to session/src/main/res/drawable/ic_baseline_photo_library_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_play_circle_filled_48.xml b/session/src/main/res/drawable/ic_baseline_play_circle_filled_48.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_play_circle_filled_48.xml
rename to session/src/main/res/drawable/ic_baseline_play_circle_filled_48.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_refresh_24.xml b/session/src/main/res/drawable/ic_baseline_refresh_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_refresh_24.xml
rename to session/src/main/res/drawable/ic_baseline_refresh_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_reply_24.xml b/session/src/main/res/drawable/ic_baseline_reply_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_reply_24.xml
rename to session/src/main/res/drawable/ic_baseline_reply_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_save_24.xml b/session/src/main/res/drawable/ic_baseline_save_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_save_24.xml
rename to session/src/main/res/drawable/ic_baseline_save_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_search_24.xml b/session/src/main/res/drawable/ic_baseline_search_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_search_24.xml
rename to session/src/main/res/drawable/ic_baseline_search_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_select_all_24.xml b/session/src/main/res/drawable/ic_baseline_select_all_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_select_all_24.xml
rename to session/src/main/res/drawable/ic_baseline_select_all_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_timer_off_24.xml b/session/src/main/res/drawable/ic_baseline_timer_off_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_timer_off_24.xml
rename to session/src/main/res/drawable/ic_baseline_timer_off_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_view_stream_24.xml b/session/src/main/res/drawable/ic_baseline_view_stream_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_view_stream_24.xml
rename to session/src/main/res/drawable/ic_baseline_view_stream_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_visibility_24.xml b/session/src/main/res/drawable/ic_baseline_visibility_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_visibility_24.xml
rename to session/src/main/res/drawable/ic_baseline_visibility_24.xml
diff --git a/messenger/src/main/res/drawable/ic_baseline_visibility_off_24.xml b/session/src/main/res/drawable/ic_baseline_visibility_off_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_baseline_visibility_off_24.xml
rename to session/src/main/res/drawable/ic_baseline_visibility_off_24.xml
diff --git a/messenger/src/main/res/drawable/ic_brightness_6_24dp.xml b/session/src/main/res/drawable/ic_brightness_6_24dp.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_brightness_6_24dp.xml
rename to session/src/main/res/drawable/ic_brightness_6_24dp.xml
diff --git a/messenger/src/main/res/drawable/ic_chat_bubbles.xml b/session/src/main/res/drawable/ic_chat_bubbles.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_chat_bubbles.xml
rename to session/src/main/res/drawable/ic_chat_bubbles.xml
diff --git a/messenger/src/main/res/drawable/ic_chevron_up.xml b/session/src/main/res/drawable/ic_chevron_up.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_chevron_up.xml
rename to session/src/main/res/drawable/ic_chevron_up.xml
diff --git a/messenger/src/main/res/drawable/ic_circle.xml b/session/src/main/res/drawable/ic_circle.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_circle.xml
rename to session/src/main/res/drawable/ic_circle.xml
diff --git a/messenger/src/main/res/drawable/ic_circle_check.xml b/session/src/main/res/drawable/ic_circle_check.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_circle_check.xml
rename to session/src/main/res/drawable/ic_circle_check.xml
diff --git a/messenger/src/main/res/drawable/ic_circle_dot_dot_dot.xml b/session/src/main/res/drawable/ic_circle_dot_dot_dot.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_circle_dot_dot_dot.xml
rename to session/src/main/res/drawable/ic_circle_dot_dot_dot.xml
diff --git a/messenger/src/main/res/drawable/ic_circle_plus.xml b/session/src/main/res/drawable/ic_circle_plus.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_circle_plus.xml
rename to session/src/main/res/drawable/ic_circle_plus.xml
diff --git a/messenger/src/main/res/drawable/ic_crown.xml b/session/src/main/res/drawable/ic_crown.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_crown.xml
rename to session/src/main/res/drawable/ic_crown.xml
diff --git a/messenger/src/main/res/drawable/ic_download_circle_filled_48.xml b/session/src/main/res/drawable/ic_download_circle_filled_48.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_download_circle_filled_48.xml
rename to session/src/main/res/drawable/ic_download_circle_filled_48.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_activity_dark_20.xml b/session/src/main/res/drawable/ic_emoji_activity_dark_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_activity_dark_20.xml
rename to session/src/main/res/drawable/ic_emoji_activity_dark_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_activity_light_20.xml b/session/src/main/res/drawable/ic_emoji_activity_light_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_activity_light_20.xml
rename to session/src/main/res/drawable/ic_emoji_activity_light_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_animal_dark_20.xml b/session/src/main/res/drawable/ic_emoji_animal_dark_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_animal_dark_20.xml
rename to session/src/main/res/drawable/ic_emoji_animal_dark_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_animal_light_20.xml b/session/src/main/res/drawable/ic_emoji_animal_light_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_animal_light_20.xml
rename to session/src/main/res/drawable/ic_emoji_animal_light_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_emoticon_dark_20.xml b/session/src/main/res/drawable/ic_emoji_emoticon_dark_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_emoticon_dark_20.xml
rename to session/src/main/res/drawable/ic_emoji_emoticon_dark_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_emoticon_light_20.xml b/session/src/main/res/drawable/ic_emoji_emoticon_light_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_emoticon_light_20.xml
rename to session/src/main/res/drawable/ic_emoji_emoticon_light_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_filled.xml b/session/src/main/res/drawable/ic_emoji_filled.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_filled.xml
rename to session/src/main/res/drawable/ic_emoji_filled.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_filled_keyboard_24.xml b/session/src/main/res/drawable/ic_emoji_filled_keyboard_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_filled_keyboard_24.xml
rename to session/src/main/res/drawable/ic_emoji_filled_keyboard_24.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_filled_keyboard_dark.xml b/session/src/main/res/drawable/ic_emoji_filled_keyboard_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_filled_keyboard_dark.xml
rename to session/src/main/res/drawable/ic_emoji_filled_keyboard_dark.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_filled_keyboard_light.xml b/session/src/main/res/drawable/ic_emoji_filled_keyboard_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_filled_keyboard_light.xml
rename to session/src/main/res/drawable/ic_emoji_filled_keyboard_light.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_flag_dark_20.xml b/session/src/main/res/drawable/ic_emoji_flag_dark_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_flag_dark_20.xml
rename to session/src/main/res/drawable/ic_emoji_flag_dark_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_flag_light_20.xml b/session/src/main/res/drawable/ic_emoji_flag_light_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_flag_light_20.xml
rename to session/src/main/res/drawable/ic_emoji_flag_light_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_food_dark_20.xml b/session/src/main/res/drawable/ic_emoji_food_dark_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_food_dark_20.xml
rename to session/src/main/res/drawable/ic_emoji_food_dark_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_food_light_20.xml b/session/src/main/res/drawable/ic_emoji_food_light_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_food_light_20.xml
rename to session/src/main/res/drawable/ic_emoji_food_light_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_object_dark_20.xml b/session/src/main/res/drawable/ic_emoji_object_dark_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_object_dark_20.xml
rename to session/src/main/res/drawable/ic_emoji_object_dark_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_object_light_20.xml b/session/src/main/res/drawable/ic_emoji_object_light_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_object_light_20.xml
rename to session/src/main/res/drawable/ic_emoji_object_light_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_outline.xml b/session/src/main/res/drawable/ic_emoji_outline.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_outline.xml
rename to session/src/main/res/drawable/ic_emoji_outline.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_outline_keyboard.xml b/session/src/main/res/drawable/ic_emoji_outline_keyboard.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_outline_keyboard.xml
rename to session/src/main/res/drawable/ic_emoji_outline_keyboard.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_people_dark_20.xml b/session/src/main/res/drawable/ic_emoji_people_dark_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_people_dark_20.xml
rename to session/src/main/res/drawable/ic_emoji_people_dark_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_people_light_20.xml b/session/src/main/res/drawable/ic_emoji_people_light_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_people_light_20.xml
rename to session/src/main/res/drawable/ic_emoji_people_light_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_symbol_dark_20.xml b/session/src/main/res/drawable/ic_emoji_symbol_dark_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_symbol_dark_20.xml
rename to session/src/main/res/drawable/ic_emoji_symbol_dark_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_symbol_light_20.xml b/session/src/main/res/drawable/ic_emoji_symbol_light_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_symbol_light_20.xml
rename to session/src/main/res/drawable/ic_emoji_symbol_light_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_travel_dark_20.xml b/session/src/main/res/drawable/ic_emoji_travel_dark_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_travel_dark_20.xml
rename to session/src/main/res/drawable/ic_emoji_travel_dark_20.xml
diff --git a/messenger/src/main/res/drawable/ic_emoji_travel_light_20.xml b/session/src/main/res/drawable/ic_emoji_travel_light_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_emoji_travel_light_20.xml
rename to session/src/main/res/drawable/ic_emoji_travel_light_20.xml
diff --git a/messenger/src/main/res/drawable/ic_filled_circle_check.xml b/session/src/main/res/drawable/ic_filled_circle_check.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_filled_circle_check.xml
rename to session/src/main/res/drawable/ic_filled_circle_check.xml
diff --git a/messenger/src/main/res/drawable/ic_forum_24dp.xml b/session/src/main/res/drawable/ic_forum_24dp.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_forum_24dp.xml
rename to session/src/main/res/drawable/ic_forum_24dp.xml
diff --git a/messenger/src/main/res/drawable/ic_forward_outline.xml b/session/src/main/res/drawable/ic_forward_outline.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_forward_outline.xml
rename to session/src/main/res/drawable/ic_forward_outline.xml
diff --git a/messenger/src/main/res/drawable/ic_gear.xml b/session/src/main/res/drawable/ic_gear.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_gear.xml
rename to session/src/main/res/drawable/ic_gear.xml
diff --git a/messenger/src/main/res/drawable/ic_globe.xml b/session/src/main/res/drawable/ic_globe.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_globe.xml
rename to session/src/main/res/drawable/ic_globe.xml
diff --git a/messenger/src/main/res/drawable/ic_group.xml b/session/src/main/res/drawable/ic_group.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_group.xml
rename to session/src/main/res/drawable/ic_group.xml
diff --git a/messenger/src/main/res/drawable/ic_group_large.xml b/session/src/main/res/drawable/ic_group_large.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_group_large.xml
rename to session/src/main/res/drawable/ic_group_large.xml
diff --git a/messenger/src/main/res/drawable/ic_key.xml b/session/src/main/res/drawable/ic_key.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_key.xml
rename to session/src/main/res/drawable/ic_key.xml
diff --git a/messenger/src/main/res/drawable/ic_laptop_24dp.xml b/session/src/main/res/drawable/ic_laptop_24dp.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_laptop_24dp.xml
rename to session/src/main/res/drawable/ic_laptop_24dp.xml
diff --git a/messenger/src/main/res/drawable/ic_launcher_foreground.xml b/session/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_launcher_foreground.xml
rename to session/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/messenger/src/main/res/drawable/ic_lock.xml b/session/src/main/res/drawable/ic_lock.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_lock.xml
rename to session/src/main/res/drawable/ic_lock.xml
diff --git a/messenger/src/main/res/drawable/ic_message.xml b/session/src/main/res/drawable/ic_message.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_message.xml
rename to session/src/main/res/drawable/ic_message.xml
diff --git a/messenger/src/main/res/drawable/ic_mic_filled_24.xml b/session/src/main/res/drawable/ic_mic_filled_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_mic_filled_24.xml
rename to session/src/main/res/drawable/ic_mic_filled_24.xml
diff --git a/messenger/src/main/res/drawable/ic_microphone.xml b/session/src/main/res/drawable/ic_microphone.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_microphone.xml
rename to session/src/main/res/drawable/ic_microphone.xml
diff --git a/messenger/src/main/res/drawable/ic_more_horiz_white.xml b/session/src/main/res/drawable/ic_more_horiz_white.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_more_horiz_white.xml
rename to session/src/main/res/drawable/ic_more_horiz_white.xml
diff --git a/messenger/src/main/res/drawable/ic_mute.xml b/session/src/main/res/drawable/ic_mute.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_mute.xml
rename to session/src/main/res/drawable/ic_mute.xml
diff --git a/messenger/src/main/res/drawable/ic_notifications_24dp.xml b/session/src/main/res/drawable/ic_notifications_24dp.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_notifications_24dp.xml
rename to session/src/main/res/drawable/ic_notifications_24dp.xml
diff --git a/messenger/src/main/res/drawable/ic_outline_info_24.xml b/session/src/main/res/drawable/ic_outline_info_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_outline_info_24.xml
rename to session/src/main/res/drawable/ic_outline_info_24.xml
diff --git a/messenger/src/main/res/drawable/ic_outline_keyboard_24.xml b/session/src/main/res/drawable/ic_outline_keyboard_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_outline_keyboard_24.xml
rename to session/src/main/res/drawable/ic_outline_keyboard_24.xml
diff --git a/messenger/src/main/res/drawable/ic_outline_night_mode_24.xml b/session/src/main/res/drawable/ic_outline_night_mode_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_outline_night_mode_24.xml
rename to session/src/main/res/drawable/ic_outline_night_mode_24.xml
diff --git a/messenger/src/main/res/drawable/ic_outline_night_mode_auto_24.xml b/session/src/main/res/drawable/ic_outline_night_mode_auto_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_outline_night_mode_auto_24.xml
rename to session/src/main/res/drawable/ic_outline_night_mode_auto_24.xml
diff --git a/messenger/src/main/res/drawable/ic_outline_notifications_off_24.xml b/session/src/main/res/drawable/ic_outline_notifications_off_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_outline_notifications_off_24.xml
rename to session/src/main/res/drawable/ic_outline_notifications_off_24.xml
diff --git a/messenger/src/main/res/drawable/ic_outline_photo_camera_24.xml b/session/src/main/res/drawable/ic_outline_photo_camera_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_outline_photo_camera_24.xml
rename to session/src/main/res/drawable/ic_outline_photo_camera_24.xml
diff --git a/messenger/src/main/res/drawable/ic_person_large.xml b/session/src/main/res/drawable/ic_person_large.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_person_large.xml
rename to session/src/main/res/drawable/ic_person_large.xml
diff --git a/messenger/src/main/res/drawable/ic_phonelink_erase_white_24dp.xml b/session/src/main/res/drawable/ic_phonelink_erase_white_24dp.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_phonelink_erase_white_24dp.xml
rename to session/src/main/res/drawable/ic_phonelink_erase_white_24dp.xml
diff --git a/messenger/src/main/res/drawable/ic_plus.xml b/session/src/main/res/drawable/ic_plus.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_plus.xml
rename to session/src/main/res/drawable/ic_plus.xml
diff --git a/messenger/src/main/res/drawable/ic_plus_24.xml b/session/src/main/res/drawable/ic_plus_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_plus_24.xml
rename to session/src/main/res/drawable/ic_plus_24.xml
diff --git a/messenger/src/main/res/drawable/ic_qr_code_24.xml b/session/src/main/res/drawable/ic_qr_code_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_qr_code_24.xml
rename to session/src/main/res/drawable/ic_qr_code_24.xml
diff --git a/messenger/src/main/res/drawable/ic_question_mark.xml b/session/src/main/res/drawable/ic_question_mark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_question_mark.xml
rename to session/src/main/res/drawable/ic_question_mark.xml
diff --git a/messenger/src/main/res/drawable/ic_recent_dark_20.xml b/session/src/main/res/drawable/ic_recent_dark_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_recent_dark_20.xml
rename to session/src/main/res/drawable/ic_recent_dark_20.xml
diff --git a/messenger/src/main/res/drawable/ic_recent_light_20.xml b/session/src/main/res/drawable/ic_recent_light_20.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_recent_light_20.xml
rename to session/src/main/res/drawable/ic_recent_light_20.xml
diff --git a/messenger/src/main/res/drawable/ic_security_24dp.xml b/session/src/main/res/drawable/ic_security_24dp.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_security_24dp.xml
rename to session/src/main/res/drawable/ic_security_24dp.xml
diff --git a/messenger/src/main/res/drawable/ic_sticker_filled.xml b/session/src/main/res/drawable/ic_sticker_filled.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_sticker_filled.xml
rename to session/src/main/res/drawable/ic_sticker_filled.xml
diff --git a/messenger/src/main/res/drawable/ic_sticker_filled_keyboard_24.xml b/session/src/main/res/drawable/ic_sticker_filled_keyboard_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_sticker_filled_keyboard_24.xml
rename to session/src/main/res/drawable/ic_sticker_filled_keyboard_24.xml
diff --git a/messenger/src/main/res/drawable/ic_sticker_filled_keyboard_dark.xml b/session/src/main/res/drawable/ic_sticker_filled_keyboard_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_sticker_filled_keyboard_dark.xml
rename to session/src/main/res/drawable/ic_sticker_filled_keyboard_dark.xml
diff --git a/messenger/src/main/res/drawable/ic_sticker_filled_keyboard_light.xml b/session/src/main/res/drawable/ic_sticker_filled_keyboard_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_sticker_filled_keyboard_light.xml
rename to session/src/main/res/drawable/ic_sticker_filled_keyboard_light.xml
diff --git a/messenger/src/main/res/drawable/ic_sticker_outline.xml b/session/src/main/res/drawable/ic_sticker_outline.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_sticker_outline.xml
rename to session/src/main/res/drawable/ic_sticker_outline.xml
diff --git a/messenger/src/main/res/drawable/ic_sticker_outline_keyboard.xml b/session/src/main/res/drawable/ic_sticker_outline_keyboard.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_sticker_outline_keyboard.xml
rename to session/src/main/res/drawable/ic_sticker_outline_keyboard.xml
diff --git a/messenger/src/main/res/drawable/ic_sun.xml b/session/src/main/res/drawable/ic_sun.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_sun.xml
rename to session/src/main/res/drawable/ic_sun.xml
diff --git a/messenger/src/main/res/drawable/ic_textsms_24dp.xml b/session/src/main/res/drawable/ic_textsms_24dp.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_textsms_24dp.xml
rename to session/src/main/res/drawable/ic_textsms_24dp.xml
diff --git a/messenger/src/main/res/drawable/ic_triangle_down.xml b/session/src/main/res/drawable/ic_triangle_down.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_triangle_down.xml
rename to session/src/main/res/drawable/ic_triangle_down.xml
diff --git a/messenger/src/main/res/drawable/ic_triangle_left.xml b/session/src/main/res/drawable/ic_triangle_left.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_triangle_left.xml
rename to session/src/main/res/drawable/ic_triangle_left.xml
diff --git a/messenger/src/main/res/drawable/ic_triangle_right.xml b/session/src/main/res/drawable/ic_triangle_right.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_triangle_right.xml
rename to session/src/main/res/drawable/ic_triangle_right.xml
diff --git a/messenger/src/main/res/drawable/ic_triangle_up.xml b/session/src/main/res/drawable/ic_triangle_up.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_triangle_up.xml
rename to session/src/main/res/drawable/ic_triangle_up.xml
diff --git a/messenger/src/main/res/drawable/ic_ui_mode_24.xml b/session/src/main/res/drawable/ic_ui_mode_24.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_ui_mode_24.xml
rename to session/src/main/res/drawable/ic_ui_mode_24.xml
diff --git a/messenger/src/main/res/drawable/ic_x.xml b/session/src/main/res/drawable/ic_x.xml
similarity index 100%
rename from messenger/src/main/res/drawable/ic_x.xml
rename to session/src/main/res/drawable/ic_x.xml
diff --git a/messenger/src/main/res/drawable/icon_link.xml b/session/src/main/res/drawable/icon_link.xml
similarity index 100%
rename from messenger/src/main/res/drawable/icon_link.xml
rename to session/src/main/res/drawable/icon_link.xml
diff --git a/messenger/src/main/res/drawable/icon_seedling.xml b/session/src/main/res/drawable/icon_seedling.xml
similarity index 100%
rename from messenger/src/main/res/drawable/icon_seedling.xml
rename to session/src/main/res/drawable/icon_seedling.xml
diff --git a/messenger/src/main/res/drawable/icon_share.xml b/session/src/main/res/drawable/icon_share.xml
similarity index 100%
rename from messenger/src/main/res/drawable/icon_share.xml
rename to session/src/main/res/drawable/icon_share.xml
diff --git a/messenger/src/main/res/drawable/image_shade.xml b/session/src/main/res/drawable/image_shade.xml
similarity index 100%
rename from messenger/src/main/res/drawable/image_shade.xml
rename to session/src/main/res/drawable/image_shade.xml
diff --git a/messenger/src/main/res/drawable/import_export_item_background_dark.xml b/session/src/main/res/drawable/import_export_item_background_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/import_export_item_background_dark.xml
rename to session/src/main/res/drawable/import_export_item_background_dark.xml
diff --git a/messenger/src/main/res/drawable/import_export_item_background_light.xml b/session/src/main/res/drawable/import_export_item_background_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/import_export_item_background_light.xml
rename to session/src/main/res/drawable/import_export_item_background_light.xml
diff --git a/messenger/src/main/res/drawable/info_round.xml b/session/src/main/res/drawable/info_round.xml
similarity index 100%
rename from messenger/src/main/res/drawable/info_round.xml
rename to session/src/main/res/drawable/info_round.xml
diff --git a/messenger/src/main/res/drawable/labeled_edit_text_background_active.xml b/session/src/main/res/drawable/labeled_edit_text_background_active.xml
similarity index 100%
rename from messenger/src/main/res/drawable/labeled_edit_text_background_active.xml
rename to session/src/main/res/drawable/labeled_edit_text_background_active.xml
diff --git a/messenger/src/main/res/drawable/labeled_edit_text_background_inactive.xml b/session/src/main/res/drawable/labeled_edit_text_background_inactive.xml
similarity index 100%
rename from messenger/src/main/res/drawable/labeled_edit_text_background_inactive.xml
rename to session/src/main/res/drawable/labeled_edit_text_background_inactive.xml
diff --git a/messenger/src/main/res/drawable/media_camera_button_background.xml b/session/src/main/res/drawable/media_camera_button_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/media_camera_button_background.xml
rename to session/src/main/res/drawable/media_camera_button_background.xml
diff --git a/messenger/src/main/res/drawable/media_count_button_background.xml b/session/src/main/res/drawable/media_count_button_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/media_count_button_background.xml
rename to session/src/main/res/drawable/media_count_button_background.xml
diff --git a/messenger/src/main/res/drawable/media_count_number_background.xml b/session/src/main/res/drawable/media_count_number_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/media_count_number_background.xml
rename to session/src/main/res/drawable/media_count_number_background.xml
diff --git a/messenger/src/main/res/drawable/media_keyboard_selected_background_dark.xml b/session/src/main/res/drawable/media_keyboard_selected_background_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/media_keyboard_selected_background_dark.xml
rename to session/src/main/res/drawable/media_keyboard_selected_background_dark.xml
diff --git a/messenger/src/main/res/drawable/media_keyboard_selected_background_light.xml b/session/src/main/res/drawable/media_keyboard_selected_background_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/media_keyboard_selected_background_light.xml
rename to session/src/main/res/drawable/media_keyboard_selected_background_light.xml
diff --git a/messenger/src/main/res/drawable/mediapicker_item_border_dark.xml b/session/src/main/res/drawable/mediapicker_item_border_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/mediapicker_item_border_dark.xml
rename to session/src/main/res/drawable/mediapicker_item_border_dark.xml
diff --git a/messenger/src/main/res/drawable/mediapicker_item_border_light.xml b/session/src/main/res/drawable/mediapicker_item_border_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/mediapicker_item_border_light.xml
rename to session/src/main/res/drawable/mediapicker_item_border_light.xml
diff --git a/messenger/src/main/res/drawable/mediarail_button_background.xml b/session/src/main/res/drawable/mediarail_button_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/mediarail_button_background.xml
rename to session/src/main/res/drawable/mediarail_button_background.xml
diff --git a/messenger/src/main/res/drawable/mediarail_media_outline.xml b/session/src/main/res/drawable/mediarail_media_outline.xml
similarity index 100%
rename from messenger/src/main/res/drawable/mediarail_media_outline.xml
rename to session/src/main/res/drawable/mediarail_media_outline.xml
diff --git a/messenger/src/main/res/drawable/mention_candidate_view_background.xml b/session/src/main/res/drawable/mention_candidate_view_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/mention_candidate_view_background.xml
rename to session/src/main/res/drawable/mention_candidate_view_background.xml
diff --git a/messenger/src/main/res/drawable/message_bubble_background.xml b/session/src/main/res/drawable/message_bubble_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/message_bubble_background.xml
rename to session/src/main/res/drawable/message_bubble_background.xml
diff --git a/messenger/src/main/res/drawable/message_bubble_background_received_alone.xml b/session/src/main/res/drawable/message_bubble_background_received_alone.xml
similarity index 100%
rename from messenger/src/main/res/drawable/message_bubble_background_received_alone.xml
rename to session/src/main/res/drawable/message_bubble_background_received_alone.xml
diff --git a/messenger/src/main/res/drawable/message_bubble_background_received_end.xml b/session/src/main/res/drawable/message_bubble_background_received_end.xml
similarity index 100%
rename from messenger/src/main/res/drawable/message_bubble_background_received_end.xml
rename to session/src/main/res/drawable/message_bubble_background_received_end.xml
diff --git a/messenger/src/main/res/drawable/message_bubble_background_received_middle.xml b/session/src/main/res/drawable/message_bubble_background_received_middle.xml
similarity index 100%
rename from messenger/src/main/res/drawable/message_bubble_background_received_middle.xml
rename to session/src/main/res/drawable/message_bubble_background_received_middle.xml
diff --git a/messenger/src/main/res/drawable/message_bubble_background_received_start.xml b/session/src/main/res/drawable/message_bubble_background_received_start.xml
similarity index 100%
rename from messenger/src/main/res/drawable/message_bubble_background_received_start.xml
rename to session/src/main/res/drawable/message_bubble_background_received_start.xml
diff --git a/messenger/src/main/res/drawable/message_bubble_background_sent_alone.xml b/session/src/main/res/drawable/message_bubble_background_sent_alone.xml
similarity index 100%
rename from messenger/src/main/res/drawable/message_bubble_background_sent_alone.xml
rename to session/src/main/res/drawable/message_bubble_background_sent_alone.xml
diff --git a/messenger/src/main/res/drawable/message_bubble_background_sent_end.xml b/session/src/main/res/drawable/message_bubble_background_sent_end.xml
similarity index 100%
rename from messenger/src/main/res/drawable/message_bubble_background_sent_end.xml
rename to session/src/main/res/drawable/message_bubble_background_sent_end.xml
diff --git a/messenger/src/main/res/drawable/message_bubble_background_sent_middle.xml b/session/src/main/res/drawable/message_bubble_background_sent_middle.xml
similarity index 100%
rename from messenger/src/main/res/drawable/message_bubble_background_sent_middle.xml
rename to session/src/main/res/drawable/message_bubble_background_sent_middle.xml
diff --git a/messenger/src/main/res/drawable/message_bubble_background_sent_start.xml b/session/src/main/res/drawable/message_bubble_background_sent_start.xml
similarity index 100%
rename from messenger/src/main/res/drawable/message_bubble_background_sent_start.xml
rename to session/src/main/res/drawable/message_bubble_background_sent_start.xml
diff --git a/messenger/src/main/res/drawable/new_conversation_button_background.xml b/session/src/main/res/drawable/new_conversation_button_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/new_conversation_button_background.xml
rename to session/src/main/res/drawable/new_conversation_button_background.xml
diff --git a/messenger/src/main/res/drawable/notify_panel_notification_icon_bg_tile.xml b/session/src/main/res/drawable/notify_panel_notification_icon_bg_tile.xml
similarity index 100%
rename from messenger/src/main/res/drawable/notify_panel_notification_icon_bg_tile.xml
rename to session/src/main/res/drawable/notify_panel_notification_icon_bg_tile.xml
diff --git a/messenger/src/main/res/drawable/paths_building_dot.xml b/session/src/main/res/drawable/paths_building_dot.xml
similarity index 100%
rename from messenger/src/main/res/drawable/paths_building_dot.xml
rename to session/src/main/res/drawable/paths_building_dot.xml
diff --git a/messenger/src/main/res/drawable/pause_icon.xml b/session/src/main/res/drawable/pause_icon.xml
similarity index 100%
rename from messenger/src/main/res/drawable/pause_icon.xml
rename to session/src/main/res/drawable/pause_icon.xml
diff --git a/messenger/src/main/res/drawable/pause_to_play_animation.xml b/session/src/main/res/drawable/pause_to_play_animation.xml
similarity index 100%
rename from messenger/src/main/res/drawable/pause_to_play_animation.xml
rename to session/src/main/res/drawable/pause_to_play_animation.xml
diff --git a/messenger/src/main/res/drawable/permission_rationale_dialog_corners.xml b/session/src/main/res/drawable/permission_rationale_dialog_corners.xml
similarity index 100%
rename from messenger/src/main/res/drawable/permission_rationale_dialog_corners.xml
rename to session/src/main/res/drawable/permission_rationale_dialog_corners.xml
diff --git a/messenger/src/main/res/drawable/pill.xml b/session/src/main/res/drawable/pill.xml
similarity index 100%
rename from messenger/src/main/res/drawable/pill.xml
rename to session/src/main/res/drawable/pill.xml
diff --git a/messenger/src/main/res/drawable/play_icon.xml b/session/src/main/res/drawable/play_icon.xml
similarity index 100%
rename from messenger/src/main/res/drawable/play_icon.xml
rename to session/src/main/res/drawable/play_icon.xml
diff --git a/messenger/src/main/res/drawable/play_to_pause_animation.xml b/session/src/main/res/drawable/play_to_pause_animation.xml
similarity index 100%
rename from messenger/src/main/res/drawable/play_to_pause_animation.xml
rename to session/src/main/res/drawable/play_to_pause_animation.xml
diff --git a/messenger/src/main/res/drawable/pn_option_background.xml b/session/src/main/res/drawable/pn_option_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/pn_option_background.xml
rename to session/src/main/res/drawable/pn_option_background.xml
diff --git a/messenger/src/main/res/drawable/pn_option_background_deselect_transition.xml b/session/src/main/res/drawable/pn_option_background_deselect_transition.xml
similarity index 100%
rename from messenger/src/main/res/drawable/pn_option_background_deselect_transition.xml
rename to session/src/main/res/drawable/pn_option_background_deselect_transition.xml
diff --git a/messenger/src/main/res/drawable/pn_option_background_select_transition.xml b/session/src/main/res/drawable/pn_option_background_select_transition.xml
similarity index 100%
rename from messenger/src/main/res/drawable/pn_option_background_select_transition.xml
rename to session/src/main/res/drawable/pn_option_background_select_transition.xml
diff --git a/messenger/src/main/res/drawable/pn_option_background_selected.xml b/session/src/main/res/drawable/pn_option_background_selected.xml
similarity index 100%
rename from messenger/src/main/res/drawable/pn_option_background_selected.xml
rename to session/src/main/res/drawable/pn_option_background_selected.xml
diff --git a/messenger/src/main/res/drawable/preference_divider_dark.xml b/session/src/main/res/drawable/preference_divider_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/preference_divider_dark.xml
rename to session/src/main/res/drawable/preference_divider_dark.xml
diff --git a/messenger/src/main/res/drawable/preference_divider_light.xml b/session/src/main/res/drawable/preference_divider_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/preference_divider_light.xml
rename to session/src/main/res/drawable/preference_divider_light.xml
diff --git a/messenger/src/main/res/drawable/profile_picture_view_large_background.xml b/session/src/main/res/drawable/profile_picture_view_large_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/profile_picture_view_large_background.xml
rename to session/src/main/res/drawable/profile_picture_view_large_background.xml
diff --git a/messenger/src/main/res/drawable/profile_picture_view_large_foreground.xml b/session/src/main/res/drawable/profile_picture_view_large_foreground.xml
similarity index 100%
rename from messenger/src/main/res/drawable/profile_picture_view_large_foreground.xml
rename to session/src/main/res/drawable/profile_picture_view_large_foreground.xml
diff --git a/messenger/src/main/res/drawable/profile_picture_view_medium_background.xml b/session/src/main/res/drawable/profile_picture_view_medium_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/profile_picture_view_medium_background.xml
rename to session/src/main/res/drawable/profile_picture_view_medium_background.xml
diff --git a/messenger/src/main/res/drawable/profile_picture_view_medium_foreground.xml b/session/src/main/res/drawable/profile_picture_view_medium_foreground.xml
similarity index 100%
rename from messenger/src/main/res/drawable/profile_picture_view_medium_foreground.xml
rename to session/src/main/res/drawable/profile_picture_view_medium_foreground.xml
diff --git a/messenger/src/main/res/drawable/profile_picture_view_rss_medium_background.xml b/session/src/main/res/drawable/profile_picture_view_rss_medium_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/profile_picture_view_rss_medium_background.xml
rename to session/src/main/res/drawable/profile_picture_view_rss_medium_background.xml
diff --git a/messenger/src/main/res/drawable/profile_picture_view_small_background.xml b/session/src/main/res/drawable/profile_picture_view_small_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/profile_picture_view_small_background.xml
rename to session/src/main/res/drawable/profile_picture_view_small_background.xml
diff --git a/messenger/src/main/res/drawable/profile_picture_view_small_foreground.xml b/session/src/main/res/drawable/profile_picture_view_small_foreground.xml
similarity index 100%
rename from messenger/src/main/res/drawable/profile_picture_view_small_foreground.xml
rename to session/src/main/res/drawable/profile_picture_view_small_foreground.xml
diff --git a/messenger/src/main/res/drawable/progress_button_state.xml b/session/src/main/res/drawable/progress_button_state.xml
similarity index 100%
rename from messenger/src/main/res/drawable/progress_button_state.xml
rename to session/src/main/res/drawable/progress_button_state.xml
diff --git a/messenger/src/main/res/drawable/prominent_dialog_button_background.xml b/session/src/main/res/drawable/prominent_dialog_button_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/prominent_dialog_button_background.xml
rename to session/src/main/res/drawable/prominent_dialog_button_background.xml
diff --git a/messenger/src/main/res/drawable/prominent_filled_button_medium_background.xml b/session/src/main/res/drawable/prominent_filled_button_medium_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/prominent_filled_button_medium_background.xml
rename to session/src/main/res/drawable/prominent_filled_button_medium_background.xml
diff --git a/messenger/src/main/res/drawable/prominent_outline_button_medium_background.xml b/session/src/main/res/drawable/prominent_outline_button_medium_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/prominent_outline_button_medium_background.xml
rename to session/src/main/res/drawable/prominent_outline_button_medium_background.xml
diff --git a/messenger/src/main/res/drawable/qr_code_background.xml b/session/src/main/res/drawable/qr_code_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/qr_code_background.xml
rename to session/src/main/res/drawable/qr_code_background.xml
diff --git a/messenger/src/main/res/drawable/quick_camera_shutter_ring.xml b/session/src/main/res/drawable/quick_camera_shutter_ring.xml
similarity index 100%
rename from messenger/src/main/res/drawable/quick_camera_shutter_ring.xml
rename to session/src/main/res/drawable/quick_camera_shutter_ring.xml
diff --git a/messenger/src/main/res/drawable/read_receipt_vector.xml b/session/src/main/res/drawable/read_receipt_vector.xml
similarity index 100%
rename from messenger/src/main/res/drawable/read_receipt_vector.xml
rename to session/src/main/res/drawable/read_receipt_vector.xml
diff --git a/messenger/src/main/res/drawable/recipient_preference_scrim_bottom.xml b/session/src/main/res/drawable/recipient_preference_scrim_bottom.xml
similarity index 100%
rename from messenger/src/main/res/drawable/recipient_preference_scrim_bottom.xml
rename to session/src/main/res/drawable/recipient_preference_scrim_bottom.xml
diff --git a/messenger/src/main/res/drawable/recipient_preference_scrim_top.xml b/session/src/main/res/drawable/recipient_preference_scrim_top.xml
similarity index 100%
rename from messenger/src/main/res/drawable/recipient_preference_scrim_top.xml
rename to session/src/main/res/drawable/recipient_preference_scrim_top.xml
diff --git a/messenger/src/main/res/drawable/recycler_view_fast_scroller_bubble.xml b/session/src/main/res/drawable/recycler_view_fast_scroller_bubble.xml
similarity index 100%
rename from messenger/src/main/res/drawable/recycler_view_fast_scroller_bubble.xml
rename to session/src/main/res/drawable/recycler_view_fast_scroller_bubble.xml
diff --git a/messenger/src/main/res/drawable/recycler_view_fast_scroller_handle.xml b/session/src/main/res/drawable/recycler_view_fast_scroller_handle.xml
similarity index 100%
rename from messenger/src/main/res/drawable/recycler_view_fast_scroller_handle.xml
rename to session/src/main/res/drawable/recycler_view_fast_scroller_handle.xml
diff --git a/messenger/src/main/res/drawable/reminder_background_error.xml b/session/src/main/res/drawable/reminder_background_error.xml
similarity index 100%
rename from messenger/src/main/res/drawable/reminder_background_error.xml
rename to session/src/main/res/drawable/reminder_background_error.xml
diff --git a/messenger/src/main/res/drawable/reminder_background_normal.xml b/session/src/main/res/drawable/reminder_background_normal.xml
similarity index 100%
rename from messenger/src/main/res/drawable/reminder_background_normal.xml
rename to session/src/main/res/drawable/reminder_background_normal.xml
diff --git a/messenger/src/main/res/drawable/remove_button_state.xml b/session/src/main/res/drawable/remove_button_state.xml
similarity index 100%
rename from messenger/src/main/res/drawable/remove_button_state.xml
rename to session/src/main/res/drawable/remove_button_state.xml
diff --git a/messenger/src/main/res/drawable/rounded_rectangle_dark.xml b/session/src/main/res/drawable/rounded_rectangle_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/rounded_rectangle_dark.xml
rename to session/src/main/res/drawable/rounded_rectangle_dark.xml
diff --git a/messenger/src/main/res/drawable/rounded_rectangle_white.xml b/session/src/main/res/drawable/rounded_rectangle_white.xml
similarity index 100%
rename from messenger/src/main/res/drawable/rounded_rectangle_white.xml
rename to session/src/main/res/drawable/rounded_rectangle_white.xml
diff --git a/messenger/src/main/res/drawable/scroll_to_bottom_button_background.xml b/session/src/main/res/drawable/scroll_to_bottom_button_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/scroll_to_bottom_button_background.xml
rename to session/src/main/res/drawable/scroll_to_bottom_button_background.xml
diff --git a/messenger/src/main/res/drawable/search_toolbar_shadow.xml b/session/src/main/res/drawable/search_toolbar_shadow.xml
similarity index 100%
rename from messenger/src/main/res/drawable/search_toolbar_shadow.xml
rename to session/src/main/res/drawable/search_toolbar_shadow.xml
diff --git a/messenger/src/main/res/drawable/session_edit_text_background.xml b/session/src/main/res/drawable/session_edit_text_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/session_edit_text_background.xml
rename to session/src/main/res/drawable/session_edit_text_background.xml
diff --git a/messenger/src/main/res/drawable/session_edit_text_cursor.xml b/session/src/main/res/drawable/session_edit_text_cursor.xml
similarity index 100%
rename from messenger/src/main/res/drawable/session_edit_text_cursor.xml
rename to session/src/main/res/drawable/session_edit_text_cursor.xml
diff --git a/messenger/src/main/res/drawable/session_id_text_view_background.xml b/session/src/main/res/drawable/session_id_text_view_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/session_id_text_view_background.xml
rename to session/src/main/res/drawable/session_id_text_view_background.xml
diff --git a/messenger/src/main/res/drawable/session_logo.xml b/session/src/main/res/drawable/session_logo.xml
similarity index 100%
rename from messenger/src/main/res/drawable/session_logo.xml
rename to session/src/main/res/drawable/session_logo.xml
diff --git a/messenger/src/main/res/drawable/session_logo_white.xml b/session/src/main/res/drawable/session_logo_white.xml
similarity index 100%
rename from messenger/src/main/res/drawable/session_logo_white.xml
rename to session/src/main/res/drawable/session_logo_white.xml
diff --git a/messenger/src/main/res/drawable/setting_button_background.xml b/session/src/main/res/drawable/setting_button_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/setting_button_background.xml
rename to session/src/main/res/drawable/setting_button_background.xml
diff --git a/messenger/src/main/res/drawable/sticker_button_dark.xml b/session/src/main/res/drawable/sticker_button_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/sticker_button_dark.xml
rename to session/src/main/res/drawable/sticker_button_dark.xml
diff --git a/messenger/src/main/res/drawable/sticker_button_light.xml b/session/src/main/res/drawable/sticker_button_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/sticker_button_light.xml
rename to session/src/main/res/drawable/sticker_button_light.xml
diff --git a/messenger/src/main/res/drawable/sticker_management_empty_background.xml b/session/src/main/res/drawable/sticker_management_empty_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/sticker_management_empty_background.xml
rename to session/src/main/res/drawable/sticker_management_empty_background.xml
diff --git a/messenger/src/main/res/drawable/sticker_missing_background_dark.xml b/session/src/main/res/drawable/sticker_missing_background_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/sticker_missing_background_dark.xml
rename to session/src/main/res/drawable/sticker_missing_background_dark.xml
diff --git a/messenger/src/main/res/drawable/sticker_missing_background_light.xml b/session/src/main/res/drawable/sticker_missing_background_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/sticker_missing_background_light.xml
rename to session/src/main/res/drawable/sticker_missing_background_light.xml
diff --git a/messenger/src/main/res/drawable/sticky_date_header_background_dark.xml b/session/src/main/res/drawable/sticky_date_header_background_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/sticky_date_header_background_dark.xml
rename to session/src/main/res/drawable/sticky_date_header_background_dark.xml
diff --git a/messenger/src/main/res/drawable/sticky_date_header_background_light.xml b/session/src/main/res/drawable/sticky_date_header_background_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/sticky_date_header_background_light.xml
rename to session/src/main/res/drawable/sticky_date_header_background_light.xml
diff --git a/messenger/src/main/res/drawable/tooltip_background.xml b/session/src/main/res/drawable/tooltip_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/tooltip_background.xml
rename to session/src/main/res/drawable/tooltip_background.xml
diff --git a/messenger/src/main/res/drawable/touch_highlight_background.xml b/session/src/main/res/drawable/touch_highlight_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/touch_highlight_background.xml
rename to session/src/main/res/drawable/touch_highlight_background.xml
diff --git a/messenger/src/main/res/drawable/transfer_controls_background.xml b/session/src/main/res/drawable/transfer_controls_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/transfer_controls_background.xml
rename to session/src/main/res/drawable/transfer_controls_background.xml
diff --git a/messenger/src/main/res/drawable/triangle_bottom_right_corner.xml b/session/src/main/res/drawable/triangle_bottom_right_corner.xml
similarity index 100%
rename from messenger/src/main/res/drawable/triangle_bottom_right_corner.xml
rename to session/src/main/res/drawable/triangle_bottom_right_corner.xml
diff --git a/messenger/src/main/res/drawable/triangle_right.xml b/session/src/main/res/drawable/triangle_right.xml
similarity index 100%
rename from messenger/src/main/res/drawable/triangle_right.xml
rename to session/src/main/res/drawable/triangle_right.xml
diff --git a/messenger/src/main/res/drawable/unimportant_dialog_button_background.xml b/session/src/main/res/drawable/unimportant_dialog_button_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/unimportant_dialog_button_background.xml
rename to session/src/main/res/drawable/unimportant_dialog_button_background.xml
diff --git a/messenger/src/main/res/drawable/unimportant_filled_button_medium_background.xml b/session/src/main/res/drawable/unimportant_filled_button_medium_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/unimportant_filled_button_medium_background.xml
rename to session/src/main/res/drawable/unimportant_filled_button_medium_background.xml
diff --git a/messenger/src/main/res/drawable/unimportant_outline_button_medium_background.xml b/session/src/main/res/drawable/unimportant_outline_button_medium_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/unimportant_outline_button_medium_background.xml
rename to session/src/main/res/drawable/unimportant_outline_button_medium_background.xml
diff --git a/messenger/src/main/res/drawable/unread_count_background_dark.xml b/session/src/main/res/drawable/unread_count_background_dark.xml
similarity index 100%
rename from messenger/src/main/res/drawable/unread_count_background_dark.xml
rename to session/src/main/res/drawable/unread_count_background_dark.xml
diff --git a/messenger/src/main/res/drawable/unread_count_background_light.xml b/session/src/main/res/drawable/unread_count_background_light.xml
similarity index 100%
rename from messenger/src/main/res/drawable/unread_count_background_light.xml
rename to session/src/main/res/drawable/unread_count_background_light.xml
diff --git a/messenger/src/main/res/drawable/webrtc_bluetooth_button.xml b/session/src/main/res/drawable/webrtc_bluetooth_button.xml
similarity index 100%
rename from messenger/src/main/res/drawable/webrtc_bluetooth_button.xml
rename to session/src/main/res/drawable/webrtc_bluetooth_button.xml
diff --git a/messenger/src/main/res/drawable/webrtc_camera_front_button.xml b/session/src/main/res/drawable/webrtc_camera_front_button.xml
similarity index 100%
rename from messenger/src/main/res/drawable/webrtc_camera_front_button.xml
rename to session/src/main/res/drawable/webrtc_camera_front_button.xml
diff --git a/messenger/src/main/res/drawable/webrtc_camera_rear_button.xml b/session/src/main/res/drawable/webrtc_camera_rear_button.xml
similarity index 100%
rename from messenger/src/main/res/drawable/webrtc_camera_rear_button.xml
rename to session/src/main/res/drawable/webrtc_camera_rear_button.xml
diff --git a/messenger/src/main/res/drawable/webrtc_control_background.xml b/session/src/main/res/drawable/webrtc_control_background.xml
similarity index 100%
rename from messenger/src/main/res/drawable/webrtc_control_background.xml
rename to session/src/main/res/drawable/webrtc_control_background.xml
diff --git a/messenger/src/main/res/drawable/webrtc_mute_button.xml b/session/src/main/res/drawable/webrtc_mute_button.xml
similarity index 100%
rename from messenger/src/main/res/drawable/webrtc_mute_button.xml
rename to session/src/main/res/drawable/webrtc_mute_button.xml
diff --git a/messenger/src/main/res/drawable/webrtc_speaker_button.xml b/session/src/main/res/drawable/webrtc_speaker_button.xml
similarity index 100%
rename from messenger/src/main/res/drawable/webrtc_speaker_button.xml
rename to session/src/main/res/drawable/webrtc_speaker_button.xml
diff --git a/messenger/src/main/res/drawable/webrtc_video_mute_button.xml b/session/src/main/res/drawable/webrtc_video_mute_button.xml
similarity index 100%
rename from messenger/src/main/res/drawable/webrtc_video_mute_button.xml
rename to session/src/main/res/drawable/webrtc_video_mute_button.xml
diff --git a/messenger/src/main/res/font/roboto_light.ttf b/session/src/main/res/font/roboto_light.ttf
similarity index 100%
rename from messenger/src/main/res/font/roboto_light.ttf
rename to session/src/main/res/font/roboto_light.ttf
diff --git a/messenger/src/main/res/font/space_mono_bold.ttf b/session/src/main/res/font/space_mono_bold.ttf
similarity index 100%
rename from messenger/src/main/res/font/space_mono_bold.ttf
rename to session/src/main/res/font/space_mono_bold.ttf
diff --git a/messenger/src/main/res/font/space_mono_regular.ttf b/session/src/main/res/font/space_mono_regular.ttf
similarity index 100%
rename from messenger/src/main/res/font/space_mono_regular.ttf
rename to session/src/main/res/font/space_mono_regular.ttf
diff --git a/messenger/src/main/res/layout-sw400dp/activity_display_name.xml b/session/src/main/res/layout-sw400dp/activity_display_name.xml
similarity index 100%
rename from messenger/src/main/res/layout-sw400dp/activity_display_name.xml
rename to session/src/main/res/layout-sw400dp/activity_display_name.xml
diff --git a/messenger/src/main/res/layout-sw400dp/activity_landing.xml b/session/src/main/res/layout-sw400dp/activity_landing.xml
similarity index 100%
rename from messenger/src/main/res/layout-sw400dp/activity_landing.xml
rename to session/src/main/res/layout-sw400dp/activity_landing.xml
diff --git a/messenger/src/main/res/layout-sw400dp/activity_pn_mode.xml b/session/src/main/res/layout-sw400dp/activity_pn_mode.xml
similarity index 100%
rename from messenger/src/main/res/layout-sw400dp/activity_pn_mode.xml
rename to session/src/main/res/layout-sw400dp/activity_pn_mode.xml
diff --git a/messenger/src/main/res/layout-sw400dp/activity_register.xml b/session/src/main/res/layout-sw400dp/activity_register.xml
similarity index 100%
rename from messenger/src/main/res/layout-sw400dp/activity_register.xml
rename to session/src/main/res/layout-sw400dp/activity_register.xml
diff --git a/messenger/src/main/res/layout-sw400dp/activity_restore.xml b/session/src/main/res/layout-sw400dp/activity_restore.xml
similarity index 100%
rename from messenger/src/main/res/layout-sw400dp/activity_restore.xml
rename to session/src/main/res/layout-sw400dp/activity_restore.xml
diff --git a/messenger/src/main/res/layout-sw400dp/activity_seed.xml b/session/src/main/res/layout-sw400dp/activity_seed.xml
similarity index 100%
rename from messenger/src/main/res/layout-sw400dp/activity_seed.xml
rename to session/src/main/res/layout-sw400dp/activity_seed.xml
diff --git a/messenger/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml b/session/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml
similarity index 100%
rename from messenger/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml
rename to session/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml
diff --git a/messenger/src/main/res/layout-sw400dp/fragment_enter_public_key.xml b/session/src/main/res/layout-sw400dp/fragment_enter_public_key.xml
similarity index 100%
rename from messenger/src/main/res/layout-sw400dp/fragment_enter_public_key.xml
rename to session/src/main/res/layout-sw400dp/fragment_enter_public_key.xml
diff --git a/messenger/src/main/res/layout-sw400dp/view_seed_reminder.xml b/session/src/main/res/layout-sw400dp/view_seed_reminder.xml
similarity index 100%
rename from messenger/src/main/res/layout-sw400dp/view_seed_reminder.xml
rename to session/src/main/res/layout-sw400dp/view_seed_reminder.xml
diff --git a/messenger/src/main/res/layout-sw420dp/fragment_enter_session_id.xml b/session/src/main/res/layout-sw420dp/fragment_enter_session_id.xml
similarity index 100%
rename from messenger/src/main/res/layout-sw420dp/fragment_enter_session_id.xml
rename to session/src/main/res/layout-sw420dp/fragment_enter_session_id.xml
diff --git a/messenger/src/main/res/layout/activity_add_public_chat.xml b/session/src/main/res/layout/activity_add_public_chat.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_add_public_chat.xml
rename to session/src/main/res/layout/activity_add_public_chat.xml
diff --git a/messenger/src/main/res/layout/activity_backup_restore.xml b/session/src/main/res/layout/activity_backup_restore.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_backup_restore.xml
rename to session/src/main/res/layout/activity_backup_restore.xml
diff --git a/messenger/src/main/res/layout/activity_contact_name_edit.xml b/session/src/main/res/layout/activity_contact_name_edit.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_contact_name_edit.xml
rename to session/src/main/res/layout/activity_contact_name_edit.xml
diff --git a/messenger/src/main/res/layout/activity_contact_share_edit.xml b/session/src/main/res/layout/activity_contact_share_edit.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_contact_share_edit.xml
rename to session/src/main/res/layout/activity_contact_share_edit.xml
diff --git a/messenger/src/main/res/layout/activity_create_closed_group.xml b/session/src/main/res/layout/activity_create_closed_group.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_create_closed_group.xml
rename to session/src/main/res/layout/activity_create_closed_group.xml
diff --git a/messenger/src/main/res/layout/activity_create_private_chat.xml b/session/src/main/res/layout/activity_create_private_chat.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_create_private_chat.xml
rename to session/src/main/res/layout/activity_create_private_chat.xml
diff --git a/messenger/src/main/res/layout/activity_display_name.xml b/session/src/main/res/layout/activity_display_name.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_display_name.xml
rename to session/src/main/res/layout/activity_display_name.xml
diff --git a/messenger/src/main/res/layout/activity_edit_closed_group.xml b/session/src/main/res/layout/activity_edit_closed_group.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_edit_closed_group.xml
rename to session/src/main/res/layout/activity_edit_closed_group.xml
diff --git a/messenger/src/main/res/layout/activity_fragment_wrapper.xml b/session/src/main/res/layout/activity_fragment_wrapper.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_fragment_wrapper.xml
rename to session/src/main/res/layout/activity_fragment_wrapper.xml
diff --git a/messenger/src/main/res/layout/activity_home.xml b/session/src/main/res/layout/activity_home.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_home.xml
rename to session/src/main/res/layout/activity_home.xml
diff --git a/messenger/src/main/res/layout/activity_join_public_chat.xml b/session/src/main/res/layout/activity_join_public_chat.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_join_public_chat.xml
rename to session/src/main/res/layout/activity_join_public_chat.xml
diff --git a/messenger/src/main/res/layout/activity_landing.xml b/session/src/main/res/layout/activity_landing.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_landing.xml
rename to session/src/main/res/layout/activity_landing.xml
diff --git a/messenger/src/main/res/layout/activity_link_device.xml b/session/src/main/res/layout/activity_link_device.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_link_device.xml
rename to session/src/main/res/layout/activity_link_device.xml
diff --git a/messenger/src/main/res/layout/activity_linked_devices.xml b/session/src/main/res/layout/activity_linked_devices.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_linked_devices.xml
rename to session/src/main/res/layout/activity_linked_devices.xml
diff --git a/messenger/src/main/res/layout/activity_path.xml b/session/src/main/res/layout/activity_path.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_path.xml
rename to session/src/main/res/layout/activity_path.xml
diff --git a/messenger/src/main/res/layout/activity_pn_mode.xml b/session/src/main/res/layout/activity_pn_mode.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_pn_mode.xml
rename to session/src/main/res/layout/activity_pn_mode.xml
diff --git a/messenger/src/main/res/layout/activity_qr_code.xml b/session/src/main/res/layout/activity_qr_code.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_qr_code.xml
rename to session/src/main/res/layout/activity_qr_code.xml
diff --git a/messenger/src/main/res/layout/activity_register.xml b/session/src/main/res/layout/activity_register.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_register.xml
rename to session/src/main/res/layout/activity_register.xml
diff --git a/messenger/src/main/res/layout/activity_restore.xml b/session/src/main/res/layout/activity_restore.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_restore.xml
rename to session/src/main/res/layout/activity_restore.xml
diff --git a/messenger/src/main/res/layout/activity_seed.xml b/session/src/main/res/layout/activity_seed.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_seed.xml
rename to session/src/main/res/layout/activity_seed.xml
diff --git a/messenger/src/main/res/layout/activity_select_contacts.xml b/session/src/main/res/layout/activity_select_contacts.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_select_contacts.xml
rename to session/src/main/res/layout/activity_select_contacts.xml
diff --git a/messenger/src/main/res/layout/activity_settings.xml b/session/src/main/res/layout/activity_settings.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_settings.xml
rename to session/src/main/res/layout/activity_settings.xml
diff --git a/messenger/src/main/res/layout/activity_shared_contact_details.xml b/session/src/main/res/layout/activity_shared_contact_details.xml
similarity index 100%
rename from messenger/src/main/res/layout/activity_shared_contact_details.xml
rename to session/src/main/res/layout/activity_shared_contact_details.xml
diff --git a/messenger/src/main/res/layout/album_thumbnail_2.xml b/session/src/main/res/layout/album_thumbnail_2.xml
similarity index 100%
rename from messenger/src/main/res/layout/album_thumbnail_2.xml
rename to session/src/main/res/layout/album_thumbnail_2.xml
diff --git a/messenger/src/main/res/layout/album_thumbnail_3.xml b/session/src/main/res/layout/album_thumbnail_3.xml
similarity index 100%
rename from messenger/src/main/res/layout/album_thumbnail_3.xml
rename to session/src/main/res/layout/album_thumbnail_3.xml
diff --git a/messenger/src/main/res/layout/album_thumbnail_4.xml b/session/src/main/res/layout/album_thumbnail_4.xml
similarity index 100%
rename from messenger/src/main/res/layout/album_thumbnail_4.xml
rename to session/src/main/res/layout/album_thumbnail_4.xml
diff --git a/messenger/src/main/res/layout/album_thumbnail_5.xml b/session/src/main/res/layout/album_thumbnail_5.xml
similarity index 100%
rename from messenger/src/main/res/layout/album_thumbnail_5.xml
rename to session/src/main/res/layout/album_thumbnail_5.xml
diff --git a/messenger/src/main/res/layout/album_thumbnail_many.xml b/session/src/main/res/layout/album_thumbnail_many.xml
similarity index 100%
rename from messenger/src/main/res/layout/album_thumbnail_many.xml
rename to session/src/main/res/layout/album_thumbnail_many.xml
diff --git a/messenger/src/main/res/layout/album_thumbnail_view.xml b/session/src/main/res/layout/album_thumbnail_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/album_thumbnail_view.xml
rename to session/src/main/res/layout/album_thumbnail_view.xml
diff --git a/messenger/src/main/res/layout/alert_view.xml b/session/src/main/res/layout/alert_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/alert_view.xml
rename to session/src/main/res/layout/alert_view.xml
diff --git a/messenger/src/main/res/layout/attachment_type_selector.xml b/session/src/main/res/layout/attachment_type_selector.xml
similarity index 100%
rename from messenger/src/main/res/layout/attachment_type_selector.xml
rename to session/src/main/res/layout/attachment_type_selector.xml
diff --git a/messenger/src/main/res/layout/backup_enable_dialog.xml b/session/src/main/res/layout/backup_enable_dialog.xml
similarity index 100%
rename from messenger/src/main/res/layout/backup_enable_dialog.xml
rename to session/src/main/res/layout/backup_enable_dialog.xml
diff --git a/messenger/src/main/res/layout/blocked_contact_list_item.xml b/session/src/main/res/layout/blocked_contact_list_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/blocked_contact_list_item.xml
rename to session/src/main/res/layout/blocked_contact_list_item.xml
diff --git a/messenger/src/main/res/layout/blocked_contacts_fragment.xml b/session/src/main/res/layout/blocked_contacts_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/blocked_contacts_fragment.xml
rename to session/src/main/res/layout/blocked_contacts_fragment.xml
diff --git a/messenger/src/main/res/layout/camera_activity.xml b/session/src/main/res/layout/camera_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/camera_activity.xml
rename to session/src/main/res/layout/camera_activity.xml
diff --git a/messenger/src/main/res/layout/camera_controls_landscape.xml b/session/src/main/res/layout/camera_controls_landscape.xml
similarity index 100%
rename from messenger/src/main/res/layout/camera_controls_landscape.xml
rename to session/src/main/res/layout/camera_controls_landscape.xml
diff --git a/messenger/src/main/res/layout/camera_controls_portrait.xml b/session/src/main/res/layout/camera_controls_portrait.xml
similarity index 100%
rename from messenger/src/main/res/layout/camera_controls_portrait.xml
rename to session/src/main/res/layout/camera_controls_portrait.xml
diff --git a/messenger/src/main/res/layout/camera_fragment.xml b/session/src/main/res/layout/camera_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/camera_fragment.xml
rename to session/src/main/res/layout/camera_fragment.xml
diff --git a/messenger/src/main/res/layout/captcha_activity.xml b/session/src/main/res/layout/captcha_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/captcha_activity.xml
rename to session/src/main/res/layout/captcha_activity.xml
diff --git a/messenger/src/main/res/layout/change_passphrase_activity.xml b/session/src/main/res/layout/change_passphrase_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/change_passphrase_activity.xml
rename to session/src/main/res/layout/change_passphrase_activity.xml
diff --git a/messenger/src/main/res/layout/color_fragment.xml b/session/src/main/res/layout/color_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/color_fragment.xml
rename to session/src/main/res/layout/color_fragment.xml
diff --git a/messenger/src/main/res/layout/contact_filter_toolbar.xml b/session/src/main/res/layout/contact_filter_toolbar.xml
similarity index 100%
rename from messenger/src/main/res/layout/contact_filter_toolbar.xml
rename to session/src/main/res/layout/contact_filter_toolbar.xml
diff --git a/messenger/src/main/res/layout/contact_selection_activity.xml b/session/src/main/res/layout/contact_selection_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/contact_selection_activity.xml
rename to session/src/main/res/layout/contact_selection_activity.xml
diff --git a/messenger/src/main/res/layout/contact_selection_list_divider.xml b/session/src/main/res/layout/contact_selection_list_divider.xml
similarity index 100%
rename from messenger/src/main/res/layout/contact_selection_list_divider.xml
rename to session/src/main/res/layout/contact_selection_list_divider.xml
diff --git a/messenger/src/main/res/layout/contact_selection_list_fragment.xml b/session/src/main/res/layout/contact_selection_list_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/contact_selection_list_fragment.xml
rename to session/src/main/res/layout/contact_selection_list_fragment.xml
diff --git a/messenger/src/main/res/layout/contact_selection_recyclerview_header.xml b/session/src/main/res/layout/contact_selection_recyclerview_header.xml
similarity index 100%
rename from messenger/src/main/res/layout/contact_selection_recyclerview_header.xml
rename to session/src/main/res/layout/contact_selection_recyclerview_header.xml
diff --git a/messenger/src/main/res/layout/conversation_activity.xml b/session/src/main/res/layout/conversation_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_activity.xml
rename to session/src/main/res/layout/conversation_activity.xml
diff --git a/messenger/src/main/res/layout/conversation_activity_attachment_editor_stub.xml b/session/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
rename to session/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
diff --git a/messenger/src/main/res/layout/conversation_activity_emojidrawer_stub.xml b/session/src/main/res/layout/conversation_activity_emojidrawer_stub.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_activity_emojidrawer_stub.xml
rename to session/src/main/res/layout/conversation_activity_emojidrawer_stub.xml
diff --git a/messenger/src/main/res/layout/conversation_activity_group_share_profile_stub.xml b/session/src/main/res/layout/conversation_activity_group_share_profile_stub.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_activity_group_share_profile_stub.xml
rename to session/src/main/res/layout/conversation_activity_group_share_profile_stub.xml
diff --git a/messenger/src/main/res/layout/conversation_activity_reminderview_stub.xml b/session/src/main/res/layout/conversation_activity_reminderview_stub.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_activity_reminderview_stub.xml
rename to session/src/main/res/layout/conversation_activity_reminderview_stub.xml
diff --git a/messenger/src/main/res/layout/conversation_activity_unverified_banner_stub.xml b/session/src/main/res/layout/conversation_activity_unverified_banner_stub.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_activity_unverified_banner_stub.xml
rename to session/src/main/res/layout/conversation_activity_unverified_banner_stub.xml
diff --git a/messenger/src/main/res/layout/conversation_fragment.xml b/session/src/main/res/layout/conversation_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_fragment.xml
rename to session/src/main/res/layout/conversation_fragment.xml
diff --git a/messenger/src/main/res/layout/conversation_input_panel.xml b/session/src/main/res/layout/conversation_input_panel.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_input_panel.xml
rename to session/src/main/res/layout/conversation_input_panel.xml
diff --git a/messenger/src/main/res/layout/conversation_item_footer.xml b/session/src/main/res/layout/conversation_item_footer.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_footer.xml
rename to session/src/main/res/layout/conversation_item_footer.xml
diff --git a/messenger/src/main/res/layout/conversation_item_header.xml b/session/src/main/res/layout/conversation_item_header.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_header.xml
rename to session/src/main/res/layout/conversation_item_header.xml
diff --git a/messenger/src/main/res/layout/conversation_item_last_seen.xml b/session/src/main/res/layout/conversation_item_last_seen.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_last_seen.xml
rename to session/src/main/res/layout/conversation_item_last_seen.xml
diff --git a/messenger/src/main/res/layout/conversation_item_received.xml b/session/src/main/res/layout/conversation_item_received.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_received.xml
rename to session/src/main/res/layout/conversation_item_received.xml
diff --git a/messenger/src/main/res/layout/conversation_item_received_audio.xml b/session/src/main/res/layout/conversation_item_received_audio.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_received_audio.xml
rename to session/src/main/res/layout/conversation_item_received_audio.xml
diff --git a/messenger/src/main/res/layout/conversation_item_received_document.xml b/session/src/main/res/layout/conversation_item_received_document.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_received_document.xml
rename to session/src/main/res/layout/conversation_item_received_document.xml
diff --git a/messenger/src/main/res/layout/conversation_item_received_link_preview.xml b/session/src/main/res/layout/conversation_item_received_link_preview.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_received_link_preview.xml
rename to session/src/main/res/layout/conversation_item_received_link_preview.xml
diff --git a/messenger/src/main/res/layout/conversation_item_received_shared_contact.xml b/session/src/main/res/layout/conversation_item_received_shared_contact.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_received_shared_contact.xml
rename to session/src/main/res/layout/conversation_item_received_shared_contact.xml
diff --git a/messenger/src/main/res/layout/conversation_item_received_sticker.xml b/session/src/main/res/layout/conversation_item_received_sticker.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_received_sticker.xml
rename to session/src/main/res/layout/conversation_item_received_sticker.xml
diff --git a/messenger/src/main/res/layout/conversation_item_received_thumbnail.xml b/session/src/main/res/layout/conversation_item_received_thumbnail.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_received_thumbnail.xml
rename to session/src/main/res/layout/conversation_item_received_thumbnail.xml
diff --git a/messenger/src/main/res/layout/conversation_item_sent.xml b/session/src/main/res/layout/conversation_item_sent.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_sent.xml
rename to session/src/main/res/layout/conversation_item_sent.xml
diff --git a/messenger/src/main/res/layout/conversation_item_sent_audio.xml b/session/src/main/res/layout/conversation_item_sent_audio.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_sent_audio.xml
rename to session/src/main/res/layout/conversation_item_sent_audio.xml
diff --git a/messenger/src/main/res/layout/conversation_item_sent_document.xml b/session/src/main/res/layout/conversation_item_sent_document.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_sent_document.xml
rename to session/src/main/res/layout/conversation_item_sent_document.xml
diff --git a/messenger/src/main/res/layout/conversation_item_sent_link_preview.xml b/session/src/main/res/layout/conversation_item_sent_link_preview.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_sent_link_preview.xml
rename to session/src/main/res/layout/conversation_item_sent_link_preview.xml
diff --git a/messenger/src/main/res/layout/conversation_item_sent_shared_contact.xml b/session/src/main/res/layout/conversation_item_sent_shared_contact.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_sent_shared_contact.xml
rename to session/src/main/res/layout/conversation_item_sent_shared_contact.xml
diff --git a/messenger/src/main/res/layout/conversation_item_sent_sticker.xml b/session/src/main/res/layout/conversation_item_sent_sticker.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_sent_sticker.xml
rename to session/src/main/res/layout/conversation_item_sent_sticker.xml
diff --git a/messenger/src/main/res/layout/conversation_item_sent_thumbnail.xml b/session/src/main/res/layout/conversation_item_sent_thumbnail.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_sent_thumbnail.xml
rename to session/src/main/res/layout/conversation_item_sent_thumbnail.xml
diff --git a/messenger/src/main/res/layout/conversation_item_thumbnail.xml b/session/src/main/res/layout/conversation_item_thumbnail.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_thumbnail.xml
rename to session/src/main/res/layout/conversation_item_thumbnail.xml
diff --git a/messenger/src/main/res/layout/conversation_item_update.xml b/session/src/main/res/layout/conversation_item_update.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_item_update.xml
rename to session/src/main/res/layout/conversation_item_update.xml
diff --git a/messenger/src/main/res/layout/conversation_list_activity.xml b/session/src/main/res/layout/conversation_list_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_list_activity.xml
rename to session/src/main/res/layout/conversation_list_activity.xml
diff --git a/messenger/src/main/res/layout/conversation_list_fragment.xml b/session/src/main/res/layout/conversation_list_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_list_fragment.xml
rename to session/src/main/res/layout/conversation_list_fragment.xml
diff --git a/messenger/src/main/res/layout/conversation_list_item_action.xml b/session/src/main/res/layout/conversation_list_item_action.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_list_item_action.xml
rename to session/src/main/res/layout/conversation_list_item_action.xml
diff --git a/messenger/src/main/res/layout/conversation_list_item_inbox_zero.xml b/session/src/main/res/layout/conversation_list_item_inbox_zero.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_list_item_inbox_zero.xml
rename to session/src/main/res/layout/conversation_list_item_inbox_zero.xml
diff --git a/messenger/src/main/res/layout/conversation_list_item_view.xml b/session/src/main/res/layout/conversation_list_item_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_list_item_view.xml
rename to session/src/main/res/layout/conversation_list_item_view.xml
diff --git a/messenger/src/main/res/layout/conversation_search_nav.xml b/session/src/main/res/layout/conversation_search_nav.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_search_nav.xml
rename to session/src/main/res/layout/conversation_search_nav.xml
diff --git a/messenger/src/main/res/layout/conversation_title_view.xml b/session/src/main/res/layout/conversation_title_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_title_view.xml
rename to session/src/main/res/layout/conversation_title_view.xml
diff --git a/messenger/src/main/res/layout/conversation_typing_view.xml b/session/src/main/res/layout/conversation_typing_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/conversation_typing_view.xml
rename to session/src/main/res/layout/conversation_typing_view.xml
diff --git a/messenger/src/main/res/layout/country_code_text.xml b/session/src/main/res/layout/country_code_text.xml
similarity index 100%
rename from messenger/src/main/res/layout/country_code_text.xml
rename to session/src/main/res/layout/country_code_text.xml
diff --git a/messenger/src/main/res/layout/country_list_item.xml b/session/src/main/res/layout/country_list_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/country_list_item.xml
rename to session/src/main/res/layout/country_list_item.xml
diff --git a/messenger/src/main/res/layout/country_selection.xml b/session/src/main/res/layout/country_selection.xml
similarity index 100%
rename from messenger/src/main/res/layout/country_selection.xml
rename to session/src/main/res/layout/country_selection.xml
diff --git a/messenger/src/main/res/layout/country_selection_fragment.xml b/session/src/main/res/layout/country_selection_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/country_selection_fragment.xml
rename to session/src/main/res/layout/country_selection_fragment.xml
diff --git a/messenger/src/main/res/layout/create_passphrase_activity.xml b/session/src/main/res/layout/create_passphrase_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/create_passphrase_activity.xml
rename to session/src/main/res/layout/create_passphrase_activity.xml
diff --git a/messenger/src/main/res/layout/custom_default_preference_dialog.xml b/session/src/main/res/layout/custom_default_preference_dialog.xml
similarity index 100%
rename from messenger/src/main/res/layout/custom_default_preference_dialog.xml
rename to session/src/main/res/layout/custom_default_preference_dialog.xml
diff --git a/messenger/src/main/res/layout/database_migration_activity.xml b/session/src/main/res/layout/database_migration_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/database_migration_activity.xml
rename to session/src/main/res/layout/database_migration_activity.xml
diff --git a/messenger/src/main/res/layout/database_upgrade_activity.xml b/session/src/main/res/layout/database_upgrade_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/database_upgrade_activity.xml
rename to session/src/main/res/layout/database_upgrade_activity.xml
diff --git a/messenger/src/main/res/layout/delivery_status_view.xml b/session/src/main/res/layout/delivery_status_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/delivery_status_view.xml
rename to session/src/main/res/layout/delivery_status_view.xml
diff --git a/messenger/src/main/res/layout/device_add_fragment.xml b/session/src/main/res/layout/device_add_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/device_add_fragment.xml
rename to session/src/main/res/layout/device_add_fragment.xml
diff --git a/messenger/src/main/res/layout/device_link_fragment.xml b/session/src/main/res/layout/device_link_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/device_link_fragment.xml
rename to session/src/main/res/layout/device_link_fragment.xml
diff --git a/messenger/src/main/res/layout/device_list_fragment.xml b/session/src/main/res/layout/device_list_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/device_list_fragment.xml
rename to session/src/main/res/layout/device_list_fragment.xml
diff --git a/messenger/src/main/res/layout/device_list_item_view.xml b/session/src/main/res/layout/device_list_item_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/device_list_item_view.xml
rename to session/src/main/res/layout/device_list_item_view.xml
diff --git a/messenger/src/main/res/layout/dialog_clear_all_data.xml b/session/src/main/res/layout/dialog_clear_all_data.xml
similarity index 100%
rename from messenger/src/main/res/layout/dialog_clear_all_data.xml
rename to session/src/main/res/layout/dialog_clear_all_data.xml
diff --git a/messenger/src/main/res/layout/dialog_edit_device_name.xml b/session/src/main/res/layout/dialog_edit_device_name.xml
similarity index 100%
rename from messenger/src/main/res/layout/dialog_edit_device_name.xml
rename to session/src/main/res/layout/dialog_edit_device_name.xml
diff --git a/messenger/src/main/res/layout/dialog_link_device_master_mode.xml b/session/src/main/res/layout/dialog_link_device_master_mode.xml
similarity index 100%
rename from messenger/src/main/res/layout/dialog_link_device_master_mode.xml
rename to session/src/main/res/layout/dialog_link_device_master_mode.xml
diff --git a/messenger/src/main/res/layout/dialog_link_device_slave_mode.xml b/session/src/main/res/layout/dialog_link_device_slave_mode.xml
similarity index 100%
rename from messenger/src/main/res/layout/dialog_link_device_slave_mode.xml
rename to session/src/main/res/layout/dialog_link_device_slave_mode.xml
diff --git a/messenger/src/main/res/layout/dialog_seed.xml b/session/src/main/res/layout/dialog_seed.xml
similarity index 100%
rename from messenger/src/main/res/layout/dialog_seed.xml
rename to session/src/main/res/layout/dialog_seed.xml
diff --git a/messenger/src/main/res/layout/document_view.xml b/session/src/main/res/layout/document_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/document_view.xml
rename to session/src/main/res/layout/document_view.xml
diff --git a/messenger/src/main/res/layout/emoji_display_item.xml b/session/src/main/res/layout/emoji_display_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/emoji_display_item.xml
rename to session/src/main/res/layout/emoji_display_item.xml
diff --git a/messenger/src/main/res/layout/emoji_grid_layout.xml b/session/src/main/res/layout/emoji_grid_layout.xml
similarity index 100%
rename from messenger/src/main/res/layout/emoji_grid_layout.xml
rename to session/src/main/res/layout/emoji_grid_layout.xml
diff --git a/messenger/src/main/res/layout/emoji_keyboard_icon_dark.xml b/session/src/main/res/layout/emoji_keyboard_icon_dark.xml
similarity index 100%
rename from messenger/src/main/res/layout/emoji_keyboard_icon_dark.xml
rename to session/src/main/res/layout/emoji_keyboard_icon_dark.xml
diff --git a/messenger/src/main/res/layout/emoji_keyboard_icon_dark_selected.xml b/session/src/main/res/layout/emoji_keyboard_icon_dark_selected.xml
similarity index 100%
rename from messenger/src/main/res/layout/emoji_keyboard_icon_dark_selected.xml
rename to session/src/main/res/layout/emoji_keyboard_icon_dark_selected.xml
diff --git a/messenger/src/main/res/layout/emoji_keyboard_icon_light.xml b/session/src/main/res/layout/emoji_keyboard_icon_light.xml
similarity index 100%
rename from messenger/src/main/res/layout/emoji_keyboard_icon_light.xml
rename to session/src/main/res/layout/emoji_keyboard_icon_light.xml
diff --git a/messenger/src/main/res/layout/emoji_keyboard_icon_light_selected.xml b/session/src/main/res/layout/emoji_keyboard_icon_light_selected.xml
similarity index 100%
rename from messenger/src/main/res/layout/emoji_keyboard_icon_light_selected.xml
rename to session/src/main/res/layout/emoji_keyboard_icon_light_selected.xml
diff --git a/messenger/src/main/res/layout/emoji_variation_selector.xml b/session/src/main/res/layout/emoji_variation_selector.xml
similarity index 100%
rename from messenger/src/main/res/layout/emoji_variation_selector.xml
rename to session/src/main/res/layout/emoji_variation_selector.xml
diff --git a/messenger/src/main/res/layout/emoji_variation_selector_item.xml b/session/src/main/res/layout/emoji_variation_selector_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/emoji_variation_selector_item.xml
rename to session/src/main/res/layout/emoji_variation_selector_item.xml
diff --git a/messenger/src/main/res/layout/enter_backup_passphrase_dialog.xml b/session/src/main/res/layout/enter_backup_passphrase_dialog.xml
similarity index 100%
rename from messenger/src/main/res/layout/enter_backup_passphrase_dialog.xml
rename to session/src/main/res/layout/enter_backup_passphrase_dialog.xml
diff --git a/messenger/src/main/res/layout/experience_upgrade_activity.xml b/session/src/main/res/layout/experience_upgrade_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/experience_upgrade_activity.xml
rename to session/src/main/res/layout/experience_upgrade_activity.xml
diff --git a/messenger/src/main/res/layout/experience_upgrade_link_previews_fragment.xml b/session/src/main/res/layout/experience_upgrade_link_previews_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/experience_upgrade_link_previews_fragment.xml
rename to session/src/main/res/layout/experience_upgrade_link_previews_fragment.xml
diff --git a/messenger/src/main/res/layout/experience_upgrade_preference_fragment.xml b/session/src/main/res/layout/experience_upgrade_preference_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/experience_upgrade_preference_fragment.xml
rename to session/src/main/res/layout/experience_upgrade_preference_fragment.xml
diff --git a/messenger/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml b/session/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml
rename to session/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml
diff --git a/messenger/src/main/res/layout/expiration_dialog.xml b/session/src/main/res/layout/expiration_dialog.xml
similarity index 100%
rename from messenger/src/main/res/layout/expiration_dialog.xml
rename to session/src/main/res/layout/expiration_dialog.xml
diff --git a/messenger/src/main/res/layout/expiration_timer_menu.xml b/session/src/main/res/layout/expiration_timer_menu.xml
similarity index 100%
rename from messenger/src/main/res/layout/expiration_timer_menu.xml
rename to session/src/main/res/layout/expiration_timer_menu.xml
diff --git a/messenger/src/main/res/layout/fragment_closed_group_edit_bottom_sheet.xml b/session/src/main/res/layout/fragment_closed_group_edit_bottom_sheet.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_closed_group_edit_bottom_sheet.xml
rename to session/src/main/res/layout/fragment_closed_group_edit_bottom_sheet.xml
diff --git a/messenger/src/main/res/layout/fragment_conversation_bottom_sheet.xml b/session/src/main/res/layout/fragment_conversation_bottom_sheet.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_conversation_bottom_sheet.xml
rename to session/src/main/res/layout/fragment_conversation_bottom_sheet.xml
diff --git a/messenger/src/main/res/layout/fragment_device_list_bottom_sheet.xml b/session/src/main/res/layout/fragment_device_list_bottom_sheet.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_device_list_bottom_sheet.xml
rename to session/src/main/res/layout/fragment_device_list_bottom_sheet.xml
diff --git a/messenger/src/main/res/layout/fragment_enter_chat_url.xml b/session/src/main/res/layout/fragment_enter_chat_url.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_enter_chat_url.xml
rename to session/src/main/res/layout/fragment_enter_chat_url.xml
diff --git a/messenger/src/main/res/layout/fragment_enter_public_key.xml b/session/src/main/res/layout/fragment_enter_public_key.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_enter_public_key.xml
rename to session/src/main/res/layout/fragment_enter_public_key.xml
diff --git a/messenger/src/main/res/layout/fragment_enter_session_id.xml b/session/src/main/res/layout/fragment_enter_session_id.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_enter_session_id.xml
rename to session/src/main/res/layout/fragment_enter_session_id.xml
diff --git a/messenger/src/main/res/layout/fragment_light_theme_feature_intro_bottom_sheet.xml b/session/src/main/res/layout/fragment_light_theme_feature_intro_bottom_sheet.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_light_theme_feature_intro_bottom_sheet.xml
rename to session/src/main/res/layout/fragment_light_theme_feature_intro_bottom_sheet.xml
diff --git a/messenger/src/main/res/layout/fragment_multi_device_removal_bottom_sheet.xml b/session/src/main/res/layout/fragment_multi_device_removal_bottom_sheet.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_multi_device_removal_bottom_sheet.xml
rename to session/src/main/res/layout/fragment_multi_device_removal_bottom_sheet.xml
diff --git a/messenger/src/main/res/layout/fragment_new_conversation.xml b/session/src/main/res/layout/fragment_new_conversation.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_new_conversation.xml
rename to session/src/main/res/layout/fragment_new_conversation.xml
diff --git a/messenger/src/main/res/layout/fragment_open_group_suggestion_bottom_sheet.xml b/session/src/main/res/layout/fragment_open_group_suggestion_bottom_sheet.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_open_group_suggestion_bottom_sheet.xml
rename to session/src/main/res/layout/fragment_open_group_suggestion_bottom_sheet.xml
diff --git a/messenger/src/main/res/layout/fragment_scan_qr_code.xml b/session/src/main/res/layout/fragment_scan_qr_code.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_scan_qr_code.xml
rename to session/src/main/res/layout/fragment_scan_qr_code.xml
diff --git a/messenger/src/main/res/layout/fragment_scan_qr_code_placeholder.xml b/session/src/main/res/layout/fragment_scan_qr_code_placeholder.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_scan_qr_code_placeholder.xml
rename to session/src/main/res/layout/fragment_scan_qr_code_placeholder.xml
diff --git a/messenger/src/main/res/layout/fragment_scan_qr_code_wrapper.xml b/session/src/main/res/layout/fragment_scan_qr_code_wrapper.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_scan_qr_code_wrapper.xml
rename to session/src/main/res/layout/fragment_scan_qr_code_wrapper.xml
diff --git a/messenger/src/main/res/layout/fragment_search.xml b/session/src/main/res/layout/fragment_search.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_search.xml
rename to session/src/main/res/layout/fragment_search.xml
diff --git a/messenger/src/main/res/layout/fragment_submit_log.xml b/session/src/main/res/layout/fragment_submit_log.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_submit_log.xml
rename to session/src/main/res/layout/fragment_submit_log.xml
diff --git a/messenger/src/main/res/layout/fragment_user_details_bottom_sheet.xml b/session/src/main/res/layout/fragment_user_details_bottom_sheet.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_user_details_bottom_sheet.xml
rename to session/src/main/res/layout/fragment_user_details_bottom_sheet.xml
diff --git a/messenger/src/main/res/layout/fragment_view_my_qr_code.xml b/session/src/main/res/layout/fragment_view_my_qr_code.xml
similarity index 100%
rename from messenger/src/main/res/layout/fragment_view_my_qr_code.xml
rename to session/src/main/res/layout/fragment_view_my_qr_code.xml
diff --git a/messenger/src/main/res/layout/giphy_activity.xml b/session/src/main/res/layout/giphy_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/giphy_activity.xml
rename to session/src/main/res/layout/giphy_activity.xml
diff --git a/messenger/src/main/res/layout/giphy_activity_toolbar.xml b/session/src/main/res/layout/giphy_activity_toolbar.xml
similarity index 100%
rename from messenger/src/main/res/layout/giphy_activity_toolbar.xml
rename to session/src/main/res/layout/giphy_activity_toolbar.xml
diff --git a/messenger/src/main/res/layout/giphy_fragment.xml b/session/src/main/res/layout/giphy_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/giphy_fragment.xml
rename to session/src/main/res/layout/giphy_fragment.xml
diff --git a/messenger/src/main/res/layout/giphy_thumbnail.xml b/session/src/main/res/layout/giphy_thumbnail.xml
similarity index 100%
rename from messenger/src/main/res/layout/giphy_thumbnail.xml
rename to session/src/main/res/layout/giphy_thumbnail.xml
diff --git a/messenger/src/main/res/layout/group_create_activity.xml b/session/src/main/res/layout/group_create_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/group_create_activity.xml
rename to session/src/main/res/layout/group_create_activity.xml
diff --git a/messenger/src/main/res/layout/image_editor_fragment.xml b/session/src/main/res/layout/image_editor_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/image_editor_fragment.xml
rename to session/src/main/res/layout/image_editor_fragment.xml
diff --git a/messenger/src/main/res/layout/image_editor_hud.xml b/session/src/main/res/layout/image_editor_hud.xml
similarity index 100%
rename from messenger/src/main/res/layout/image_editor_hud.xml
rename to session/src/main/res/layout/image_editor_hud.xml
diff --git a/messenger/src/main/res/layout/invite_activity.xml b/session/src/main/res/layout/invite_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/invite_activity.xml
rename to session/src/main/res/layout/invite_activity.xml
diff --git a/messenger/src/main/res/layout/item_color.xml b/session/src/main/res/layout/item_color.xml
similarity index 100%
rename from messenger/src/main/res/layout/item_color.xml
rename to session/src/main/res/layout/item_color.xml
diff --git a/messenger/src/main/res/layout/item_editable_contact.xml b/session/src/main/res/layout/item_editable_contact.xml
similarity index 100%
rename from messenger/src/main/res/layout/item_editable_contact.xml
rename to session/src/main/res/layout/item_editable_contact.xml
diff --git a/messenger/src/main/res/layout/item_log_preview.xml b/session/src/main/res/layout/item_log_preview.xml
similarity index 100%
rename from messenger/src/main/res/layout/item_log_preview.xml
rename to session/src/main/res/layout/item_log_preview.xml
diff --git a/messenger/src/main/res/layout/item_selectable_contact_field.xml b/session/src/main/res/layout/item_selectable_contact_field.xml
similarity index 100%
rename from messenger/src/main/res/layout/item_selectable_contact_field.xml
rename to session/src/main/res/layout/item_selectable_contact_field.xml
diff --git a/messenger/src/main/res/layout/key_caching_notification.xml b/session/src/main/res/layout/key_caching_notification.xml
similarity index 100%
rename from messenger/src/main/res/layout/key_caching_notification.xml
rename to session/src/main/res/layout/key_caching_notification.xml
diff --git a/messenger/src/main/res/layout/labeled_edit_text.xml b/session/src/main/res/layout/labeled_edit_text.xml
similarity index 100%
rename from messenger/src/main/res/layout/labeled_edit_text.xml
rename to session/src/main/res/layout/labeled_edit_text.xml
diff --git a/messenger/src/main/res/layout/labeled_edit_text_default.xml b/session/src/main/res/layout/labeled_edit_text_default.xml
similarity index 100%
rename from messenger/src/main/res/layout/labeled_edit_text_default.xml
rename to session/src/main/res/layout/labeled_edit_text_default.xml
diff --git a/messenger/src/main/res/layout/led_color_preference_widget.xml b/session/src/main/res/layout/led_color_preference_widget.xml
similarity index 100%
rename from messenger/src/main/res/layout/led_color_preference_widget.xml
rename to session/src/main/res/layout/led_color_preference_widget.xml
diff --git a/messenger/src/main/res/layout/link_preview.xml b/session/src/main/res/layout/link_preview.xml
similarity index 100%
rename from messenger/src/main/res/layout/link_preview.xml
rename to session/src/main/res/layout/link_preview.xml
diff --git a/messenger/src/main/res/layout/load_more_header.xml b/session/src/main/res/layout/load_more_header.xml
similarity index 100%
rename from messenger/src/main/res/layout/load_more_header.xml
rename to session/src/main/res/layout/load_more_header.xml
diff --git a/messenger/src/main/res/layout/log_submit_activity.xml b/session/src/main/res/layout/log_submit_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/log_submit_activity.xml
rename to session/src/main/res/layout/log_submit_activity.xml
diff --git a/messenger/src/main/res/layout/longmessage_activity.xml b/session/src/main/res/layout/longmessage_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/longmessage_activity.xml
rename to session/src/main/res/layout/longmessage_activity.xml
diff --git a/messenger/src/main/res/layout/longmessage_bubble_received.xml b/session/src/main/res/layout/longmessage_bubble_received.xml
similarity index 100%
rename from messenger/src/main/res/layout/longmessage_bubble_received.xml
rename to session/src/main/res/layout/longmessage_bubble_received.xml
diff --git a/messenger/src/main/res/layout/longmessage_bubble_sent.xml b/session/src/main/res/layout/longmessage_bubble_sent.xml
similarity index 100%
rename from messenger/src/main/res/layout/longmessage_bubble_sent.xml
rename to session/src/main/res/layout/longmessage_bubble_sent.xml
diff --git a/messenger/src/main/res/layout/media_keyboard.xml b/session/src/main/res/layout/media_keyboard.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_keyboard.xml
rename to session/src/main/res/layout/media_keyboard.xml
diff --git a/messenger/src/main/res/layout/media_keyboard_bottom_tab_item.xml b/session/src/main/res/layout/media_keyboard_bottom_tab_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_keyboard_bottom_tab_item.xml
rename to session/src/main/res/layout/media_keyboard_bottom_tab_item.xml
diff --git a/messenger/src/main/res/layout/media_overview_activity.xml b/session/src/main/res/layout/media_overview_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_overview_activity.xml
rename to session/src/main/res/layout/media_overview_activity.xml
diff --git a/messenger/src/main/res/layout/media_overview_document_item.xml b/session/src/main/res/layout/media_overview_document_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_overview_document_item.xml
rename to session/src/main/res/layout/media_overview_document_item.xml
diff --git a/messenger/src/main/res/layout/media_overview_document_item_header.xml b/session/src/main/res/layout/media_overview_document_item_header.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_overview_document_item_header.xml
rename to session/src/main/res/layout/media_overview_document_item_header.xml
diff --git a/messenger/src/main/res/layout/media_overview_documents_fragment.xml b/session/src/main/res/layout/media_overview_documents_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_overview_documents_fragment.xml
rename to session/src/main/res/layout/media_overview_documents_fragment.xml
diff --git a/messenger/src/main/res/layout/media_overview_gallery_fragment.xml b/session/src/main/res/layout/media_overview_gallery_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_overview_gallery_fragment.xml
rename to session/src/main/res/layout/media_overview_gallery_fragment.xml
diff --git a/messenger/src/main/res/layout/media_overview_gallery_item.xml b/session/src/main/res/layout/media_overview_gallery_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_overview_gallery_item.xml
rename to session/src/main/res/layout/media_overview_gallery_item.xml
diff --git a/messenger/src/main/res/layout/media_overview_gallery_item_header.xml b/session/src/main/res/layout/media_overview_gallery_item_header.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_overview_gallery_item_header.xml
rename to session/src/main/res/layout/media_overview_gallery_item_header.xml
diff --git a/messenger/src/main/res/layout/media_preview_activity.xml b/session/src/main/res/layout/media_preview_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_preview_activity.xml
rename to session/src/main/res/layout/media_preview_activity.xml
diff --git a/messenger/src/main/res/layout/media_preview_exoplayer_layout.xml b/session/src/main/res/layout/media_preview_exoplayer_layout.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_preview_exoplayer_layout.xml
rename to session/src/main/res/layout/media_preview_exoplayer_layout.xml
diff --git a/messenger/src/main/res/layout/media_view.xml b/session/src/main/res/layout/media_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_view.xml
rename to session/src/main/res/layout/media_view.xml
diff --git a/messenger/src/main/res/layout/media_view_edit_button.xml b/session/src/main/res/layout/media_view_edit_button.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_view_edit_button.xml
rename to session/src/main/res/layout/media_view_edit_button.xml
diff --git a/messenger/src/main/res/layout/media_view_page.xml b/session/src/main/res/layout/media_view_page.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_view_page.xml
rename to session/src/main/res/layout/media_view_page.xml
diff --git a/messenger/src/main/res/layout/media_view_remove_button.xml b/session/src/main/res/layout/media_view_remove_button.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_view_remove_button.xml
rename to session/src/main/res/layout/media_view_remove_button.xml
diff --git a/messenger/src/main/res/layout/media_view_video.xml b/session/src/main/res/layout/media_view_video.xml
similarity index 100%
rename from messenger/src/main/res/layout/media_view_video.xml
rename to session/src/main/res/layout/media_view_video.xml
diff --git a/messenger/src/main/res/layout/mediapicker_folder_fragment.xml b/session/src/main/res/layout/mediapicker_folder_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/mediapicker_folder_fragment.xml
rename to session/src/main/res/layout/mediapicker_folder_fragment.xml
diff --git a/messenger/src/main/res/layout/mediapicker_folder_item.xml b/session/src/main/res/layout/mediapicker_folder_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/mediapicker_folder_item.xml
rename to session/src/main/res/layout/mediapicker_folder_item.xml
diff --git a/messenger/src/main/res/layout/mediapicker_item_fragment.xml b/session/src/main/res/layout/mediapicker_item_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/mediapicker_item_fragment.xml
rename to session/src/main/res/layout/mediapicker_item_fragment.xml
diff --git a/messenger/src/main/res/layout/mediapicker_media_item.xml b/session/src/main/res/layout/mediapicker_media_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/mediapicker_media_item.xml
rename to session/src/main/res/layout/mediapicker_media_item.xml
diff --git a/messenger/src/main/res/layout/mediarail_button_item.xml b/session/src/main/res/layout/mediarail_button_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/mediarail_button_item.xml
rename to session/src/main/res/layout/mediarail_button_item.xml
diff --git a/messenger/src/main/res/layout/mediarail_media_item.xml b/session/src/main/res/layout/mediarail_media_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/mediarail_media_item.xml
rename to session/src/main/res/layout/mediarail_media_item.xml
diff --git a/messenger/src/main/res/layout/mediasend_activity.xml b/session/src/main/res/layout/mediasend_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/mediasend_activity.xml
rename to session/src/main/res/layout/mediasend_activity.xml
diff --git a/messenger/src/main/res/layout/mediasend_fragment.xml b/session/src/main/res/layout/mediasend_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/mediasend_fragment.xml
rename to session/src/main/res/layout/mediasend_fragment.xml
diff --git a/messenger/src/main/res/layout/mediasend_image_fragment.xml b/session/src/main/res/layout/mediasend_image_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/mediasend_image_fragment.xml
rename to session/src/main/res/layout/mediasend_image_fragment.xml
diff --git a/messenger/src/main/res/layout/mediasend_video_fragment.xml b/session/src/main/res/layout/mediasend_video_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/mediasend_video_fragment.xml
rename to session/src/main/res/layout/mediasend_video_fragment.xml
diff --git a/messenger/src/main/res/layout/message_audio_view.xml b/session/src/main/res/layout/message_audio_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/message_audio_view.xml
rename to session/src/main/res/layout/message_audio_view.xml
diff --git a/messenger/src/main/res/layout/message_details_activity.xml b/session/src/main/res/layout/message_details_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/message_details_activity.xml
rename to session/src/main/res/layout/message_details_activity.xml
diff --git a/messenger/src/main/res/layout/message_details_header.xml b/session/src/main/res/layout/message_details_header.xml
similarity index 100%
rename from messenger/src/main/res/layout/message_details_header.xml
rename to session/src/main/res/layout/message_details_header.xml
diff --git a/messenger/src/main/res/layout/message_recipient_list_item.xml b/session/src/main/res/layout/message_recipient_list_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/message_recipient_list_item.xml
rename to session/src/main/res/layout/message_recipient_list_item.xml
diff --git a/messenger/src/main/res/layout/microphone_recorder_view.xml b/session/src/main/res/layout/microphone_recorder_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/microphone_recorder_view.xml
rename to session/src/main/res/layout/microphone_recorder_view.xml
diff --git a/messenger/src/main/res/layout/permissions_rationale_dialog.xml b/session/src/main/res/layout/permissions_rationale_dialog.xml
similarity index 100%
rename from messenger/src/main/res/layout/permissions_rationale_dialog.xml
rename to session/src/main/res/layout/permissions_rationale_dialog.xml
diff --git a/messenger/src/main/res/layout/phone_text.xml b/session/src/main/res/layout/phone_text.xml
similarity index 100%
rename from messenger/src/main/res/layout/phone_text.xml
rename to session/src/main/res/layout/phone_text.xml
diff --git a/messenger/src/main/res/layout/preference_divider.xml b/session/src/main/res/layout/preference_divider.xml
similarity index 100%
rename from messenger/src/main/res/layout/preference_divider.xml
rename to session/src/main/res/layout/preference_divider.xml
diff --git a/messenger/src/main/res/layout/preference_right_summary_widget.xml b/session/src/main/res/layout/preference_right_summary_widget.xml
similarity index 100%
rename from messenger/src/main/res/layout/preference_right_summary_widget.xml
rename to session/src/main/res/layout/preference_right_summary_widget.xml
diff --git a/messenger/src/main/res/layout/preference_widget_color_swatch.xml b/session/src/main/res/layout/preference_widget_color_swatch.xml
similarity index 100%
rename from messenger/src/main/res/layout/preference_widget_color_swatch.xml
rename to session/src/main/res/layout/preference_widget_color_swatch.xml
diff --git a/messenger/src/main/res/layout/preference_widget_progress.xml b/session/src/main/res/layout/preference_widget_progress.xml
similarity index 100%
rename from messenger/src/main/res/layout/preference_widget_progress.xml
rename to session/src/main/res/layout/preference_widget_progress.xml
diff --git a/messenger/src/main/res/layout/profile_create_activity.xml b/session/src/main/res/layout/profile_create_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/profile_create_activity.xml
rename to session/src/main/res/layout/profile_create_activity.xml
diff --git a/messenger/src/main/res/layout/profile_group_share_view.xml b/session/src/main/res/layout/profile_group_share_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/profile_group_share_view.xml
rename to session/src/main/res/layout/profile_group_share_view.xml
diff --git a/messenger/src/main/res/layout/profile_name_text.xml b/session/src/main/res/layout/profile_name_text.xml
similarity index 100%
rename from messenger/src/main/res/layout/profile_name_text.xml
rename to session/src/main/res/layout/profile_name_text.xml
diff --git a/messenger/src/main/res/layout/profile_preference_view.xml b/session/src/main/res/layout/profile_preference_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/profile_preference_view.xml
rename to session/src/main/res/layout/profile_preference_view.xml
diff --git a/messenger/src/main/res/layout/progress_dialog.xml b/session/src/main/res/layout/progress_dialog.xml
similarity index 100%
rename from messenger/src/main/res/layout/progress_dialog.xml
rename to session/src/main/res/layout/progress_dialog.xml
diff --git a/messenger/src/main/res/layout/prompt_apn_activity.xml b/session/src/main/res/layout/prompt_apn_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/prompt_apn_activity.xml
rename to session/src/main/res/layout/prompt_apn_activity.xml
diff --git a/messenger/src/main/res/layout/prompt_passphrase_activity.xml b/session/src/main/res/layout/prompt_passphrase_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/prompt_passphrase_activity.xml
rename to session/src/main/res/layout/prompt_passphrase_activity.xml
diff --git a/messenger/src/main/res/layout/push_recipients_panel.xml b/session/src/main/res/layout/push_recipients_panel.xml
similarity index 100%
rename from messenger/src/main/res/layout/push_recipients_panel.xml
rename to session/src/main/res/layout/push_recipients_panel.xml
diff --git a/messenger/src/main/res/layout/quick_attachment_drawer.xml b/session/src/main/res/layout/quick_attachment_drawer.xml
similarity index 100%
rename from messenger/src/main/res/layout/quick_attachment_drawer.xml
rename to session/src/main/res/layout/quick_attachment_drawer.xml
diff --git a/messenger/src/main/res/layout/quick_camera_controls.xml b/session/src/main/res/layout/quick_camera_controls.xml
similarity index 100%
rename from messenger/src/main/res/layout/quick_camera_controls.xml
rename to session/src/main/res/layout/quick_camera_controls.xml
diff --git a/messenger/src/main/res/layout/quick_camera_controls_land.xml b/session/src/main/res/layout/quick_camera_controls_land.xml
similarity index 100%
rename from messenger/src/main/res/layout/quick_camera_controls_land.xml
rename to session/src/main/res/layout/quick_camera_controls_land.xml
diff --git a/messenger/src/main/res/layout/quote_view.xml b/session/src/main/res/layout/quote_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/quote_view.xml
rename to session/src/main/res/layout/quote_view.xml
diff --git a/messenger/src/main/res/layout/recent_photo_view.xml b/session/src/main/res/layout/recent_photo_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/recent_photo_view.xml
rename to session/src/main/res/layout/recent_photo_view.xml
diff --git a/messenger/src/main/res/layout/recent_photo_view_item.xml b/session/src/main/res/layout/recent_photo_view_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/recent_photo_view_item.xml
rename to session/src/main/res/layout/recent_photo_view_item.xml
diff --git a/messenger/src/main/res/layout/recipient_filter_item.xml b/session/src/main/res/layout/recipient_filter_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/recipient_filter_item.xml
rename to session/src/main/res/layout/recipient_filter_item.xml
diff --git a/messenger/src/main/res/layout/recipient_preference_activity.xml b/session/src/main/res/layout/recipient_preference_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/recipient_preference_activity.xml
rename to session/src/main/res/layout/recipient_preference_activity.xml
diff --git a/messenger/src/main/res/layout/recipient_preference_contact_widget.xml b/session/src/main/res/layout/recipient_preference_contact_widget.xml
similarity index 100%
rename from messenger/src/main/res/layout/recipient_preference_contact_widget.xml
rename to session/src/main/res/layout/recipient_preference_contact_widget.xml
diff --git a/messenger/src/main/res/layout/recipient_preference_photo_rail.xml b/session/src/main/res/layout/recipient_preference_photo_rail.xml
similarity index 100%
rename from messenger/src/main/res/layout/recipient_preference_photo_rail.xml
rename to session/src/main/res/layout/recipient_preference_photo_rail.xml
diff --git a/messenger/src/main/res/layout/recipient_preference_photo_rail_item.xml b/session/src/main/res/layout/recipient_preference_photo_rail_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/recipient_preference_photo_rail_item.xml
rename to session/src/main/res/layout/recipient_preference_photo_rail_item.xml
diff --git a/messenger/src/main/res/layout/recording_layout.xml b/session/src/main/res/layout/recording_layout.xml
similarity index 100%
rename from messenger/src/main/res/layout/recording_layout.xml
rename to session/src/main/res/layout/recording_layout.xml
diff --git a/messenger/src/main/res/layout/recycler_view_fast_scroller.xml b/session/src/main/res/layout/recycler_view_fast_scroller.xml
similarity index 100%
rename from messenger/src/main/res/layout/recycler_view_fast_scroller.xml
rename to session/src/main/res/layout/recycler_view_fast_scroller.xml
diff --git a/messenger/src/main/res/layout/registration_activity.xml b/session/src/main/res/layout/registration_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/registration_activity.xml
rename to session/src/main/res/layout/registration_activity.xml
diff --git a/messenger/src/main/res/layout/registration_lock_dialog_view.xml b/session/src/main/res/layout/registration_lock_dialog_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/registration_lock_dialog_view.xml
rename to session/src/main/res/layout/registration_lock_dialog_view.xml
diff --git a/messenger/src/main/res/layout/registration_lock_reminder_view.xml b/session/src/main/res/layout/registration_lock_reminder_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/registration_lock_reminder_view.xml
rename to session/src/main/res/layout/registration_lock_reminder_view.xml
diff --git a/messenger/src/main/res/layout/registration_unlock_dialog_view.xml b/session/src/main/res/layout/registration_unlock_dialog_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/registration_unlock_dialog_view.xml
rename to session/src/main/res/layout/registration_unlock_dialog_view.xml
diff --git a/messenger/src/main/res/layout/registration_welcome_activity.xml b/session/src/main/res/layout/registration_welcome_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/registration_welcome_activity.xml
rename to session/src/main/res/layout/registration_welcome_activity.xml
diff --git a/messenger/src/main/res/layout/reminder_header.xml b/session/src/main/res/layout/reminder_header.xml
similarity index 100%
rename from messenger/src/main/res/layout/reminder_header.xml
rename to session/src/main/res/layout/reminder_header.xml
diff --git a/messenger/src/main/res/layout/scribble_fragment_emojidrawer_stub.xml b/session/src/main/res/layout/scribble_fragment_emojidrawer_stub.xml
similarity index 100%
rename from messenger/src/main/res/layout/scribble_fragment_emojidrawer_stub.xml
rename to session/src/main/res/layout/scribble_fragment_emojidrawer_stub.xml
diff --git a/messenger/src/main/res/layout/scribble_select_sticker_activity.xml b/session/src/main/res/layout/scribble_select_sticker_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/scribble_select_sticker_activity.xml
rename to session/src/main/res/layout/scribble_select_sticker_activity.xml
diff --git a/messenger/src/main/res/layout/scribble_select_sticker_fragment.xml b/session/src/main/res/layout/scribble_select_sticker_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/scribble_select_sticker_fragment.xml
rename to session/src/main/res/layout/scribble_select_sticker_fragment.xml
diff --git a/messenger/src/main/res/layout/scribble_sticker_item.xml b/session/src/main/res/layout/scribble_sticker_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/scribble_sticker_item.xml
rename to session/src/main/res/layout/scribble_sticker_item.xml
diff --git a/messenger/src/main/res/layout/search_toolbar.xml b/session/src/main/res/layout/search_toolbar.xml
similarity index 100%
rename from messenger/src/main/res/layout/search_toolbar.xml
rename to session/src/main/res/layout/search_toolbar.xml
diff --git a/messenger/src/main/res/layout/selected_recipient_list_item.xml b/session/src/main/res/layout/selected_recipient_list_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/selected_recipient_list_item.xml
rename to session/src/main/res/layout/selected_recipient_list_item.xml
diff --git a/messenger/src/main/res/layout/session_logo_action_bar_content.xml b/session/src/main/res/layout/session_logo_action_bar_content.xml
similarity index 100%
rename from messenger/src/main/res/layout/session_logo_action_bar_content.xml
rename to session/src/main/res/layout/session_logo_action_bar_content.xml
diff --git a/messenger/src/main/res/layout/session_restore_banner.xml b/session/src/main/res/layout/session_restore_banner.xml
similarity index 100%
rename from messenger/src/main/res/layout/session_restore_banner.xml
rename to session/src/main/res/layout/session_restore_banner.xml
diff --git a/messenger/src/main/res/layout/share_activity.xml b/session/src/main/res/layout/share_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/share_activity.xml
rename to session/src/main/res/layout/share_activity.xml
diff --git a/messenger/src/main/res/layout/share_intent_list.xml b/session/src/main/res/layout/share_intent_list.xml
similarity index 100%
rename from messenger/src/main/res/layout/share_intent_list.xml
rename to session/src/main/res/layout/share_intent_list.xml
diff --git a/messenger/src/main/res/layout/share_intent_row.xml b/session/src/main/res/layout/share_intent_row.xml
similarity index 100%
rename from messenger/src/main/res/layout/share_intent_row.xml
rename to session/src/main/res/layout/share_intent_row.xml
diff --git a/messenger/src/main/res/layout/shared_contact_view.xml b/session/src/main/res/layout/shared_contact_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/shared_contact_view.xml
rename to session/src/main/res/layout/shared_contact_view.xml
diff --git a/messenger/src/main/res/layout/signal_map_view.xml b/session/src/main/res/layout/signal_map_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/signal_map_view.xml
rename to session/src/main/res/layout/signal_map_view.xml
diff --git a/messenger/src/main/res/layout/sticker_keyboard_icon_dark.xml b/session/src/main/res/layout/sticker_keyboard_icon_dark.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_keyboard_icon_dark.xml
rename to session/src/main/res/layout/sticker_keyboard_icon_dark.xml
diff --git a/messenger/src/main/res/layout/sticker_keyboard_icon_dark_selected.xml b/session/src/main/res/layout/sticker_keyboard_icon_dark_selected.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_keyboard_icon_dark_selected.xml
rename to session/src/main/res/layout/sticker_keyboard_icon_dark_selected.xml
diff --git a/messenger/src/main/res/layout/sticker_keyboard_icon_light.xml b/session/src/main/res/layout/sticker_keyboard_icon_light.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_keyboard_icon_light.xml
rename to session/src/main/res/layout/sticker_keyboard_icon_light.xml
diff --git a/messenger/src/main/res/layout/sticker_keyboard_icon_light_selected.xml b/session/src/main/res/layout/sticker_keyboard_icon_light_selected.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_keyboard_icon_light_selected.xml
rename to session/src/main/res/layout/sticker_keyboard_icon_light_selected.xml
diff --git a/messenger/src/main/res/layout/sticker_keyboard_page.xml b/session/src/main/res/layout/sticker_keyboard_page.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_keyboard_page.xml
rename to session/src/main/res/layout/sticker_keyboard_page.xml
diff --git a/messenger/src/main/res/layout/sticker_keyboard_page_list_item.xml b/session/src/main/res/layout/sticker_keyboard_page_list_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_keyboard_page_list_item.xml
rename to session/src/main/res/layout/sticker_keyboard_page_list_item.xml
diff --git a/messenger/src/main/res/layout/sticker_management_activity.xml b/session/src/main/res/layout/sticker_management_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_management_activity.xml
rename to session/src/main/res/layout/sticker_management_activity.xml
diff --git a/messenger/src/main/res/layout/sticker_management_empty_item.xml b/session/src/main/res/layout/sticker_management_empty_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_management_empty_item.xml
rename to session/src/main/res/layout/sticker_management_empty_item.xml
diff --git a/messenger/src/main/res/layout/sticker_management_header_item.xml b/session/src/main/res/layout/sticker_management_header_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_management_header_item.xml
rename to session/src/main/res/layout/sticker_management_header_item.xml
diff --git a/messenger/src/main/res/layout/sticker_management_sticker_item.xml b/session/src/main/res/layout/sticker_management_sticker_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_management_sticker_item.xml
rename to session/src/main/res/layout/sticker_management_sticker_item.xml
diff --git a/messenger/src/main/res/layout/sticker_preview_activity.xml b/session/src/main/res/layout/sticker_preview_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_preview_activity.xml
rename to session/src/main/res/layout/sticker_preview_activity.xml
diff --git a/messenger/src/main/res/layout/sticker_preview_list_item.xml b/session/src/main/res/layout/sticker_preview_list_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_preview_list_item.xml
rename to session/src/main/res/layout/sticker_preview_list_item.xml
diff --git a/messenger/src/main/res/layout/sticker_preview_popup.xml b/session/src/main/res/layout/sticker_preview_popup.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_preview_popup.xml
rename to session/src/main/res/layout/sticker_preview_popup.xml
diff --git a/messenger/src/main/res/layout/sticker_suggestion_list_item.xml b/session/src/main/res/layout/sticker_suggestion_list_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_suggestion_list_item.xml
rename to session/src/main/res/layout/sticker_suggestion_list_item.xml
diff --git a/messenger/src/main/res/layout/sticker_view.xml b/session/src/main/res/layout/sticker_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/sticker_view.xml
rename to session/src/main/res/layout/sticker_view.xml
diff --git a/messenger/src/main/res/layout/switch_compat_preference.xml b/session/src/main/res/layout/switch_compat_preference.xml
similarity index 100%
rename from messenger/src/main/res/layout/switch_compat_preference.xml
rename to session/src/main/res/layout/switch_compat_preference.xml
diff --git a/messenger/src/main/res/layout/thumbnail_view.xml b/session/src/main/res/layout/thumbnail_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/thumbnail_view.xml
rename to session/src/main/res/layout/thumbnail_view.xml
diff --git a/messenger/src/main/res/layout/tooltip.xml b/session/src/main/res/layout/tooltip.xml
similarity index 100%
rename from messenger/src/main/res/layout/tooltip.xml
rename to session/src/main/res/layout/tooltip.xml
diff --git a/messenger/src/main/res/layout/transfer_controls_stub.xml b/session/src/main/res/layout/transfer_controls_stub.xml
similarity index 100%
rename from messenger/src/main/res/layout/transfer_controls_stub.xml
rename to session/src/main/res/layout/transfer_controls_stub.xml
diff --git a/messenger/src/main/res/layout/transfer_controls_view.xml b/session/src/main/res/layout/transfer_controls_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/transfer_controls_view.xml
rename to session/src/main/res/layout/transfer_controls_view.xml
diff --git a/messenger/src/main/res/layout/transport_selection_list_item.xml b/session/src/main/res/layout/transport_selection_list_item.xml
similarity index 100%
rename from messenger/src/main/res/layout/transport_selection_list_item.xml
rename to session/src/main/res/layout/transport_selection_list_item.xml
diff --git a/messenger/src/main/res/layout/typing_indicator_view.xml b/session/src/main/res/layout/typing_indicator_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/typing_indicator_view.xml
rename to session/src/main/res/layout/typing_indicator_view.xml
diff --git a/messenger/src/main/res/layout/unidentified_delivery_learn_more.xml b/session/src/main/res/layout/unidentified_delivery_learn_more.xml
similarity index 100%
rename from messenger/src/main/res/layout/unidentified_delivery_learn_more.xml
rename to session/src/main/res/layout/unidentified_delivery_learn_more.xml
diff --git a/messenger/src/main/res/layout/unknown_sender_view.xml b/session/src/main/res/layout/unknown_sender_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/unknown_sender_view.xml
rename to session/src/main/res/layout/unknown_sender_view.xml
diff --git a/messenger/src/main/res/layout/unverified_banner_view.xml b/session/src/main/res/layout/unverified_banner_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/unverified_banner_view.xml
rename to session/src/main/res/layout/unverified_banner_view.xml
diff --git a/messenger/src/main/res/layout/verification_code_view.xml b/session/src/main/res/layout/verification_code_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/verification_code_view.xml
rename to session/src/main/res/layout/verification_code_view.xml
diff --git a/messenger/src/main/res/layout/verification_pin_keyboard_view.xml b/session/src/main/res/layout/verification_pin_keyboard_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/verification_pin_keyboard_view.xml
rename to session/src/main/res/layout/verification_pin_keyboard_view.xml
diff --git a/messenger/src/main/res/layout/verify_display_fragment.xml b/session/src/main/res/layout/verify_display_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/verify_display_fragment.xml
rename to session/src/main/res/layout/verify_display_fragment.xml
diff --git a/messenger/src/main/res/layout/verify_scan_fragment.xml b/session/src/main/res/layout/verify_scan_fragment.xml
similarity index 100%
rename from messenger/src/main/res/layout/verify_scan_fragment.xml
rename to session/src/main/res/layout/verify_scan_fragment.xml
diff --git a/messenger/src/main/res/layout/video_player.xml b/session/src/main/res/layout/video_player.xml
similarity index 100%
rename from messenger/src/main/res/layout/video_player.xml
rename to session/src/main/res/layout/video_player.xml
diff --git a/messenger/src/main/res/layout/view_conversation.xml b/session/src/main/res/layout/view_conversation.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_conversation.xml
rename to session/src/main/res/layout/view_conversation.xml
diff --git a/messenger/src/main/res/layout/view_device.xml b/session/src/main/res/layout/view_device.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_device.xml
rename to session/src/main/res/layout/view_device.xml
diff --git a/messenger/src/main/res/layout/view_device_linking.xml b/session/src/main/res/layout/view_device_linking.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_device_linking.xml
rename to session/src/main/res/layout/view_device_linking.xml
diff --git a/messenger/src/main/res/layout/view_fake_chat.xml b/session/src/main/res/layout/view_fake_chat.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_fake_chat.xml
rename to session/src/main/res/layout/view_fake_chat.xml
diff --git a/messenger/src/main/res/layout/view_mention_candidate.xml b/session/src/main/res/layout/view_mention_candidate.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_mention_candidate.xml
rename to session/src/main/res/layout/view_mention_candidate.xml
diff --git a/messenger/src/main/res/layout/view_mention_candidate_selection.xml b/session/src/main/res/layout/view_mention_candidate_selection.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_mention_candidate_selection.xml
rename to session/src/main/res/layout/view_mention_candidate_selection.xml
diff --git a/messenger/src/main/res/layout/view_profile_picture.xml b/session/src/main/res/layout/view_profile_picture.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_profile_picture.xml
rename to session/src/main/res/layout/view_profile_picture.xml
diff --git a/messenger/src/main/res/layout/view_qr_code.xml b/session/src/main/res/layout/view_qr_code.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_qr_code.xml
rename to session/src/main/res/layout/view_qr_code.xml
diff --git a/messenger/src/main/res/layout/view_seed_reminder.xml b/session/src/main/res/layout/view_seed_reminder.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_seed_reminder.xml
rename to session/src/main/res/layout/view_seed_reminder.xml
diff --git a/messenger/src/main/res/layout/view_separator.xml b/session/src/main/res/layout/view_separator.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_separator.xml
rename to session/src/main/res/layout/view_separator.xml
diff --git a/messenger/src/main/res/layout/view_user.xml b/session/src/main/res/layout/view_user.xml
similarity index 100%
rename from messenger/src/main/res/layout/view_user.xml
rename to session/src/main/res/layout/view_user.xml
diff --git a/messenger/src/main/res/layout/webrtc_answer_decline_button.xml b/session/src/main/res/layout/webrtc_answer_decline_button.xml
similarity index 100%
rename from messenger/src/main/res/layout/webrtc_answer_decline_button.xml
rename to session/src/main/res/layout/webrtc_answer_decline_button.xml
diff --git a/messenger/src/main/res/layout/webrtc_call_activity.xml b/session/src/main/res/layout/webrtc_call_activity.xml
similarity index 100%
rename from messenger/src/main/res/layout/webrtc_call_activity.xml
rename to session/src/main/res/layout/webrtc_call_activity.xml
diff --git a/messenger/src/main/res/layout/webrtc_call_controls.xml b/session/src/main/res/layout/webrtc_call_controls.xml
similarity index 100%
rename from messenger/src/main/res/layout/webrtc_call_controls.xml
rename to session/src/main/res/layout/webrtc_call_controls.xml
diff --git a/messenger/src/main/res/layout/webrtc_call_screen.xml b/session/src/main/res/layout/webrtc_call_screen.xml
similarity index 100%
rename from messenger/src/main/res/layout/webrtc_call_screen.xml
rename to session/src/main/res/layout/webrtc_call_screen.xml
diff --git a/messenger/src/main/res/layout/zooming_image_view.xml b/session/src/main/res/layout/zooming_image_view.xml
similarity index 100%
rename from messenger/src/main/res/layout/zooming_image_view.xml
rename to session/src/main/res/layout/zooming_image_view.xml
diff --git a/messenger/src/main/res/menu/conversation.xml b/session/src/main/res/menu/conversation.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation.xml
rename to session/src/main/res/menu/conversation.xml
diff --git a/messenger/src/main/res/menu/conversation_block.xml b/session/src/main/res/menu/conversation_block.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_block.xml
rename to session/src/main/res/menu/conversation_block.xml
diff --git a/messenger/src/main/res/menu/conversation_context.xml b/session/src/main/res/menu/conversation_context.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_context.xml
rename to session/src/main/res/menu/conversation_context.xml
diff --git a/messenger/src/main/res/menu/conversation_copy_session_id.xml b/session/src/main/res/menu/conversation_copy_session_id.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_copy_session_id.xml
rename to session/src/main/res/menu/conversation_copy_session_id.xml
diff --git a/messenger/src/main/res/menu/conversation_expiring_off.xml b/session/src/main/res/menu/conversation_expiring_off.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_expiring_off.xml
rename to session/src/main/res/menu/conversation_expiring_off.xml
diff --git a/messenger/src/main/res/menu/conversation_expiring_on.xml b/session/src/main/res/menu/conversation_expiring_on.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_expiring_on.xml
rename to session/src/main/res/menu/conversation_expiring_on.xml
diff --git a/messenger/src/main/res/menu/conversation_insecure.xml b/session/src/main/res/menu/conversation_insecure.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_insecure.xml
rename to session/src/main/res/menu/conversation_insecure.xml
diff --git a/messenger/src/main/res/menu/conversation_list_batch.xml b/session/src/main/res/menu/conversation_list_batch.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_list_batch.xml
rename to session/src/main/res/menu/conversation_list_batch.xml
diff --git a/messenger/src/main/res/menu/conversation_list_search.xml b/session/src/main/res/menu/conversation_list_search.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_list_search.xml
rename to session/src/main/res/menu/conversation_list_search.xml
diff --git a/messenger/src/main/res/menu/conversation_mms_group_options.xml b/session/src/main/res/menu/conversation_mms_group_options.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_mms_group_options.xml
rename to session/src/main/res/menu/conversation_mms_group_options.xml
diff --git a/messenger/src/main/res/menu/conversation_muted.xml b/session/src/main/res/menu/conversation_muted.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_muted.xml
rename to session/src/main/res/menu/conversation_muted.xml
diff --git a/messenger/src/main/res/menu/conversation_popup.xml b/session/src/main/res/menu/conversation_popup.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_popup.xml
rename to session/src/main/res/menu/conversation_popup.xml
diff --git a/messenger/src/main/res/menu/conversation_push_group_options.xml b/session/src/main/res/menu/conversation_push_group_options.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_push_group_options.xml
rename to session/src/main/res/menu/conversation_push_group_options.xml
diff --git a/messenger/src/main/res/menu/conversation_secure.xml b/session/src/main/res/menu/conversation_secure.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_secure.xml
rename to session/src/main/res/menu/conversation_secure.xml
diff --git a/messenger/src/main/res/menu/conversation_unblock.xml b/session/src/main/res/menu/conversation_unblock.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_unblock.xml
rename to session/src/main/res/menu/conversation_unblock.xml
diff --git a/messenger/src/main/res/menu/conversation_unmuted.xml b/session/src/main/res/menu/conversation_unmuted.xml
similarity index 100%
rename from messenger/src/main/res/menu/conversation_unmuted.xml
rename to session/src/main/res/menu/conversation_unmuted.xml
diff --git a/messenger/src/main/res/menu/log_submit.xml b/session/src/main/res/menu/log_submit.xml
similarity index 100%
rename from messenger/src/main/res/menu/log_submit.xml
rename to session/src/main/res/menu/log_submit.xml
diff --git a/messenger/src/main/res/menu/media_overview_context.xml b/session/src/main/res/menu/media_overview_context.xml
similarity index 100%
rename from messenger/src/main/res/menu/media_overview_context.xml
rename to session/src/main/res/menu/media_overview_context.xml
diff --git a/messenger/src/main/res/menu/media_preview.xml b/session/src/main/res/menu/media_preview.xml
similarity index 100%
rename from messenger/src/main/res/menu/media_preview.xml
rename to session/src/main/res/menu/media_preview.xml
diff --git a/messenger/src/main/res/menu/mediapicker_default.xml b/session/src/main/res/menu/mediapicker_default.xml
similarity index 100%
rename from messenger/src/main/res/menu/mediapicker_default.xml
rename to session/src/main/res/menu/mediapicker_default.xml
diff --git a/messenger/src/main/res/menu/menu_apply.xml b/session/src/main/res/menu/menu_apply.xml
similarity index 100%
rename from messenger/src/main/res/menu/menu_apply.xml
rename to session/src/main/res/menu/menu_apply.xml
diff --git a/messenger/src/main/res/menu/menu_done.xml b/session/src/main/res/menu/menu_done.xml
similarity index 100%
rename from messenger/src/main/res/menu/menu_done.xml
rename to session/src/main/res/menu/menu_done.xml
diff --git a/messenger/src/main/res/menu/menu_edit_closed_group.xml b/session/src/main/res/menu/menu_edit_closed_group.xml
similarity index 100%
rename from messenger/src/main/res/menu/menu_edit_closed_group.xml
rename to session/src/main/res/menu/menu_edit_closed_group.xml
diff --git a/messenger/src/main/res/menu/menu_home.xml b/session/src/main/res/menu/menu_home.xml
similarity index 100%
rename from messenger/src/main/res/menu/menu_home.xml
rename to session/src/main/res/menu/menu_home.xml
diff --git a/messenger/src/main/res/menu/menu_linked_devices.xml b/session/src/main/res/menu/menu_linked_devices.xml
similarity index 100%
rename from messenger/src/main/res/menu/menu_linked_devices.xml
rename to session/src/main/res/menu/menu_linked_devices.xml
diff --git a/messenger/src/main/res/menu/menu_pn_mode.xml b/session/src/main/res/menu/menu_pn_mode.xml
similarity index 100%
rename from messenger/src/main/res/menu/menu_pn_mode.xml
rename to session/src/main/res/menu/menu_pn_mode.xml
diff --git a/messenger/src/main/res/menu/new_conversation_activity.xml b/session/src/main/res/menu/new_conversation_activity.xml
similarity index 100%
rename from messenger/src/main/res/menu/new_conversation_activity.xml
rename to session/src/main/res/menu/new_conversation_activity.xml
diff --git a/messenger/src/main/res/menu/settings_general.xml b/session/src/main/res/menu/settings_general.xml
similarity index 100%
rename from messenger/src/main/res/menu/settings_general.xml
rename to session/src/main/res/menu/settings_general.xml
diff --git a/messenger/src/main/res/menu/text_secure_normal.xml b/session/src/main/res/menu/text_secure_normal.xml
similarity index 100%
rename from messenger/src/main/res/menu/text_secure_normal.xml
rename to session/src/main/res/menu/text_secure_normal.xml
diff --git a/messenger/src/main/res/menu/verify_display_fragment_context_menu.xml b/session/src/main/res/menu/verify_display_fragment_context_menu.xml
similarity index 100%
rename from messenger/src/main/res/menu/verify_display_fragment_context_menu.xml
rename to session/src/main/res/menu/verify_display_fragment_context_menu.xml
diff --git a/messenger/src/main/res/menu/verify_identity.xml b/session/src/main/res/menu/verify_identity.xml
similarity index 100%
rename from messenger/src/main/res/menu/verify_identity.xml
rename to session/src/main/res/menu/verify_identity.xml
diff --git a/messenger/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/session/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from messenger/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to session/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/messenger/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/session/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from messenger/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to session/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/messenger/src/main/res/mipmap-hdpi/ic_group_shortcut.png b/session/src/main/res/mipmap-hdpi/ic_group_shortcut.png
similarity index 100%
rename from messenger/src/main/res/mipmap-hdpi/ic_group_shortcut.png
rename to session/src/main/res/mipmap-hdpi/ic_group_shortcut.png
diff --git a/messenger/src/main/res/mipmap-hdpi/ic_launcher.png b/session/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from messenger/src/main/res/mipmap-hdpi/ic_launcher.png
rename to session/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/messenger/src/main/res/mipmap-hdpi/ic_launcher_round.png b/session/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from messenger/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to session/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/messenger/src/main/res/mipmap-hdpi/ic_person_shortcut.png b/session/src/main/res/mipmap-hdpi/ic_person_shortcut.png
similarity index 100%
rename from messenger/src/main/res/mipmap-hdpi/ic_person_shortcut.png
rename to session/src/main/res/mipmap-hdpi/ic_person_shortcut.png
diff --git a/messenger/src/main/res/mipmap-mdpi/ic_group_shortcut.png b/session/src/main/res/mipmap-mdpi/ic_group_shortcut.png
similarity index 100%
rename from messenger/src/main/res/mipmap-mdpi/ic_group_shortcut.png
rename to session/src/main/res/mipmap-mdpi/ic_group_shortcut.png
diff --git a/messenger/src/main/res/mipmap-mdpi/ic_launcher.png b/session/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from messenger/src/main/res/mipmap-mdpi/ic_launcher.png
rename to session/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/messenger/src/main/res/mipmap-mdpi/ic_launcher_round.png b/session/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from messenger/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to session/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/messenger/src/main/res/mipmap-mdpi/ic_person_shortcut.png b/session/src/main/res/mipmap-mdpi/ic_person_shortcut.png
similarity index 100%
rename from messenger/src/main/res/mipmap-mdpi/ic_person_shortcut.png
rename to session/src/main/res/mipmap-mdpi/ic_person_shortcut.png
diff --git a/messenger/src/main/res/mipmap-xhdpi/ic_group_shortcut.png b/session/src/main/res/mipmap-xhdpi/ic_group_shortcut.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xhdpi/ic_group_shortcut.png
rename to session/src/main/res/mipmap-xhdpi/ic_group_shortcut.png
diff --git a/messenger/src/main/res/mipmap-xhdpi/ic_launcher.png b/session/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to session/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/messenger/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/session/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to session/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/messenger/src/main/res/mipmap-xhdpi/ic_person_shortcut.png b/session/src/main/res/mipmap-xhdpi/ic_person_shortcut.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xhdpi/ic_person_shortcut.png
rename to session/src/main/res/mipmap-xhdpi/ic_person_shortcut.png
diff --git a/messenger/src/main/res/mipmap-xxhdpi/ic_group_shortcut.png b/session/src/main/res/mipmap-xxhdpi/ic_group_shortcut.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xxhdpi/ic_group_shortcut.png
rename to session/src/main/res/mipmap-xxhdpi/ic_group_shortcut.png
diff --git a/messenger/src/main/res/mipmap-xxhdpi/ic_launcher.png b/session/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to session/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/messenger/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/session/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to session/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/messenger/src/main/res/mipmap-xxhdpi/ic_person_shortcut.png b/session/src/main/res/mipmap-xxhdpi/ic_person_shortcut.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xxhdpi/ic_person_shortcut.png
rename to session/src/main/res/mipmap-xxhdpi/ic_person_shortcut.png
diff --git a/messenger/src/main/res/mipmap-xxxhdpi/ic_group_shortcut.png b/session/src/main/res/mipmap-xxxhdpi/ic_group_shortcut.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xxxhdpi/ic_group_shortcut.png
rename to session/src/main/res/mipmap-xxxhdpi/ic_group_shortcut.png
diff --git a/messenger/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/session/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to session/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/messenger/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/session/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to session/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/messenger/src/main/res/mipmap-xxxhdpi/ic_person_shortcut.png b/session/src/main/res/mipmap-xxxhdpi/ic_person_shortcut.png
similarity index 100%
rename from messenger/src/main/res/mipmap-xxxhdpi/ic_person_shortcut.png
rename to session/src/main/res/mipmap-xxxhdpi/ic_person_shortcut.png
diff --git a/messenger/src/main/res/raw/censorship_fronting.store b/session/src/main/res/raw/censorship_fronting.store
similarity index 100%
rename from messenger/src/main/res/raw/censorship_fronting.store
rename to session/src/main/res/raw/censorship_fronting.store
diff --git a/messenger/src/main/res/raw/ias.store b/session/src/main/res/raw/ias.store
similarity index 100%
rename from messenger/src/main/res/raw/ias.store
rename to session/src/main/res/raw/ias.store
diff --git a/messenger/src/main/res/raw/redphone_busy.mp3 b/session/src/main/res/raw/redphone_busy.mp3
similarity index 100%
rename from messenger/src/main/res/raw/redphone_busy.mp3
rename to session/src/main/res/raw/redphone_busy.mp3
diff --git a/messenger/src/main/res/raw/redphone_outring.mp3 b/session/src/main/res/raw/redphone_outring.mp3
similarity index 100%
rename from messenger/src/main/res/raw/redphone_outring.mp3
rename to session/src/main/res/raw/redphone_outring.mp3
diff --git a/messenger/src/main/res/raw/webrtc_completed.mp3 b/session/src/main/res/raw/webrtc_completed.mp3
similarity index 100%
rename from messenger/src/main/res/raw/webrtc_completed.mp3
rename to session/src/main/res/raw/webrtc_completed.mp3
diff --git a/messenger/src/main/res/raw/webrtc_disconnected.mp3 b/session/src/main/res/raw/webrtc_disconnected.mp3
similarity index 100%
rename from messenger/src/main/res/raw/webrtc_disconnected.mp3
rename to session/src/main/res/raw/webrtc_disconnected.mp3
diff --git a/messenger/src/main/res/raw/whisper.store b/session/src/main/res/raw/whisper.store
similarity index 100%
rename from messenger/src/main/res/raw/whisper.store
rename to session/src/main/res/raw/whisper.store
diff --git a/messenger/src/main/res/transition/fragment_shared.xml b/session/src/main/res/transition/fragment_shared.xml
similarity index 100%
rename from messenger/src/main/res/transition/fragment_shared.xml
rename to session/src/main/res/transition/fragment_shared.xml
diff --git a/messenger/src/main/res/values-ar/strings.xml b/session/src/main/res/values-ar/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-ar/strings.xml
rename to session/src/main/res/values-ar/strings.xml
diff --git a/messenger/src/main/res/values-az/strings.xml b/session/src/main/res/values-az/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-az/strings.xml
rename to session/src/main/res/values-az/strings.xml
diff --git a/messenger/src/main/res/values-bg/strings.xml b/session/src/main/res/values-bg/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-bg/strings.xml
rename to session/src/main/res/values-bg/strings.xml
diff --git a/messenger/src/main/res/values-ca/strings.xml b/session/src/main/res/values-ca/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-ca/strings.xml
rename to session/src/main/res/values-ca/strings.xml
diff --git a/messenger/src/main/res/values-cs/strings.xml b/session/src/main/res/values-cs/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-cs/strings.xml
rename to session/src/main/res/values-cs/strings.xml
diff --git a/messenger/src/main/res/values-cy/strings.xml b/session/src/main/res/values-cy/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-cy/strings.xml
rename to session/src/main/res/values-cy/strings.xml
diff --git a/messenger/src/main/res/values-da/strings.xml b/session/src/main/res/values-da/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-da/strings.xml
rename to session/src/main/res/values-da/strings.xml
diff --git a/messenger/src/main/res/values-de/strings.xml b/session/src/main/res/values-de/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-de/strings.xml
rename to session/src/main/res/values-de/strings.xml
diff --git a/messenger/src/main/res/values-el/strings.xml b/session/src/main/res/values-el/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-el/strings.xml
rename to session/src/main/res/values-el/strings.xml
diff --git a/messenger/src/main/res/values-eo/strings.xml b/session/src/main/res/values-eo/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-eo/strings.xml
rename to session/src/main/res/values-eo/strings.xml
diff --git a/messenger/src/main/res/values-es/strings.xml b/session/src/main/res/values-es/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-es/strings.xml
rename to session/src/main/res/values-es/strings.xml
diff --git a/messenger/src/main/res/values-et/strings.xml b/session/src/main/res/values-et/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-et/strings.xml
rename to session/src/main/res/values-et/strings.xml
diff --git a/messenger/src/main/res/values-eu/strings.xml b/session/src/main/res/values-eu/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-eu/strings.xml
rename to session/src/main/res/values-eu/strings.xml
diff --git a/messenger/src/main/res/values-fa/strings.xml b/session/src/main/res/values-fa/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-fa/strings.xml
rename to session/src/main/res/values-fa/strings.xml
diff --git a/messenger/src/main/res/values-fi/strings.xml b/session/src/main/res/values-fi/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-fi/strings.xml
rename to session/src/main/res/values-fi/strings.xml
diff --git a/messenger/src/main/res/values-fr/strings.xml b/session/src/main/res/values-fr/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-fr/strings.xml
rename to session/src/main/res/values-fr/strings.xml
diff --git a/messenger/src/main/res/values-ga/strings.xml b/session/src/main/res/values-ga/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-ga/strings.xml
rename to session/src/main/res/values-ga/strings.xml
diff --git a/messenger/src/main/res/values-gl/strings.xml b/session/src/main/res/values-gl/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-gl/strings.xml
rename to session/src/main/res/values-gl/strings.xml
diff --git a/messenger/src/main/res/values-hi/strings.xml b/session/src/main/res/values-hi/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-hi/strings.xml
rename to session/src/main/res/values-hi/strings.xml
diff --git a/messenger/src/main/res/values-hr/strings.xml b/session/src/main/res/values-hr/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-hr/strings.xml
rename to session/src/main/res/values-hr/strings.xml
diff --git a/messenger/src/main/res/values-hu/strings.xml b/session/src/main/res/values-hu/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-hu/strings.xml
rename to session/src/main/res/values-hu/strings.xml
diff --git a/messenger/src/main/res/values-in/strings.xml b/session/src/main/res/values-in/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-in/strings.xml
rename to session/src/main/res/values-in/strings.xml
diff --git a/messenger/src/main/res/values-it/strings.xml b/session/src/main/res/values-it/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-it/strings.xml
rename to session/src/main/res/values-it/strings.xml
diff --git a/messenger/src/main/res/values-iw/strings.xml b/session/src/main/res/values-iw/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-iw/strings.xml
rename to session/src/main/res/values-iw/strings.xml
diff --git a/messenger/src/main/res/values-ja/strings.xml b/session/src/main/res/values-ja/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-ja/strings.xml
rename to session/src/main/res/values-ja/strings.xml
diff --git a/messenger/src/main/res/values-km/strings.xml b/session/src/main/res/values-km/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-km/strings.xml
rename to session/src/main/res/values-km/strings.xml
diff --git a/messenger/src/main/res/values-ko/strings.xml b/session/src/main/res/values-ko/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-ko/strings.xml
rename to session/src/main/res/values-ko/strings.xml
diff --git a/messenger/src/main/res/values-ku/strings.xml b/session/src/main/res/values-ku/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-ku/strings.xml
rename to session/src/main/res/values-ku/strings.xml
diff --git a/messenger/src/main/res/values-land/dimens.xml b/session/src/main/res/values-land/dimens.xml
similarity index 100%
rename from messenger/src/main/res/values-land/dimens.xml
rename to session/src/main/res/values-land/dimens.xml
diff --git a/messenger/src/main/res/values-lg/strings.xml b/session/src/main/res/values-lg/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-lg/strings.xml
rename to session/src/main/res/values-lg/strings.xml
diff --git a/messenger/src/main/res/values-lt/strings.xml b/session/src/main/res/values-lt/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-lt/strings.xml
rename to session/src/main/res/values-lt/strings.xml
diff --git a/messenger/src/main/res/values-mk/strings.xml b/session/src/main/res/values-mk/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-mk/strings.xml
rename to session/src/main/res/values-mk/strings.xml
diff --git a/messenger/src/main/res/values-my/strings.xml b/session/src/main/res/values-my/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-my/strings.xml
rename to session/src/main/res/values-my/strings.xml
diff --git a/messenger/src/main/res/values-nb/strings.xml b/session/src/main/res/values-nb/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-nb/strings.xml
rename to session/src/main/res/values-nb/strings.xml
diff --git a/messenger/src/main/res/values-nl/strings.xml b/session/src/main/res/values-nl/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-nl/strings.xml
rename to session/src/main/res/values-nl/strings.xml
diff --git a/messenger/src/main/res/values-nn/strings.xml b/session/src/main/res/values-nn/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-nn/strings.xml
rename to session/src/main/res/values-nn/strings.xml
diff --git a/messenger/src/main/res/values-notnight-v21/colors.xml b/session/src/main/res/values-notnight-v21/colors.xml
similarity index 100%
rename from messenger/src/main/res/values-notnight-v21/colors.xml
rename to session/src/main/res/values-notnight-v21/colors.xml
diff --git a/messenger/src/main/res/values-notnight-v21/styles.xml b/session/src/main/res/values-notnight-v21/styles.xml
similarity index 100%
rename from messenger/src/main/res/values-notnight-v21/styles.xml
rename to session/src/main/res/values-notnight-v21/styles.xml
diff --git a/messenger/src/main/res/values-notnight-v21/themes.xml b/session/src/main/res/values-notnight-v21/themes.xml
similarity index 100%
rename from messenger/src/main/res/values-notnight-v21/themes.xml
rename to session/src/main/res/values-notnight-v21/themes.xml
diff --git a/messenger/src/main/res/values-notnight-v23/themes.xml b/session/src/main/res/values-notnight-v23/themes.xml
similarity index 100%
rename from messenger/src/main/res/values-notnight-v23/themes.xml
rename to session/src/main/res/values-notnight-v23/themes.xml
diff --git a/messenger/src/main/res/values-pl/strings.xml b/session/src/main/res/values-pl/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-pl/strings.xml
rename to session/src/main/res/values-pl/strings.xml
diff --git a/messenger/src/main/res/values-pt-rBR/strings.xml b/session/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-pt-rBR/strings.xml
rename to session/src/main/res/values-pt-rBR/strings.xml
diff --git a/messenger/src/main/res/values-pt/strings.xml b/session/src/main/res/values-pt/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-pt/strings.xml
rename to session/src/main/res/values-pt/strings.xml
diff --git a/messenger/src/main/res/values-qu-rEC/strings.xml b/session/src/main/res/values-qu-rEC/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-qu-rEC/strings.xml
rename to session/src/main/res/values-qu-rEC/strings.xml
diff --git a/messenger/src/main/res/values-ro/strings.xml b/session/src/main/res/values-ro/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-ro/strings.xml
rename to session/src/main/res/values-ro/strings.xml
diff --git a/messenger/src/main/res/values-ru/strings.xml b/session/src/main/res/values-ru/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-ru/strings.xml
rename to session/src/main/res/values-ru/strings.xml
diff --git a/messenger/src/main/res/values-sk/strings.xml b/session/src/main/res/values-sk/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-sk/strings.xml
rename to session/src/main/res/values-sk/strings.xml
diff --git a/messenger/src/main/res/values-sl/strings.xml b/session/src/main/res/values-sl/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-sl/strings.xml
rename to session/src/main/res/values-sl/strings.xml
diff --git a/messenger/src/main/res/values-small/dimens.xml b/session/src/main/res/values-small/dimens.xml
similarity index 100%
rename from messenger/src/main/res/values-small/dimens.xml
rename to session/src/main/res/values-small/dimens.xml
diff --git a/messenger/src/main/res/values-sq/strings.xml b/session/src/main/res/values-sq/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-sq/strings.xml
rename to session/src/main/res/values-sq/strings.xml
diff --git a/messenger/src/main/res/values-sr/strings.xml b/session/src/main/res/values-sr/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-sr/strings.xml
rename to session/src/main/res/values-sr/strings.xml
diff --git a/messenger/src/main/res/values-sv/strings.xml b/session/src/main/res/values-sv/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-sv/strings.xml
rename to session/src/main/res/values-sv/strings.xml
diff --git a/messenger/src/main/res/values-sw/strings.xml b/session/src/main/res/values-sw/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-sw/strings.xml
rename to session/src/main/res/values-sw/strings.xml
diff --git a/messenger/src/main/res/values-sw360dp/dimens.xml b/session/src/main/res/values-sw360dp/dimens.xml
similarity index 100%
rename from messenger/src/main/res/values-sw360dp/dimens.xml
rename to session/src/main/res/values-sw360dp/dimens.xml
diff --git a/messenger/src/main/res/values-sw400dp/dimens.xml b/session/src/main/res/values-sw400dp/dimens.xml
similarity index 100%
rename from messenger/src/main/res/values-sw400dp/dimens.xml
rename to session/src/main/res/values-sw400dp/dimens.xml
diff --git a/messenger/src/main/res/values-sw480dp/dimens.xml b/session/src/main/res/values-sw480dp/dimens.xml
similarity index 100%
rename from messenger/src/main/res/values-sw480dp/dimens.xml
rename to session/src/main/res/values-sw480dp/dimens.xml
diff --git a/messenger/src/main/res/values-te/strings.xml b/session/src/main/res/values-te/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-te/strings.xml
rename to session/src/main/res/values-te/strings.xml
diff --git a/messenger/src/main/res/values-th/strings.xml b/session/src/main/res/values-th/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-th/strings.xml
rename to session/src/main/res/values-th/strings.xml
diff --git a/messenger/src/main/res/values-tr/strings.xml b/session/src/main/res/values-tr/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-tr/strings.xml
rename to session/src/main/res/values-tr/strings.xml
diff --git a/messenger/src/main/res/values-uk/strings.xml b/session/src/main/res/values-uk/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-uk/strings.xml
rename to session/src/main/res/values-uk/strings.xml
diff --git a/messenger/src/main/res/values-v23/themes.xml b/session/src/main/res/values-v23/themes.xml
similarity index 100%
rename from messenger/src/main/res/values-v23/themes.xml
rename to session/src/main/res/values-v23/themes.xml
diff --git a/messenger/src/main/res/values-v26/values.xml b/session/src/main/res/values-v26/values.xml
similarity index 100%
rename from messenger/src/main/res/values-v26/values.xml
rename to session/src/main/res/values-v26/values.xml
diff --git a/messenger/src/main/res/values-vi/strings.xml b/session/src/main/res/values-vi/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-vi/strings.xml
rename to session/src/main/res/values-vi/strings.xml
diff --git a/messenger/src/main/res/values-zh-rCN/strings.xml b/session/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-zh-rCN/strings.xml
rename to session/src/main/res/values-zh-rCN/strings.xml
diff --git a/messenger/src/main/res/values-zh-rTW/strings.xml b/session/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from messenger/src/main/res/values-zh-rTW/strings.xml
rename to session/src/main/res/values-zh-rTW/strings.xml
diff --git a/messenger/src/main/res/values/arrays.xml b/session/src/main/res/values/arrays.xml
similarity index 100%
rename from messenger/src/main/res/values/arrays.xml
rename to session/src/main/res/values/arrays.xml
diff --git a/messenger/src/main/res/values/attrs.xml b/session/src/main/res/values/attrs.xml
similarity index 100%
rename from messenger/src/main/res/values/attrs.xml
rename to session/src/main/res/values/attrs.xml
diff --git a/messenger/src/main/res/values/colors.xml b/session/src/main/res/values/colors.xml
similarity index 100%
rename from messenger/src/main/res/values/colors.xml
rename to session/src/main/res/values/colors.xml
diff --git a/messenger/src/main/res/values/conversation_colors.xml b/session/src/main/res/values/conversation_colors.xml
similarity index 100%
rename from messenger/src/main/res/values/conversation_colors.xml
rename to session/src/main/res/values/conversation_colors.xml
diff --git a/messenger/src/main/res/values/core_colors.xml b/session/src/main/res/values/core_colors.xml
similarity index 100%
rename from messenger/src/main/res/values/core_colors.xml
rename to session/src/main/res/values/core_colors.xml
diff --git a/messenger/src/main/res/values/crop_area_renderer.xml b/session/src/main/res/values/crop_area_renderer.xml
similarity index 100%
rename from messenger/src/main/res/values/crop_area_renderer.xml
rename to session/src/main/res/values/crop_area_renderer.xml
diff --git a/messenger/src/main/res/values/dimens.xml b/session/src/main/res/values/dimens.xml
similarity index 100%
rename from messenger/src/main/res/values/dimens.xml
rename to session/src/main/res/values/dimens.xml
diff --git a/messenger/src/main/res/values/emoji.xml b/session/src/main/res/values/emoji.xml
similarity index 100%
rename from messenger/src/main/res/values/emoji.xml
rename to session/src/main/res/values/emoji.xml
diff --git a/messenger/src/main/res/values/google-playstore-strings.xml b/session/src/main/res/values/google-playstore-strings.xml
similarity index 100%
rename from messenger/src/main/res/values/google-playstore-strings.xml
rename to session/src/main/res/values/google-playstore-strings.xml
diff --git a/messenger/src/main/res/values/ic_launcher_background.xml b/session/src/main/res/values/ic_launcher_background.xml
similarity index 100%
rename from messenger/src/main/res/values/ic_launcher_background.xml
rename to session/src/main/res/values/ic_launcher_background.xml
diff --git a/messenger/src/main/res/values/ids.xml b/session/src/main/res/values/ids.xml
similarity index 100%
rename from messenger/src/main/res/values/ids.xml
rename to session/src/main/res/values/ids.xml
diff --git a/messenger/src/main/res/values/integers.xml b/session/src/main/res/values/integers.xml
similarity index 100%
rename from messenger/src/main/res/values/integers.xml
rename to session/src/main/res/values/integers.xml
diff --git a/messenger/src/main/res/values/material_colors.xml b/session/src/main/res/values/material_colors.xml
similarity index 100%
rename from messenger/src/main/res/values/material_colors.xml
rename to session/src/main/res/values/material_colors.xml
diff --git a/messenger/src/main/res/values/strings.xml b/session/src/main/res/values/strings.xml
similarity index 100%
rename from messenger/src/main/res/values/strings.xml
rename to session/src/main/res/values/strings.xml
diff --git a/messenger/src/main/res/values/styles.xml b/session/src/main/res/values/styles.xml
similarity index 100%
rename from messenger/src/main/res/values/styles.xml
rename to session/src/main/res/values/styles.xml
diff --git a/messenger/src/main/res/values/text_styles.xml b/session/src/main/res/values/text_styles.xml
similarity index 100%
rename from messenger/src/main/res/values/text_styles.xml
rename to session/src/main/res/values/text_styles.xml
diff --git a/messenger/src/main/res/values/themes.xml b/session/src/main/res/values/themes.xml
similarity index 100%
rename from messenger/src/main/res/values/themes.xml
rename to session/src/main/res/values/themes.xml
diff --git a/messenger/src/main/res/values/values.xml b/session/src/main/res/values/values.xml
similarity index 100%
rename from messenger/src/main/res/values/values.xml
rename to session/src/main/res/values/values.xml
diff --git a/messenger/src/main/res/values/vector_paths.xml b/session/src/main/res/values/vector_paths.xml
similarity index 100%
rename from messenger/src/main/res/values/vector_paths.xml
rename to session/src/main/res/values/vector_paths.xml
diff --git a/messenger/src/main/res/xml-mcc202-mnc1/mms_config.xml b/session/src/main/res/xml-mcc202-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc202-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc202-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc202-mnc5/mms_config.xml b/session/src/main/res/xml-mcc202-mnc5/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc202-mnc5/mms_config.xml
rename to session/src/main/res/xml-mcc202-mnc5/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc204-mnc16/mms_config.xml b/session/src/main/res/xml-mcc204-mnc16/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc204-mnc16/mms_config.xml
rename to session/src/main/res/xml-mcc204-mnc16/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc204-mnc20/mms_config.xml b/session/src/main/res/xml-mcc204-mnc20/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc204-mnc20/mms_config.xml
rename to session/src/main/res/xml-mcc204-mnc20/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc208-mnc1/mms_config.xml b/session/src/main/res/xml-mcc208-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc208-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc208-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc208-mnc10/mms_config.xml b/session/src/main/res/xml-mcc208-mnc10/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc208-mnc10/mms_config.xml
rename to session/src/main/res/xml-mcc208-mnc10/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc208-mnc15/mms_config.xml b/session/src/main/res/xml-mcc208-mnc15/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc208-mnc15/mms_config.xml
rename to session/src/main/res/xml-mcc208-mnc15/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc208-mnc20/mms_config.xml b/session/src/main/res/xml-mcc208-mnc20/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc208-mnc20/mms_config.xml
rename to session/src/main/res/xml-mcc208-mnc20/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc208-mnc26/mms_config.xml b/session/src/main/res/xml-mcc208-mnc26/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc208-mnc26/mms_config.xml
rename to session/src/main/res/xml-mcc208-mnc26/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc214-mnc1/mms_config.xml b/session/src/main/res/xml-mcc214-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc214-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc214-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc214-mnc17/mms_config.xml b/session/src/main/res/xml-mcc214-mnc17/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc214-mnc17/mms_config.xml
rename to session/src/main/res/xml-mcc214-mnc17/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc214-mnc21/mms_config.xml b/session/src/main/res/xml-mcc214-mnc21/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc214-mnc21/mms_config.xml
rename to session/src/main/res/xml-mcc214-mnc21/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc214-mnc3/mms_config.xml b/session/src/main/res/xml-mcc214-mnc3/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc214-mnc3/mms_config.xml
rename to session/src/main/res/xml-mcc214-mnc3/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc214-mnc6/mms_config.xml b/session/src/main/res/xml-mcc214-mnc6/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc214-mnc6/mms_config.xml
rename to session/src/main/res/xml-mcc214-mnc6/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc214-mnc7/mms_config.xml b/session/src/main/res/xml-mcc214-mnc7/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc214-mnc7/mms_config.xml
rename to session/src/main/res/xml-mcc214-mnc7/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc216-mnc30/mms_config.xml b/session/src/main/res/xml-mcc216-mnc30/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc216-mnc30/mms_config.xml
rename to session/src/main/res/xml-mcc216-mnc30/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc216-mnc70/mms_config.xml b/session/src/main/res/xml-mcc216-mnc70/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc216-mnc70/mms_config.xml
rename to session/src/main/res/xml-mcc216-mnc70/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc218-mnc5/mms_config.xml b/session/src/main/res/xml-mcc218-mnc5/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc218-mnc5/mms_config.xml
rename to session/src/main/res/xml-mcc218-mnc5/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc219-mnc1/mms_config.xml b/session/src/main/res/xml-mcc219-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc219-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc219-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc220-mnc4/mms_config.xml b/session/src/main/res/xml-mcc220-mnc4/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc220-mnc4/mms_config.xml
rename to session/src/main/res/xml-mcc220-mnc4/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc222-mnc1/mms_config.xml b/session/src/main/res/xml-mcc222-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc222-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc222-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc222-mnc10/mms_config.xml b/session/src/main/res/xml-mcc222-mnc10/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc222-mnc10/mms_config.xml
rename to session/src/main/res/xml-mcc222-mnc10/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc222-mnc8/mms_config.xml b/session/src/main/res/xml-mcc222-mnc8/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc222-mnc8/mms_config.xml
rename to session/src/main/res/xml-mcc222-mnc8/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc226-mnc1/mms_config.xml b/session/src/main/res/xml-mcc226-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc226-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc226-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc226-mnc10/mms_config.xml b/session/src/main/res/xml-mcc226-mnc10/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc226-mnc10/mms_config.xml
rename to session/src/main/res/xml-mcc226-mnc10/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc226-mnc3/mms_config.xml b/session/src/main/res/xml-mcc226-mnc3/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc226-mnc3/mms_config.xml
rename to session/src/main/res/xml-mcc226-mnc3/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc226-mnc6/mms_config.xml b/session/src/main/res/xml-mcc226-mnc6/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc226-mnc6/mms_config.xml
rename to session/src/main/res/xml-mcc226-mnc6/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc228-mnc1/mms_config.xml b/session/src/main/res/xml-mcc228-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc228-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc228-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc230-mnc1/mms_config.xml b/session/src/main/res/xml-mcc230-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc230-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc230-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc230-mnc3/mms_config.xml b/session/src/main/res/xml-mcc230-mnc3/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc230-mnc3/mms_config.xml
rename to session/src/main/res/xml-mcc230-mnc3/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc230-mnc99/mms_config.xml b/session/src/main/res/xml-mcc230-mnc99/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc230-mnc99/mms_config.xml
rename to session/src/main/res/xml-mcc230-mnc99/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc231-mnc2/mms_config.xml b/session/src/main/res/xml-mcc231-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc231-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc231-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc232-mnc1/mms_config.xml b/session/src/main/res/xml-mcc232-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc232-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc232-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc232-mnc3/mms_config.xml b/session/src/main/res/xml-mcc232-mnc3/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc232-mnc3/mms_config.xml
rename to session/src/main/res/xml-mcc232-mnc3/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc232-mnc7/mms_config.xml b/session/src/main/res/xml-mcc232-mnc7/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc232-mnc7/mms_config.xml
rename to session/src/main/res/xml-mcc232-mnc7/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc234-mnc15/mms_config.xml b/session/src/main/res/xml-mcc234-mnc15/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc234-mnc15/mms_config.xml
rename to session/src/main/res/xml-mcc234-mnc15/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc234-mnc3/mms_config.xml b/session/src/main/res/xml-mcc234-mnc3/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc234-mnc3/mms_config.xml
rename to session/src/main/res/xml-mcc234-mnc3/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc238-mnc2/mms_config.xml b/session/src/main/res/xml-mcc238-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc238-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc238-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc238-mnc77/mms_config.xml b/session/src/main/res/xml-mcc238-mnc77/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc238-mnc77/mms_config.xml
rename to session/src/main/res/xml-mcc238-mnc77/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc240-mnc1/mms_config.xml b/session/src/main/res/xml-mcc240-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc240-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc240-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc240-mnc24/mms_config.xml b/session/src/main/res/xml-mcc240-mnc24/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc240-mnc24/mms_config.xml
rename to session/src/main/res/xml-mcc240-mnc24/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc240-mnc4/mms_config.xml b/session/src/main/res/xml-mcc240-mnc4/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc240-mnc4/mms_config.xml
rename to session/src/main/res/xml-mcc240-mnc4/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc240-mnc8/mms_config.xml b/session/src/main/res/xml-mcc240-mnc8/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc240-mnc8/mms_config.xml
rename to session/src/main/res/xml-mcc240-mnc8/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc242-mnc1/mms_config.xml b/session/src/main/res/xml-mcc242-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc242-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc242-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc242-mnc2/mms_config.xml b/session/src/main/res/xml-mcc242-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc242-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc242-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc242-mnc5/mms_config.xml b/session/src/main/res/xml-mcc242-mnc5/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc242-mnc5/mms_config.xml
rename to session/src/main/res/xml-mcc242-mnc5/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc244-mnc91/mms_config.xml b/session/src/main/res/xml-mcc244-mnc91/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc244-mnc91/mms_config.xml
rename to session/src/main/res/xml-mcc244-mnc91/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc255-mnc1/mms_config.xml b/session/src/main/res/xml-mcc255-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc255-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc255-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc260-mnc1/mms_config.xml b/session/src/main/res/xml-mcc260-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc260-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc260-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc260-mnc2/mms_config.xml b/session/src/main/res/xml-mcc260-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc260-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc260-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc260-mnc3/mms_config.xml b/session/src/main/res/xml-mcc260-mnc3/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc260-mnc3/mms_config.xml
rename to session/src/main/res/xml-mcc260-mnc3/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc260-mnc5/mms_config.xml b/session/src/main/res/xml-mcc260-mnc5/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc260-mnc5/mms_config.xml
rename to session/src/main/res/xml-mcc260-mnc5/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc260-mnc6/mms_config.xml b/session/src/main/res/xml-mcc260-mnc6/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc260-mnc6/mms_config.xml
rename to session/src/main/res/xml-mcc260-mnc6/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc262-mnc1/mms_config.xml b/session/src/main/res/xml-mcc262-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc262-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc262-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc262-mnc2/mms_config.xml b/session/src/main/res/xml-mcc262-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc262-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc262-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc262-mnc4/mms_config.xml b/session/src/main/res/xml-mcc262-mnc4/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc262-mnc4/mms_config.xml
rename to session/src/main/res/xml-mcc262-mnc4/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc262-mnc7/mms_config.xml b/session/src/main/res/xml-mcc262-mnc7/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc262-mnc7/mms_config.xml
rename to session/src/main/res/xml-mcc262-mnc7/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc262-mnc9/mms_config.xml b/session/src/main/res/xml-mcc262-mnc9/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc262-mnc9/mms_config.xml
rename to session/src/main/res/xml-mcc262-mnc9/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc268-mnc1/mms_config.xml b/session/src/main/res/xml-mcc268-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc268-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc268-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc272-mnc1/mms_config.xml b/session/src/main/res/xml-mcc272-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc272-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc272-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc274-mnc2/mms_config.xml b/session/src/main/res/xml-mcc274-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc274-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc274-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc274-mnc3/mms_config.xml b/session/src/main/res/xml-mcc274-mnc3/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc274-mnc3/mms_config.xml
rename to session/src/main/res/xml-mcc274-mnc3/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc276-mnc2/mms_config.xml b/session/src/main/res/xml-mcc276-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc276-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc276-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc278-mnc1/mms_config.xml b/session/src/main/res/xml-mcc278-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc278-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc278-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc284-mnc1/mms_config.xml b/session/src/main/res/xml-mcc284-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc284-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc284-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc286-mnc1/mms_config.xml b/session/src/main/res/xml-mcc286-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc286-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc286-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc286-mnc2/mms_config.xml b/session/src/main/res/xml-mcc286-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc286-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc286-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc286-mnc3/mms_config.xml b/session/src/main/res/xml-mcc286-mnc3/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc286-mnc3/mms_config.xml
rename to session/src/main/res/xml-mcc286-mnc3/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc293-mnc40/mms_config.xml b/session/src/main/res/xml-mcc293-mnc40/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc293-mnc40/mms_config.xml
rename to session/src/main/res/xml-mcc293-mnc40/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc294-mnc1/mms_config.xml b/session/src/main/res/xml-mcc294-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc294-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc294-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc294-mnc2/mms_config.xml b/session/src/main/res/xml-mcc294-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc294-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc294-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc294-mnc3/mms_config.xml b/session/src/main/res/xml-mcc294-mnc3/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc294-mnc3/mms_config.xml
rename to session/src/main/res/xml-mcc294-mnc3/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc297-mnc2/mms_config.xml b/session/src/main/res/xml-mcc297-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc297-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc297-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc220/mms_config.xml b/session/src/main/res/xml-mcc302-mnc220/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc220/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc220/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc221/mms_config.xml b/session/src/main/res/xml-mcc302-mnc221/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc221/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc221/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc270/mms_config.xml b/session/src/main/res/xml-mcc302-mnc270/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc270/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc270/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc290/mms_config.xml b/session/src/main/res/xml-mcc302-mnc290/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc290/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc290/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc320/mms_config.xml b/session/src/main/res/xml-mcc302-mnc320/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc320/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc320/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc370/mms_config.xml b/session/src/main/res/xml-mcc302-mnc370/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc370/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc370/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc490/mms_config.xml b/session/src/main/res/xml-mcc302-mnc490/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc490/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc490/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc500/mms_config.xml b/session/src/main/res/xml-mcc302-mnc500/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc500/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc500/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc510/mms_config.xml b/session/src/main/res/xml-mcc302-mnc510/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc510/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc510/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc520/mms_config.xml b/session/src/main/res/xml-mcc302-mnc520/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc520/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc520/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc610/mms_config.xml b/session/src/main/res/xml-mcc302-mnc610/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc610/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc610/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc660/mms_config.xml b/session/src/main/res/xml-mcc302-mnc660/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc660/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc660/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc720/mms_config.xml b/session/src/main/res/xml-mcc302-mnc720/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc720/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc720/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc302-mnc780/mms_config.xml b/session/src/main/res/xml-mcc302-mnc780/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc302-mnc780/mms_config.xml
rename to session/src/main/res/xml-mcc302-mnc780/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc10/mms_config.xml b/session/src/main/res/xml-mcc310-mnc10/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc10/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc10/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc12/mms_config.xml b/session/src/main/res/xml-mcc310-mnc12/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc12/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc12/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc120/mms_config.xml b/session/src/main/res/xml-mcc310-mnc120/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc120/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc120/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc13/mms_config.xml b/session/src/main/res/xml-mcc310-mnc13/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc13/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc13/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc130/mms_config.xml b/session/src/main/res/xml-mcc310-mnc130/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc130/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc130/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc150/mms_config.xml b/session/src/main/res/xml-mcc310-mnc150/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc150/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc150/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc160/mms_config.xml b/session/src/main/res/xml-mcc310-mnc160/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc160/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc160/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc170/mms_config.xml b/session/src/main/res/xml-mcc310-mnc170/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc170/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc170/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc26/mms_config.xml b/session/src/main/res/xml-mcc310-mnc26/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc26/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc26/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc260/mms_config.xml b/session/src/main/res/xml-mcc310-mnc260/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc260/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc260/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc360/mms_config.xml b/session/src/main/res/xml-mcc310-mnc360/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc360/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc360/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc380/mms_config.xml b/session/src/main/res/xml-mcc310-mnc380/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc380/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc380/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc4/mms_config.xml b/session/src/main/res/xml-mcc310-mnc4/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc4/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc4/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc40/mms_config.xml b/session/src/main/res/xml-mcc310-mnc40/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc40/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc40/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc410/mms_config.xml b/session/src/main/res/xml-mcc310-mnc410/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc410/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc410/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc420/mms_config.xml b/session/src/main/res/xml-mcc310-mnc420/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc420/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc420/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc450/mms_config.xml b/session/src/main/res/xml-mcc310-mnc450/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc450/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc450/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc470/mms_config.xml b/session/src/main/res/xml-mcc310-mnc470/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc470/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc470/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc490/mms_config.xml b/session/src/main/res/xml-mcc310-mnc490/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc490/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc490/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc5/mms_config.xml b/session/src/main/res/xml-mcc310-mnc5/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc5/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc5/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc560/mms_config.xml b/session/src/main/res/xml-mcc310-mnc560/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc560/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc560/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc580/mms_config.xml b/session/src/main/res/xml-mcc310-mnc580/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc580/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc580/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc590/mms_config.xml b/session/src/main/res/xml-mcc310-mnc590/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc590/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc590/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc600/mms_config.xml b/session/src/main/res/xml-mcc310-mnc600/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc600/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc600/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc680/mms_config.xml b/session/src/main/res/xml-mcc310-mnc680/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc680/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc680/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc70/mms_config.xml b/session/src/main/res/xml-mcc310-mnc70/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc70/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc70/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc750/mms_config.xml b/session/src/main/res/xml-mcc310-mnc750/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc750/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc750/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc770/mms_config.xml b/session/src/main/res/xml-mcc310-mnc770/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc770/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc770/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc890/mms_config.xml b/session/src/main/res/xml-mcc310-mnc890/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc890/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc890/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc90/mms_config.xml b/session/src/main/res/xml-mcc310-mnc90/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc90/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc90/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc910/mms_config.xml b/session/src/main/res/xml-mcc310-mnc910/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc910/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc910/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc920/mms_config.xml b/session/src/main/res/xml-mcc310-mnc920/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc920/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc920/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc310-mnc980/mms_config.xml b/session/src/main/res/xml-mcc310-mnc980/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc310-mnc980/mms_config.xml
rename to session/src/main/res/xml-mcc310-mnc980/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc100/mms_config.xml b/session/src/main/res/xml-mcc311-mnc100/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc100/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc100/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc110/mms_config.xml b/session/src/main/res/xml-mcc311-mnc110/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc110/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc110/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc12/mms_config.xml b/session/src/main/res/xml-mcc311-mnc12/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc12/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc12/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc180/mms_config.xml b/session/src/main/res/xml-mcc311-mnc180/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc180/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc180/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc220/mms_config.xml b/session/src/main/res/xml-mcc311-mnc220/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc220/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc220/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc221/mms_config.xml b/session/src/main/res/xml-mcc311-mnc221/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc221/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc221/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc222/mms_config.xml b/session/src/main/res/xml-mcc311-mnc222/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc222/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc222/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc223/mms_config.xml b/session/src/main/res/xml-mcc311-mnc223/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc223/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc223/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc224/mms_config.xml b/session/src/main/res/xml-mcc311-mnc224/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc224/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc224/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc225/mms_config.xml b/session/src/main/res/xml-mcc311-mnc225/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc225/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc225/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc226/mms_config.xml b/session/src/main/res/xml-mcc311-mnc226/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc226/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc226/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc227/mms_config.xml b/session/src/main/res/xml-mcc311-mnc227/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc227/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc227/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc228/mms_config.xml b/session/src/main/res/xml-mcc311-mnc228/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc228/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc228/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc229/mms_config.xml b/session/src/main/res/xml-mcc311-mnc229/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc229/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc229/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc230/mms_config.xml b/session/src/main/res/xml-mcc311-mnc230/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc230/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc230/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc270/mms_config.xml b/session/src/main/res/xml-mcc311-mnc270/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc270/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc270/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc271/mms_config.xml b/session/src/main/res/xml-mcc311-mnc271/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc271/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc271/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc272/mms_config.xml b/session/src/main/res/xml-mcc311-mnc272/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc272/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc272/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc273/mms_config.xml b/session/src/main/res/xml-mcc311-mnc273/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc273/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc273/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc274/mms_config.xml b/session/src/main/res/xml-mcc311-mnc274/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc274/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc274/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc275/mms_config.xml b/session/src/main/res/xml-mcc311-mnc275/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc275/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc275/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc276/mms_config.xml b/session/src/main/res/xml-mcc311-mnc276/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc276/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc276/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc277/mms_config.xml b/session/src/main/res/xml-mcc311-mnc277/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc277/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc277/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc278/mms_config.xml b/session/src/main/res/xml-mcc311-mnc278/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc278/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc278/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc279/mms_config.xml b/session/src/main/res/xml-mcc311-mnc279/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc279/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc279/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc280/mms_config.xml b/session/src/main/res/xml-mcc311-mnc280/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc280/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc280/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc281/mms_config.xml b/session/src/main/res/xml-mcc311-mnc281/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc281/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc281/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc282/mms_config.xml b/session/src/main/res/xml-mcc311-mnc282/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc282/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc282/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc283/mms_config.xml b/session/src/main/res/xml-mcc311-mnc283/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc283/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc283/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc284/mms_config.xml b/session/src/main/res/xml-mcc311-mnc284/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc284/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc284/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc285/mms_config.xml b/session/src/main/res/xml-mcc311-mnc285/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc285/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc285/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc286/mms_config.xml b/session/src/main/res/xml-mcc311-mnc286/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc286/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc286/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc287/mms_config.xml b/session/src/main/res/xml-mcc311-mnc287/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc287/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc287/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc288/mms_config.xml b/session/src/main/res/xml-mcc311-mnc288/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc288/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc288/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc289/mms_config.xml b/session/src/main/res/xml-mcc311-mnc289/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc289/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc289/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc340/mms_config.xml b/session/src/main/res/xml-mcc311-mnc340/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc340/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc340/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc370/mms_config.xml b/session/src/main/res/xml-mcc311-mnc370/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc370/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc370/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc390/mms_config.xml b/session/src/main/res/xml-mcc311-mnc390/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc390/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc390/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc410/mms_config.xml b/session/src/main/res/xml-mcc311-mnc410/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc410/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc410/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc430/mms_config.xml b/session/src/main/res/xml-mcc311-mnc430/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc430/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc430/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc440/mms_config.xml b/session/src/main/res/xml-mcc311-mnc440/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc440/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc440/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc480/mms_config.xml b/session/src/main/res/xml-mcc311-mnc480/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc480/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc480/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc481/mms_config.xml b/session/src/main/res/xml-mcc311-mnc481/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc481/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc481/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc482/mms_config.xml b/session/src/main/res/xml-mcc311-mnc482/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc482/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc482/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc483/mms_config.xml b/session/src/main/res/xml-mcc311-mnc483/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc483/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc483/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc484/mms_config.xml b/session/src/main/res/xml-mcc311-mnc484/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc484/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc484/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc485/mms_config.xml b/session/src/main/res/xml-mcc311-mnc485/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc485/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc485/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc486/mms_config.xml b/session/src/main/res/xml-mcc311-mnc486/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc486/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc486/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc487/mms_config.xml b/session/src/main/res/xml-mcc311-mnc487/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc487/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc487/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc488/mms_config.xml b/session/src/main/res/xml-mcc311-mnc488/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc488/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc488/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc489/mms_config.xml b/session/src/main/res/xml-mcc311-mnc489/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc489/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc489/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc490/mms_config.xml b/session/src/main/res/xml-mcc311-mnc490/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc490/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc490/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc580/mms_config.xml b/session/src/main/res/xml-mcc311-mnc580/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc580/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc580/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc581/mms_config.xml b/session/src/main/res/xml-mcc311-mnc581/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc581/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc581/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc582/mms_config.xml b/session/src/main/res/xml-mcc311-mnc582/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc582/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc582/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc583/mms_config.xml b/session/src/main/res/xml-mcc311-mnc583/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc583/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc583/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc584/mms_config.xml b/session/src/main/res/xml-mcc311-mnc584/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc584/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc584/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc585/mms_config.xml b/session/src/main/res/xml-mcc311-mnc585/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc585/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc585/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc586/mms_config.xml b/session/src/main/res/xml-mcc311-mnc586/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc586/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc586/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc587/mms_config.xml b/session/src/main/res/xml-mcc311-mnc587/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc587/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc587/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc588/mms_config.xml b/session/src/main/res/xml-mcc311-mnc588/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc588/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc588/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc589/mms_config.xml b/session/src/main/res/xml-mcc311-mnc589/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc589/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc589/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc590/mms_config.xml b/session/src/main/res/xml-mcc311-mnc590/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc590/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc590/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc70/mms_config.xml b/session/src/main/res/xml-mcc311-mnc70/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc70/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc70/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc311-mnc870/mms_config.xml b/session/src/main/res/xml-mcc311-mnc870/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc311-mnc870/mms_config.xml
rename to session/src/main/res/xml-mcc311-mnc870/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc312-mnc160/mms_config.xml b/session/src/main/res/xml-mcc312-mnc160/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc312-mnc160/mms_config.xml
rename to session/src/main/res/xml-mcc312-mnc160/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc312-mnc420/mms_config.xml b/session/src/main/res/xml-mcc312-mnc420/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc312-mnc420/mms_config.xml
rename to session/src/main/res/xml-mcc312-mnc420/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc312-mnc530/mms_config.xml b/session/src/main/res/xml-mcc312-mnc530/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc312-mnc530/mms_config.xml
rename to session/src/main/res/xml-mcc312-mnc530/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc334-mnc2/mms_config.xml b/session/src/main/res/xml-mcc334-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc334-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc334-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc334-mnc20/mms_config.xml b/session/src/main/res/xml-mcc334-mnc20/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc334-mnc20/mms_config.xml
rename to session/src/main/res/xml-mcc334-mnc20/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc418-mnc20/mms_config.xml b/session/src/main/res/xml-mcc418-mnc20/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc418-mnc20/mms_config.xml
rename to session/src/main/res/xml-mcc418-mnc20/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc418-mnc30/mms_config.xml b/session/src/main/res/xml-mcc418-mnc30/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc418-mnc30/mms_config.xml
rename to session/src/main/res/xml-mcc418-mnc30/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc418-mnc5/mms_config.xml b/session/src/main/res/xml-mcc418-mnc5/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc418-mnc5/mms_config.xml
rename to session/src/main/res/xml-mcc418-mnc5/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc420-mnc4/mms_config.xml b/session/src/main/res/xml-mcc420-mnc4/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc420-mnc4/mms_config.xml
rename to session/src/main/res/xml-mcc420-mnc4/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc426-mnc2/mms_config.xml b/session/src/main/res/xml-mcc426-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc426-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc426-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc427-mnc2/mms_config.xml b/session/src/main/res/xml-mcc427-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc427-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc427-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc440-mnc20/mms_config.xml b/session/src/main/res/xml-mcc440-mnc20/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc440-mnc20/mms_config.xml
rename to session/src/main/res/xml-mcc440-mnc20/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc450-mnc00/mms_config.xml b/session/src/main/res/xml-mcc450-mnc00/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc450-mnc00/mms_config.xml
rename to session/src/main/res/xml-mcc450-mnc00/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc450-mnc2/mms_config.xml b/session/src/main/res/xml-mcc450-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc450-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc450-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc450-mnc5/mms_config.xml b/session/src/main/res/xml-mcc450-mnc5/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc450-mnc5/mms_config.xml
rename to session/src/main/res/xml-mcc450-mnc5/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc450-mnc6/mms_config.xml b/session/src/main/res/xml-mcc450-mnc6/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc450-mnc6/mms_config.xml
rename to session/src/main/res/xml-mcc450-mnc6/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc450-mnc8/mms_config.xml b/session/src/main/res/xml-mcc450-mnc8/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc450-mnc8/mms_config.xml
rename to session/src/main/res/xml-mcc450-mnc8/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc505-mnc1/mms_config.xml b/session/src/main/res/xml-mcc505-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc505-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc505-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc505-mnc3/mms_config.xml b/session/src/main/res/xml-mcc505-mnc3/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc505-mnc3/mms_config.xml
rename to session/src/main/res/xml-mcc505-mnc3/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc505-mnc7/mms_config.xml b/session/src/main/res/xml-mcc505-mnc7/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc505-mnc7/mms_config.xml
rename to session/src/main/res/xml-mcc505-mnc7/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc530-mnc1/mms_config.xml b/session/src/main/res/xml-mcc530-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc530-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc530-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc530-mnc5/mms_config.xml b/session/src/main/res/xml-mcc530-mnc5/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc530-mnc5/mms_config.xml
rename to session/src/main/res/xml-mcc530-mnc5/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc602-mnc2/mms_config.xml b/session/src/main/res/xml-mcc602-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc602-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc602-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc604-mnc00/mms_config.xml b/session/src/main/res/xml-mcc604-mnc00/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc604-mnc00/mms_config.xml
rename to session/src/main/res/xml-mcc604-mnc00/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc604-mnc2/mms_config.xml b/session/src/main/res/xml-mcc604-mnc2/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc604-mnc2/mms_config.xml
rename to session/src/main/res/xml-mcc604-mnc2/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc647-mnc10/mms_config.xml b/session/src/main/res/xml-mcc647-mnc10/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc647-mnc10/mms_config.xml
rename to session/src/main/res/xml-mcc647-mnc10/mms_config.xml
diff --git a/messenger/src/main/res/xml-mcc655-mnc1/mms_config.xml b/session/src/main/res/xml-mcc655-mnc1/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml-mcc655-mnc1/mms_config.xml
rename to session/src/main/res/xml-mcc655-mnc1/mms_config.xml
diff --git a/messenger/src/main/res/xml/automotive_app_desc.xml b/session/src/main/res/xml/automotive_app_desc.xml
similarity index 100%
rename from messenger/src/main/res/xml/automotive_app_desc.xml
rename to session/src/main/res/xml/automotive_app_desc.xml
diff --git a/messenger/src/main/res/xml/contactsformat.xml b/session/src/main/res/xml/contactsformat.xml
similarity index 100%
rename from messenger/src/main/res/xml/contactsformat.xml
rename to session/src/main/res/xml/contactsformat.xml
diff --git a/messenger/src/main/res/xml/file_provider_paths.xml b/session/src/main/res/xml/file_provider_paths.xml
similarity index 100%
rename from messenger/src/main/res/xml/file_provider_paths.xml
rename to session/src/main/res/xml/file_provider_paths.xml
diff --git a/messenger/src/main/res/xml/mms_config.xml b/session/src/main/res/xml/mms_config.xml
similarity index 100%
rename from messenger/src/main/res/xml/mms_config.xml
rename to session/src/main/res/xml/mms_config.xml
diff --git a/messenger/src/main/res/xml/network_security_configuration.xml b/session/src/main/res/xml/network_security_configuration.xml
similarity index 100%
rename from messenger/src/main/res/xml/network_security_configuration.xml
rename to session/src/main/res/xml/network_security_configuration.xml
diff --git a/messenger/src/main/res/xml/pin_keyboard.xml b/session/src/main/res/xml/pin_keyboard.xml
similarity index 100%
rename from messenger/src/main/res/xml/pin_keyboard.xml
rename to session/src/main/res/xml/pin_keyboard.xml
diff --git a/messenger/src/main/res/xml/preferences.xml b/session/src/main/res/xml/preferences.xml
similarity index 100%
rename from messenger/src/main/res/xml/preferences.xml
rename to session/src/main/res/xml/preferences.xml
diff --git a/messenger/src/main/res/xml/preferences_advanced.xml b/session/src/main/res/xml/preferences_advanced.xml
similarity index 100%
rename from messenger/src/main/res/xml/preferences_advanced.xml
rename to session/src/main/res/xml/preferences_advanced.xml
diff --git a/messenger/src/main/res/xml/preferences_app_protection.xml b/session/src/main/res/xml/preferences_app_protection.xml
similarity index 100%
rename from messenger/src/main/res/xml/preferences_app_protection.xml
rename to session/src/main/res/xml/preferences_app_protection.xml
diff --git a/messenger/src/main/res/xml/preferences_appearance.xml b/session/src/main/res/xml/preferences_appearance.xml
similarity index 100%
rename from messenger/src/main/res/xml/preferences_appearance.xml
rename to session/src/main/res/xml/preferences_appearance.xml
diff --git a/messenger/src/main/res/xml/preferences_chats.xml b/session/src/main/res/xml/preferences_chats.xml
similarity index 100%
rename from messenger/src/main/res/xml/preferences_chats.xml
rename to session/src/main/res/xml/preferences_chats.xml
diff --git a/messenger/src/main/res/xml/preferences_manual_mms.xml b/session/src/main/res/xml/preferences_manual_mms.xml
similarity index 100%
rename from messenger/src/main/res/xml/preferences_manual_mms.xml
rename to session/src/main/res/xml/preferences_manual_mms.xml
diff --git a/messenger/src/main/res/xml/preferences_notifications.xml b/session/src/main/res/xml/preferences_notifications.xml
similarity index 100%
rename from messenger/src/main/res/xml/preferences_notifications.xml
rename to session/src/main/res/xml/preferences_notifications.xml
diff --git a/messenger/src/main/res/xml/preferences_sms_mms.xml b/session/src/main/res/xml/preferences_sms_mms.xml
similarity index 100%
rename from messenger/src/main/res/xml/preferences_sms_mms.xml
rename to session/src/main/res/xml/preferences_sms_mms.xml
diff --git a/messenger/src/main/res/xml/recipient_preferences.xml b/session/src/main/res/xml/recipient_preferences.xml
similarity index 100%
rename from messenger/src/main/res/xml/recipient_preferences.xml
rename to session/src/main/res/xml/recipient_preferences.xml
diff --git a/messenger/src/main/res/xml/syncadapter.xml b/session/src/main/res/xml/syncadapter.xml
similarity index 100%
rename from messenger/src/main/res/xml/syncadapter.xml
rename to session/src/main/res/xml/syncadapter.xml
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java b/session/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/camera/OrderEnforcerTest.java b/session/src/test/java/org/thoughtcrime/securesms/camera/OrderEnforcerTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/camera/OrderEnforcerTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/camera/OrderEnforcerTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java b/session/src/test/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/conversation/ConversationAdapterTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java b/session/src/test/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializerTest.java b/session/src/test/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializerTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializerTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializerTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java b/session/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/l10n/LanguageResourcesTest.java b/session/src/test/java/org/thoughtcrime/securesms/l10n/LanguageResourcesTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/l10n/LanguageResourcesTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/l10n/LanguageResourcesTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java b/session/src/test/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java b/session/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/recipients/RecipientExporterTest.java b/session/src/test/java/org/thoughtcrime/securesms/recipients/RecipientExporterTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/recipients/RecipientExporterTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/recipients/RecipientExporterTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java b/session/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java b/session/src/test/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java
rename to session/src/test/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/util/DelimiterUtilTest.java b/session/src/test/java/org/thoughtcrime/securesms/util/DelimiterUtilTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/util/DelimiterUtilTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/util/DelimiterUtilTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/util/ListPartitionTest.java b/session/src/test/java/org/thoughtcrime/securesms/util/ListPartitionTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/util/ListPartitionTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/util/ListPartitionTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java b/session/src/test/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java b/session/src/test/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java b/session/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/util/UtilTest.java b/session/src/test/java/org/thoughtcrime/securesms/util/UtilTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/util/UtilTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/util/UtilTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageStringTest.java b/session/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageStringTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageStringTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageStringTest.java
diff --git a/messenger/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParserTest.java b/session/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParserTest.java
similarity index 100%
rename from messenger/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParserTest.java
rename to session/src/test/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParserTest.java
diff --git a/messenger/src/test/resources/data/data_serialized.json b/session/src/test/resources/data/data_serialized.json
similarity index 100%
rename from messenger/src/test/resources/data/data_serialized.json
rename to session/src/test/resources/data/data_serialized.json
diff --git a/messenger/website/AndroidManifest.xml b/session/website/AndroidManifest.xml
similarity index 100%
rename from messenger/website/AndroidManifest.xml
rename to session/website/AndroidManifest.xml
diff --git a/sessionmessaging/.gitignore b/sessionmessaging/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/sessionmessaging/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/sessionmessaging/build.gradle b/sessionmessaging/build.gradle
new file mode 100644
index 0000000000..0acd7b589a
--- /dev/null
+++ b/sessionmessaging/build.gradle
@@ -0,0 +1,13 @@
+plugins {
+    id 'java-library'
+    id 'kotlin'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+}
\ No newline at end of file
diff --git a/sessionprotocol/.gitignore b/sessionprotocol/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/sessionprotocol/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/sessionprotocol/build.gradle b/sessionprotocol/build.gradle
new file mode 100644
index 0000000000..0acd7b589a
--- /dev/null
+++ b/sessionprotocol/build.gradle
@@ -0,0 +1,13 @@
+plugins {
+    id 'java-library'
+    id 'kotlin'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+}
\ No newline at end of file
diff --git a/sessionsnode/.gitignore b/sessionsnode/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/sessionsnode/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/sessionsnode/build.gradle b/sessionsnode/build.gradle
new file mode 100644
index 0000000000..0acd7b589a
--- /dev/null
+++ b/sessionsnode/build.gradle
@@ -0,0 +1,13 @@
+plugins {
+    id 'java-library'
+    id 'kotlin'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+}
\ No newline at end of file
diff --git a/sessionutilities/.gitignore b/sessionutilities/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/sessionutilities/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/sessionutilities/build.gradle b/sessionutilities/build.gradle
new file mode 100644
index 0000000000..0acd7b589a
--- /dev/null
+++ b/sessionutilities/build.gradle
@@ -0,0 +1,13 @@
+plugins {
+    id 'java-library'
+    id 'kotlin'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 523166bd6d..90ff4c92be 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,12 @@
+include ':signalutilities'
+include ':sessionutilities'
+include ':sessionsnode'
+include ':sessionprotocol'
+include ':sessionmessaging'
 rootProject.name = "session-android"
 
 include ":service"
 include ":service:java"
 include ":service:android"
 
-include ":messenger"
\ No newline at end of file
+include ':session'
\ No newline at end of file
diff --git a/signalutilities/.gitignore b/signalutilities/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/signalutilities/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/signalutilities/build.gradle b/signalutilities/build.gradle
new file mode 100644
index 0000000000..0acd7b589a
--- /dev/null
+++ b/signalutilities/build.gradle
@@ -0,0 +1,13 @@
+plugins {
+    id 'java-library'
+    id 'kotlin'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+}
\ No newline at end of file