diff --git a/app/build.gradle b/app/build.gradle
index 3e0842f9..ff1111da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
-def final VERSION_CODE = 6
-def final VERSION_NAME = '1.0.0-beta1'
+def final VERSION_CODE = 7
+def final VERSION_NAME = '1.0.0-beta2'
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c8af2841..832a037e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
         tools:replace="android:allowBackup">
 
         <activity
-            android:name=".activity.SplashActivity"
+            android:name=".ui.activity.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme">
             <intent-filter>
@@ -41,34 +41,39 @@
         </activity>
 
         <activity
-            android:name=".activity.ConversationsActivity"
+            android:name=".ui.activity.ConversationsActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".activity.ScanActivity"
+            android:name=".ui.activity.ScanActivity"
             android:label="@string/scan__scan"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".activity.ChatActivity"
+            android:name=".ui.activity.ChatActivity"
             android:label="@string/chat__chat"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateHidden" />
 
         <activity
-            android:name=".activity.ProfileActivity"
+            android:name=".ui.activity.ProfileActivity"
             android:label="@string/initial_setup__initial_setup"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme"/>
 
         <activity
-            android:name=".activity.SettingsActivity"
+            android:name=".ui.activity.SettingsActivity"
             android:label="@string/settings__title"
             android:screenOrientation="portrait" />
 
-        <service android:name=".service.BluetoothConnectionService" />
+        <activity
+            android:name=".ui.activity.ContactChooserActivity"
+            android:label="@string/contact_chooser__title"
+            android:screenOrientation="portrait" />
+
+        <service android:name=".data.service.BluetoothConnectionService" />
 
         <meta-data
             android:name="io.fabric.ApiKey"
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ChatApplication.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ChatApplication.kt
index 336dd6b2..1a5830ef 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/ChatApplication.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ChatApplication.kt
@@ -3,9 +3,9 @@ package com.glodanif.bluetoothchat
 import android.app.Activity
 import android.app.Application
 import com.crashlytics.android.Crashlytics
-import com.glodanif.bluetoothchat.activity.ChatActivity
-import com.glodanif.bluetoothchat.activity.ConversationsActivity
-import com.glodanif.bluetoothchat.util.StartStopActivityLifecycleCallbacks
+import com.glodanif.bluetoothchat.ui.activity.ChatActivity
+import com.glodanif.bluetoothchat.ui.activity.ConversationsActivity
+import com.glodanif.bluetoothchat.ui.util.StartStopActivityLifecycleCallbacks
 import io.fabric.sdk.android.Fabric
 import android.os.StrictMode
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/SplashActivity.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/SplashActivity.kt
deleted file mode 100644
index 2930a9a2..00000000
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/SplashActivity.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.glodanif.bluetoothchat.activity
-
-import android.os.Bundle
-import android.os.Handler
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.app.AppCompatDelegate
-import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.model.SettingsManagerImpl
-
-class SplashActivity: AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-        setContentView(R.layout.activity_splash)
-
-        Handler().postDelayed({
-            val settings = SettingsManagerImpl(this)
-            if (settings.getUserName().isEmpty()) {
-                ProfileActivity.start(this, editMode = false)
-            } else {
-                ConversationsActivity.start(this)
-            }
-            finish()
-        }, 500)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/database/ChatDatabase.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/ChatDatabase.kt
similarity index 71%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/database/ChatDatabase.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/ChatDatabase.kt
index ac5afca7..0bfba073 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/database/ChatDatabase.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/ChatDatabase.kt
@@ -1,10 +1,10 @@
-package com.glodanif.bluetoothchat.database
+package com.glodanif.bluetoothchat.data.database
 
 import android.arch.persistence.room.Database
 import android.arch.persistence.room.RoomDatabase
 import android.arch.persistence.room.TypeConverters
-import com.glodanif.bluetoothchat.entity.ChatMessage
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.entity.Conversation
 
 @Database(entities = arrayOf(ChatMessage::class, Conversation::class), version = 1)
 @TypeConverters(*arrayOf(Converter::class))
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/database/ConversationsDao.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/ConversationsDao.kt
similarity index 90%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/database/ConversationsDao.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/ConversationsDao.kt
index 93d8e709..48476607 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/database/ConversationsDao.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/ConversationsDao.kt
@@ -1,7 +1,7 @@
-package com.glodanif.bluetoothchat.database
+package com.glodanif.bluetoothchat.data.database
 
 import android.arch.persistence.room.*
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.Conversation
 
 @Dao
 interface ConversationsDao {
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/database/Converter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/Converter.kt
similarity index 86%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/database/Converter.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/Converter.kt
index 9660b87c..31eaaa98 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/database/Converter.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/Converter.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.database
+package com.glodanif.bluetoothchat.data.database
 
 import android.arch.persistence.room.TypeConverter
 import java.util.*
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/database/MessagesDao.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/MessagesDao.kt
similarity index 86%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/database/MessagesDao.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/MessagesDao.kt
index bf298dc6..91b42ea6 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/database/MessagesDao.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/MessagesDao.kt
@@ -1,10 +1,10 @@
-package com.glodanif.bluetoothchat.database
+package com.glodanif.bluetoothchat.data.database
 
 import android.arch.persistence.room.Dao
 import android.arch.persistence.room.Delete
 import android.arch.persistence.room.Insert
 import android.arch.persistence.room.Query
-import com.glodanif.bluetoothchat.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
 import android.arch.persistence.room.Update
 
 @Dao
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/database/Storage.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/Storage.kt
similarity index 91%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/database/Storage.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/Storage.kt
index 7c818f88..9feb6a3a 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/database/Storage.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/database/Storage.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.database
+package com.glodanif.bluetoothchat.data.database
 
 import android.arch.persistence.room.Room
 import android.content.Context
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/entity/ChatMessage.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/entity/ChatMessage.kt
similarity index 90%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/entity/ChatMessage.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/entity/ChatMessage.kt
index 18d9c2c0..5b0bcc23 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/entity/ChatMessage.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/entity/ChatMessage.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.entity
+package com.glodanif.bluetoothchat.data.entity
 
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.PrimaryKey
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/entity/Conversation.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/entity/Conversation.kt
similarity index 92%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/entity/Conversation.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/entity/Conversation.kt
index 975b1e18..400008bd 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/entity/Conversation.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/entity/Conversation.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.entity
+package com.glodanif.bluetoothchat.data.entity
 
 import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/entity/Message.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/entity/Message.kt
similarity index 98%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/entity/Message.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/entity/Message.kt
index 500938bc..f40f369f 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/entity/Message.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/entity/Message.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.entity
+package com.glodanif.bluetoothchat.data.entity
 
 import android.support.annotation.ColorInt
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/ApkExtractor.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/ApkExtractor.kt
similarity index 98%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/ApkExtractor.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/ApkExtractor.kt
index 92b283bd..a64068ad 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/ApkExtractor.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/ApkExtractor.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.content.Context
 import android.content.pm.PackageManager
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothConnector.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothConnector.kt
similarity index 86%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothConnector.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothConnector.kt
index 8af404d1..137415bc 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothConnector.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothConnector.kt
@@ -1,7 +1,7 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.bluetooth.BluetoothDevice
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.Conversation
 
 interface BluetoothConnector {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothConnectorImpl.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothConnectorImpl.kt
similarity index 95%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothConnectorImpl.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothConnectorImpl.kt
index 7fdc3489..396ad67b 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothConnectorImpl.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothConnectorImpl.kt
@@ -1,14 +1,14 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.bluetooth.BluetoothDevice
 import android.content.ComponentName
 import android.content.Context
 import android.content.ServiceConnection
 import android.os.IBinder
-import com.glodanif.bluetoothchat.entity.ChatMessage
-import com.glodanif.bluetoothchat.entity.Conversation
-import com.glodanif.bluetoothchat.entity.Message
-import com.glodanif.bluetoothchat.service.BluetoothConnectionService
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.Message
+import com.glodanif.bluetoothchat.data.service.BluetoothConnectionService
 
 class BluetoothConnectorImpl(private val context: Context) : BluetoothConnector {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothScanner.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothScanner.kt
similarity index 93%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothScanner.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothScanner.kt
index 67b1aa93..06401e31 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothScanner.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothScanner.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.bluetooth.BluetoothDevice
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothScannerImpl.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothScannerImpl.kt
similarity index 96%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothScannerImpl.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothScannerImpl.kt
index 837a37ba..4777a1ab 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/BluetoothScannerImpl.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/BluetoothScannerImpl.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothDevice
@@ -8,7 +8,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.Handler
 import android.util.Log
-import com.glodanif.bluetoothchat.model.BluetoothScanner.ScanningListener
+import com.glodanif.bluetoothchat.data.model.BluetoothScanner.ScanningListener
 
 class BluetoothScannerImpl(val context: Context) : BluetoothScanner {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/ConversationsStorage.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/ConversationsStorage.kt
similarity index 73%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/ConversationsStorage.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/ConversationsStorage.kt
index 892b119e..4b3e0f48 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/ConversationsStorage.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/ConversationsStorage.kt
@@ -1,6 +1,6 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.Conversation
 
 interface ConversationsStorage {
     fun getConversations(listener: (List<Conversation>) -> Unit)
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/ConversationsStorageImpl.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/ConversationsStorageImpl.kt
similarity index 88%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/ConversationsStorageImpl.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/ConversationsStorageImpl.kt
index eb42b31a..61a1d7d5 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/ConversationsStorageImpl.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/ConversationsStorageImpl.kt
@@ -1,9 +1,9 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.content.Context
 import android.os.Handler
-import com.glodanif.bluetoothchat.database.Storage
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.database.Storage
+import com.glodanif.bluetoothchat.data.entity.Conversation
 import kotlin.concurrent.thread
 
 class ConversationsStorageImpl(context: Context) : ConversationsStorage {
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/FileExtractor.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/FileExtractor.kt
similarity index 72%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/FileExtractor.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/FileExtractor.kt
index 439157e5..b4931ceb 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/FileExtractor.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/FileExtractor.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.net.Uri
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/MessagesStorage.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/MessagesStorage.kt
similarity index 67%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/MessagesStorage.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/MessagesStorage.kt
index 9b4405f2..ef432dd7 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/MessagesStorage.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/MessagesStorage.kt
@@ -1,6 +1,6 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
-import com.glodanif.bluetoothchat.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
 
 interface MessagesStorage {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/MessagesStorageImpl.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/MessagesStorageImpl.kt
similarity index 77%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/MessagesStorageImpl.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/MessagesStorageImpl.kt
index a2f48909..51b7f3f8 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/MessagesStorageImpl.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/MessagesStorageImpl.kt
@@ -1,10 +1,10 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.content.Context
 import android.os.Handler
-import com.glodanif.bluetoothchat.database.Storage
-import com.glodanif.bluetoothchat.database.MessagesDao
-import com.glodanif.bluetoothchat.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.database.Storage
+import com.glodanif.bluetoothchat.data.database.MessagesDao
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
 import kotlin.concurrent.thread
 
 class MessagesStorageImpl(val context: Context) : MessagesStorage {
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/OnConnectionListener.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/OnConnectionListener.kt
similarity index 81%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/OnConnectionListener.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/OnConnectionListener.kt
index c0437142..23177a0b 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/OnConnectionListener.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/OnConnectionListener.kt
@@ -1,7 +1,7 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.bluetooth.BluetoothDevice
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.Conversation
 
 interface OnConnectionListener {
     fun onConnecting()
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/OnMessageListener.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/OnMessageListener.kt
similarity index 69%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/OnMessageListener.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/OnMessageListener.kt
index 2312a39a..c678e396 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/OnMessageListener.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/OnMessageListener.kt
@@ -1,6 +1,6 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
-import com.glodanif.bluetoothchat.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
 
 interface OnMessageListener {
     fun onMessageReceived(message: ChatMessage)
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/OnPrepareListener.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/OnPrepareListener.kt
similarity index 60%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/OnPrepareListener.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/OnPrepareListener.kt
index f25d797e..32516f0a 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/OnPrepareListener.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/OnPrepareListener.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 interface OnPrepareListener {
     fun onPrepared()
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/Preferences.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/Preferences.kt
similarity index 56%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/Preferences.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/Preferences.kt
index 714e7a27..165ca2cb 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/Preferences.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/Preferences.kt
@@ -1,6 +1,6 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
-import com.glodanif.bluetoothchat.util.NotificationSettings
+import com.glodanif.bluetoothchat.ui.util.NotificationSettings
 
 interface Preferences {
     fun isSoundEnabled(): Boolean
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/SettingsManager.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/SettingsManager.kt
similarity index 83%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/SettingsManager.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/SettingsManager.kt
index aa1bce2b..158c77d8 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/SettingsManager.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/SettingsManager.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.support.annotation.ColorInt
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/SettingsManagerImpl.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/SettingsManagerImpl.kt
similarity index 94%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/SettingsManagerImpl.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/SettingsManagerImpl.kt
index 0ad1d125..712c1fa2 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/SettingsManagerImpl.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/SettingsManagerImpl.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.content.Context
 import android.graphics.Color
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/SimpleConnectionListener.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/SimpleConnectionListener.kt
similarity index 86%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/SimpleConnectionListener.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/SimpleConnectionListener.kt
index 7c82ec1e..232148c0 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/SimpleConnectionListener.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/SimpleConnectionListener.kt
@@ -1,7 +1,7 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.bluetooth.BluetoothDevice
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.Conversation
 
 abstract class SimpleConnectionListener : OnConnectionListener {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/UserPreferences.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/UserPreferences.kt
similarity index 86%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/model/UserPreferences.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/UserPreferences.kt
index e891dfaa..53989e3b 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/model/UserPreferences.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/model/UserPreferences.kt
@@ -1,8 +1,8 @@
-package com.glodanif.bluetoothchat.model
+package com.glodanif.bluetoothchat.data.model
 
 import android.content.Context
 import android.preference.PreferenceManager
-import com.glodanif.bluetoothchat.util.NotificationSettings
+import com.glodanif.bluetoothchat.ui.util.NotificationSettings
 
 class UserPreferences(context: Context): Preferences {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/service/BluetoothConnectionService.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/service/BluetoothConnectionService.kt
similarity index 96%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/service/BluetoothConnectionService.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/data/service/BluetoothConnectionService.kt
index 83f19bc1..25600d9c 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/service/BluetoothConnectionService.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/service/BluetoothConnectionService.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.service
+package com.glodanif.bluetoothchat.data.service
 
 import android.app.Service
 import android.bluetooth.BluetoothAdapter
@@ -17,16 +17,16 @@ import android.util.Log
 import com.glodanif.bluetoothchat.BuildConfig
 import com.glodanif.bluetoothchat.ChatApplication
 import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.database.Storage
-import com.glodanif.bluetoothchat.database.ChatDatabase
-import com.glodanif.bluetoothchat.entity.ChatMessage
-import com.glodanif.bluetoothchat.entity.Conversation
-import com.glodanif.bluetoothchat.entity.Message
-import com.glodanif.bluetoothchat.model.*
-import com.glodanif.bluetoothchat.view.NotificationView
-import com.glodanif.bluetoothchat.view.NotificationViewImpl
-import com.glodanif.bluetoothchat.widget.ShortcutManager
-import com.glodanif.bluetoothchat.widget.ShortcutManagerImpl
+import com.glodanif.bluetoothchat.data.database.Storage
+import com.glodanif.bluetoothchat.data.database.ChatDatabase
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.Message
+import com.glodanif.bluetoothchat.data.model.*
+import com.glodanif.bluetoothchat.ui.view.NotificationView
+import com.glodanif.bluetoothchat.ui.view.NotificationViewImpl
+import com.glodanif.bluetoothchat.ui.widget.ShortcutManager
+import com.glodanif.bluetoothchat.ui.widget.ShortcutManagerImpl
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/extension/Extensions.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/extension/Extensions.kt
index 1ad5fdc6..04791cc3 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/extension/Extensions.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/extension/Extensions.kt
@@ -13,14 +13,11 @@ import android.graphics.drawable.Drawable
 import android.opengl.ETC1.getHeight
 import android.opengl.ETC1.getWidth
 
-
-
 fun Date.getRelativeTime(context: Context): String {
 
     val resources = context.resources
 
-    val VIEW_FORMAT: DateFormat =
-            SimpleDateFormat(context.getString(R.string.general__time_format), Locale.ENGLISH)
+    val VIEW_FORMAT = SimpleDateFormat(context.getString(R.string.general__time_format), Locale.ENGLISH)
     val SECOND_MILLIS = 1000
     val MINUTE_MILLIS = 60 * SECOND_MILLIS
     val HOUR_MILLIS = 60 * MINUTE_MILLIS
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ChatActivity.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ChatActivity.kt
similarity index 90%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ChatActivity.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ChatActivity.kt
index 6c85b055..a701d7d5 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ChatActivity.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ChatActivity.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.activity
+package com.glodanif.bluetoothchat.ui.activity
 
 import android.app.Activity
 import android.app.AlertDialog
@@ -7,6 +7,7 @@ import android.app.Service
 import android.bluetooth.BluetoothAdapter
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
@@ -17,20 +18,18 @@ import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.Toast
 import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.adapter.ChatAdapter
-import com.glodanif.bluetoothchat.entity.ChatMessage
-import com.glodanif.bluetoothchat.entity.Conversation
-import com.glodanif.bluetoothchat.model.*
-import com.glodanif.bluetoothchat.presenter.ChatPresenter
-import com.glodanif.bluetoothchat.view.ChatView
-import com.glodanif.bluetoothchat.view.NotificationView
-import com.glodanif.bluetoothchat.widget.ActionView
+import com.glodanif.bluetoothchat.ui.adapter.ChatAdapter
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.entity.Conversation
+import com.glodanif.bluetoothchat.data.model.*
+import com.glodanif.bluetoothchat.ui.presenter.ChatPresenter
+import com.glodanif.bluetoothchat.ui.view.ChatView
+import com.glodanif.bluetoothchat.ui.view.NotificationView
+import com.glodanif.bluetoothchat.ui.widget.ActionView
 import java.util.*
 
 class ChatActivity : SkeletonActivity(), ChatView {
 
-    private val REQUEST_ENABLE_BLUETOOTH = 101
-
     private lateinit var presenter: ChatPresenter
     private val connectionModel: BluetoothConnector = BluetoothConnectorImpl(this)
     private val scanModel: BluetoothScanner = BluetoothScannerImpl(this)
@@ -71,6 +70,10 @@ class ChatActivity : SkeletonActivity(), ChatView {
         toolbar?.subtitle = getString(R.string.chat__not_connected)
         presenter = ChatPresenter(deviceAddress.toString(),
                 this, scanModel, connectionModel, conversationModel, storageModel)
+
+        if (intent.action == Intent.ACTION_SEND) {
+            messageField.setText(intent.data.toString().trim())
+        }
     }
 
     override fun onStart() {
@@ -293,12 +296,22 @@ class ChatActivity : SkeletonActivity(), ChatView {
 
     companion object {
 
-        val EXTRA_ADDRESS = "extra.address"
+        private const val REQUEST_ENABLE_BLUETOOTH = 101
+
+        const val EXTRA_ADDRESS = "extra.address"
 
         fun start(context: Context, address: String) {
             val intent: Intent = Intent(context, ChatActivity::class.java)
                     .putExtra(EXTRA_ADDRESS, address)
             context.startActivity(intent)
         }
+
+        fun start(context: Context, address: String, message: String) {
+            val intent: Intent = Intent(context, ChatActivity::class.java)
+                    .setAction(Intent.ACTION_SEND)
+                    .setData(Uri.parse(message))
+                    .putExtra(EXTRA_ADDRESS, address)
+            context.startActivity(intent)
+        }
     }
 }
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ContactChooserActivity.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ContactChooserActivity.kt
new file mode 100644
index 00000000..c177243a
--- /dev/null
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ContactChooserActivity.kt
@@ -0,0 +1,71 @@
+package com.glodanif.bluetoothchat.ui.activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
+import android.view.View
+import android.widget.TextView
+import com.glodanif.bluetoothchat.R
+import com.glodanif.bluetoothchat.ui.adapter.ContactsAdapter
+import com.glodanif.bluetoothchat.ui.viewmodel.ContactViewModel
+import com.glodanif.bluetoothchat.data.model.ConversationsStorageImpl
+import com.glodanif.bluetoothchat.ui.presenter.ContactChooserPresenter
+import com.glodanif.bluetoothchat.ui.view.ContactChooserView
+
+class ContactChooserActivity : SkeletonActivity(), ContactChooserView {
+
+    private lateinit var presenter: ContactChooserPresenter
+    private val storage = ConversationsStorageImpl(this)
+
+    private lateinit var contactsList: RecyclerView
+    private lateinit var noContactsLabel: TextView
+
+    private val adapter: ContactsAdapter = ContactsAdapter()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_contact_chooser, ActivityType.CHILD_ACTIVITY)
+
+        contactsList = findViewById(R.id.rv_contacts)
+        noContactsLabel = findViewById(R.id.tv_no_contacts)
+
+        contactsList.layoutManager = LinearLayoutManager(this)
+        contactsList.adapter = adapter
+
+        val message = intent.getStringExtra(EXTRA_MESSAGE)
+        adapter.clickListener = {
+            ChatActivity.start(this, it.address, message)
+            finish()
+        }
+
+        presenter = ContactChooserPresenter(this, storage)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        presenter.loadContacts()
+    }
+
+    override fun showContacts(contacts: List<ContactViewModel>) {
+        adapter.conversations = ArrayList(contacts)
+        adapter.notifyDataSetChanged()
+    }
+
+    override fun showNoContacts() {
+        noContactsLabel.visibility = View.VISIBLE
+        contactsList.visibility = View.GONE
+    }
+
+    companion object {
+
+        const val EXTRA_MESSAGE = "extra.message"
+
+        fun start(context: Context, message: String) {
+            val intent = Intent(context, ContactChooserActivity::class.java)
+                    .putExtra(EXTRA_MESSAGE, message)
+            context.startActivity(intent)
+        }
+    }
+}
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ConversationsActivity.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ConversationsActivity.kt
similarity index 88%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ConversationsActivity.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ConversationsActivity.kt
index cdd15203..6372031f 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ConversationsActivity.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ConversationsActivity.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.activity
+package com.glodanif.bluetoothchat.ui.activity
 
 import android.app.Activity
 import android.app.AlertDialog
@@ -16,20 +16,20 @@ import android.widget.Button
 import android.widget.ImageView
 import com.amulyakhare.textdrawable.TextDrawable
 import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.adapter.ConversationsAdapter
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.ui.adapter.ConversationsAdapter
+import com.glodanif.bluetoothchat.data.entity.Conversation
 import com.glodanif.bluetoothchat.extension.getFirstLetter
-import com.glodanif.bluetoothchat.model.BluetoothConnectorImpl
-import com.glodanif.bluetoothchat.model.ConversationsStorageImpl
-import com.glodanif.bluetoothchat.model.SettingsManager
-import com.glodanif.bluetoothchat.model.SettingsManagerImpl
-import com.glodanif.bluetoothchat.presenter.ConversationsPresenter
-import com.glodanif.bluetoothchat.view.ConversationsView
-import com.glodanif.bluetoothchat.view.NotificationView
-import com.glodanif.bluetoothchat.widget.ActionView
-import com.glodanif.bluetoothchat.widget.SettingsPopup
-import com.glodanif.bluetoothchat.widget.ShortcutManager
-import com.glodanif.bluetoothchat.widget.ShortcutManagerImpl
+import com.glodanif.bluetoothchat.data.model.BluetoothConnectorImpl
+import com.glodanif.bluetoothchat.data.model.ConversationsStorageImpl
+import com.glodanif.bluetoothchat.data.model.SettingsManager
+import com.glodanif.bluetoothchat.data.model.SettingsManagerImpl
+import com.glodanif.bluetoothchat.ui.presenter.ConversationsPresenter
+import com.glodanif.bluetoothchat.ui.view.ConversationsView
+import com.glodanif.bluetoothchat.ui.view.NotificationView
+import com.glodanif.bluetoothchat.ui.widget.ActionView
+import com.glodanif.bluetoothchat.ui.widget.SettingsPopup
+import com.glodanif.bluetoothchat.ui.widget.ShortcutManager
+import com.glodanif.bluetoothchat.ui.widget.ShortcutManagerImpl
 import java.util.*
 
 class ConversationsActivity : SkeletonActivity(), ConversationsView {
@@ -63,7 +63,7 @@ class ConversationsActivity : SkeletonActivity(), ConversationsView {
         shortcutsManager = ShortcutManagerImpl(this)
         presenter = ConversationsPresenter(this, connection, storage, settings)
 
-        actions = findViewById<ActionView>(R.id.av_actions)
+        actions = findViewById(R.id.av_actions)
 
         userAvatar = findViewById(R.id.iv_avatar)
         conversationsList = findViewById(R.id.rv_conversations)
@@ -94,6 +94,12 @@ class ConversationsActivity : SkeletonActivity(), ConversationsView {
         optionsButton.setOnClickListener { v ->
             settingsPopup.show(v)
         }
+
+        if (intent.action == Intent.ACTION_SEND) {
+            ContactChooserActivity.start(this, intent.getStringExtra(Intent.EXTRA_TEXT))
+        }
+
+        ShortcutManagerImpl(this).addSearchShortcut()
     }
 
     private fun showContextMenu(conversation: Conversation, isCurrent: Boolean) {
@@ -146,6 +152,7 @@ class ConversationsActivity : SkeletonActivity(), ConversationsView {
     override fun onStart() {
         super.onStart()
         isStarted = true
+
         presenter.prepareConnection()
         presenter.loadUserProfile()
     }
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ProfileActivity.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ProfileActivity.kt
similarity index 84%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ProfileActivity.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ProfileActivity.kt
index a290a6aa..632f0b5c 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ProfileActivity.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ProfileActivity.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.activity
+package com.glodanif.bluetoothchat.ui.activity
 
 import android.content.Context
 import android.content.Intent
@@ -12,12 +12,12 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.amulyakhare.textdrawable.TextDrawable
 import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.model.SettingsManager
-import com.glodanif.bluetoothchat.model.SettingsManagerImpl
-import com.glodanif.bluetoothchat.presenter.ProfilePresenter
-import com.glodanif.bluetoothchat.util.SimpleTextWatcher
-import com.glodanif.bluetoothchat.view.ProfileView
-import com.glodanif.bluetoothchat.widget.ShortcutManagerImpl
+import com.glodanif.bluetoothchat.data.model.SettingsManager
+import com.glodanif.bluetoothchat.data.model.SettingsManagerImpl
+import com.glodanif.bluetoothchat.ui.presenter.ProfilePresenter
+import com.glodanif.bluetoothchat.ui.util.SimpleTextWatcher
+import com.glodanif.bluetoothchat.ui.view.ProfileView
+import com.glodanif.bluetoothchat.ui.widget.ShortcutManagerImpl
 import me.priyesh.chroma.ChromaDialog
 import me.priyesh.chroma.ColorMode
 import me.priyesh.chroma.ColorSelectListener
@@ -95,8 +95,15 @@ class ProfileActivity : SkeletonActivity(), ProfileView {
     }
 
     override fun redirectToConversations() {
+
         if (!editMode) {
-            ConversationsActivity.start(this)
+
+            val intent = Intent(this, ConversationsActivity::class.java)
+            if (getIntent().action == Intent.ACTION_SEND) {
+                intent.action = Intent.ACTION_SEND
+                intent.putExtra(Intent.EXTRA_TEXT, getIntent().getStringExtra(Intent.EXTRA_TEXT))
+            }
+            startActivity(intent)
         }
         finish()
     }
@@ -109,10 +116,6 @@ class ProfileActivity : SkeletonActivity(), ProfileView {
         nameField.error = getString(R.string.profile__validation_error)
     }
 
-    override fun addSearchShortcut() {
-        ShortcutManagerImpl(this).addSearchShortcut()
-    }
-
     private val textWatcher = object : SimpleTextWatcher() {
         override fun afterTextChanged(text: String) {
             nameField.error = null
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ScanActivity.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ScanActivity.kt
similarity index 92%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ScanActivity.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ScanActivity.kt
index 6ba92c8f..00924409 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ScanActivity.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/ScanActivity.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.activity
+package com.glodanif.bluetoothchat.ui.activity
 
 import android.Manifest
 import android.app.Activity
@@ -18,13 +18,13 @@ import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.*
 import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.adapter.DevicesAdapter
-import com.glodanif.bluetoothchat.model.ApkExtractor
-import com.glodanif.bluetoothchat.model.BluetoothConnectorImpl
-import com.glodanif.bluetoothchat.model.BluetoothScannerImpl
-import com.glodanif.bluetoothchat.presenter.ScanPresenter
-import com.glodanif.bluetoothchat.view.ScanView
-import com.glodanif.bluetoothchat.widget.ExpiringProgressBar
+import com.glodanif.bluetoothchat.ui.adapter.DevicesAdapter
+import com.glodanif.bluetoothchat.data.model.ApkExtractor
+import com.glodanif.bluetoothchat.data.model.BluetoothConnectorImpl
+import com.glodanif.bluetoothchat.data.model.BluetoothScannerImpl
+import com.glodanif.bluetoothchat.ui.presenter.ScanPresenter
+import com.glodanif.bluetoothchat.ui.view.ScanView
+import com.glodanif.bluetoothchat.ui.widget.ExpiringProgressBar
 
 class ScanActivity : SkeletonActivity(), ScanView {
 
@@ -64,14 +64,14 @@ class ScanActivity : SkeletonActivity(), ScanView {
         listHolder = findViewById(R.id.cl_list)
         progress = findViewById(R.id.fl_progress)
 
-        infoLabel = findViewById<TextView>(R.id.tv_info)
-        discoveryLabel = findViewById<TextView>(R.id.tv_discovery_label)
-        progressBar = findViewById<ExpiringProgressBar>(R.id.epb_progress)
+        infoLabel = findViewById(R.id.tv_info)
+        discoveryLabel = findViewById(R.id.tv_discovery_label)
+        progressBar = findViewById(R.id.epb_progress)
 
-        makeDiscoverableButton = findViewById<Button>(R.id.btn_make_discoverable)
-        scanForDevicesButton = findViewById<Button>(R.id.btn_scan)
+        makeDiscoverableButton = findViewById(R.id.btn_make_discoverable)
+        scanForDevicesButton = findViewById(R.id.btn_scan)
 
-        pairedDevicesList = findViewById<RecyclerView>(R.id.rv_paired_devices)
+        pairedDevicesList = findViewById(R.id.rv_paired_devices)
         pairedDevicesList.layoutManager = LinearLayoutManager(this)
         pairedDevicesList.adapter = adapter
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/SettingsActivity.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/SettingsActivity.kt
similarity index 75%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/activity/SettingsActivity.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/SettingsActivity.kt
index 24d0030d..69beafdb 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/SettingsActivity.kt
@@ -1,13 +1,10 @@
-package com.glodanif.bluetoothchat.activity
+package com.glodanif.bluetoothchat.ui.activity
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
-import android.view.MenuItem
 import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.fragment.SettingsFragment
+import com.glodanif.bluetoothchat.ui.fragment.SettingsFragment
 
 class SettingsActivity : SkeletonActivity() {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/SkeletonActivity.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/SkeletonActivity.kt
similarity index 88%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/activity/SkeletonActivity.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/SkeletonActivity.kt
index a616fe3e..063fec55 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/activity/SkeletonActivity.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/SkeletonActivity.kt
@@ -1,11 +1,7 @@
-package com.glodanif.bluetoothchat.activity
+package com.glodanif.bluetoothchat.ui.activity
 
-import android.Manifest
-import android.content.pm.PackageManager
 import android.os.Bundle
 import android.support.annotation.LayoutRes
-import android.support.v4.app.ActivityCompat
-import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.app.AppCompatDelegate
 import android.support.v7.widget.Toolbar
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/SplashActivity.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/SplashActivity.kt
new file mode 100644
index 00000000..0d00f378
--- /dev/null
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/activity/SplashActivity.kt
@@ -0,0 +1,35 @@
+package com.glodanif.bluetoothchat.ui.activity
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.Handler
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.app.AppCompatDelegate
+import com.glodanif.bluetoothchat.R
+import com.glodanif.bluetoothchat.data.model.SettingsManagerImpl
+
+class SplashActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+        setContentView(R.layout.activity_splash)
+
+        Handler().postDelayed({
+
+            val settings = SettingsManagerImpl(this)
+            val intent = Intent(this,
+                    if (settings.getUserName().isEmpty())
+                        ProfileActivity::class.java else ConversationsActivity::class.java)
+
+            if (getIntent().action == Intent.ACTION_SEND) {
+                intent.action = Intent.ACTION_SEND
+                intent.putExtra(Intent.EXTRA_TEXT, getIntent().getStringExtra(Intent.EXTRA_TEXT))
+            }
+
+            startActivity(intent)
+
+            finish()
+        }, 500)
+    }
+}
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/adapter/ChatAdapter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ChatAdapter.kt
similarity index 85%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/adapter/ChatAdapter.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ChatAdapter.kt
index 06dd96ab..b3e2a35e 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/adapter/ChatAdapter.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ChatAdapter.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.adapter
+package com.glodanif.bluetoothchat.ui.adapter
 
 import android.content.Context
 import android.support.v7.widget.RecyclerView
@@ -7,7 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
 import com.glodanif.bluetoothchat.extension.getRelativeTime
 import java.util.*
 
@@ -44,7 +44,7 @@ class ChatAdapter(private val context: Context) : RecyclerView.Adapter<ChatAdapt
     }
 
     class MessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val date: TextView = itemView.findViewById<TextView>(R.id.tv_date)
-        val text: TextView = itemView.findViewById<TextView>(R.id.tv_text)
+        val date: TextView = itemView.findViewById(R.id.tv_date)
+        val text: TextView = itemView.findViewById(R.id.tv_text)
     }
 }
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ContactsAdapter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ContactsAdapter.kt
new file mode 100644
index 00000000..e503b7f7
--- /dev/null
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ContactsAdapter.kt
@@ -0,0 +1,44 @@
+package com.glodanif.bluetoothchat.ui.adapter
+
+import android.annotation.SuppressLint
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import com.glodanif.bluetoothchat.R
+import com.glodanif.bluetoothchat.ui.viewmodel.ContactViewModel
+
+class ContactsAdapter : RecyclerView.Adapter<ContactsAdapter.ContactViewHolder>() {
+
+    var clickListener: ((ContactViewModel) -> Unit)? = null
+    var conversations: ArrayList<ContactViewModel> = ArrayList()
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ContactViewHolder?, position: Int) {
+
+        if (holder == null) return
+
+        val contact = conversations[position]
+
+        holder.name.text = contact.name
+        holder.avatar.setImageDrawable(contact.avatar)
+        holder.itemView?.setOnClickListener { clickListener?.invoke(contact) }
+    }
+
+    override fun getItemCount(): Int {
+        return conversations.size
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ContactViewHolder {
+        val view = LayoutInflater.from(parent?.context)
+                .inflate(R.layout.item_contact, parent, false)
+        return ContactViewHolder(view)
+    }
+
+    class ContactViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val avatar: ImageView = itemView.findViewById(R.id.iv_avatar)
+        val name: TextView = itemView.findViewById(R.id.tv_name)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/adapter/ConversationsAdapter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ConversationsAdapter.kt
similarity index 97%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/adapter/ConversationsAdapter.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ConversationsAdapter.kt
index 67eb8710..a3dd7c4b 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/adapter/ConversationsAdapter.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ConversationsAdapter.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.adapter
+package com.glodanif.bluetoothchat.ui.adapter
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -12,7 +12,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.amulyakhare.textdrawable.TextDrawable
 import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.Conversation
 import com.glodanif.bluetoothchat.extension.getFirstLetter
 import com.glodanif.bluetoothchat.extension.getRelativeTime
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/adapter/DevicesAdapter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/DevicesAdapter.kt
similarity index 84%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/adapter/DevicesAdapter.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/DevicesAdapter.kt
index 8650aa4c..5acba412 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/adapter/DevicesAdapter.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/DevicesAdapter.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.adapter
+package com.glodanif.bluetoothchat.ui.adapter
 
 import android.bluetooth.BluetoothDevice
 import android.content.Context
@@ -48,10 +48,10 @@ class DevicesAdapter(private val context: Context) : RecyclerView.Adapter<Recycl
     }
 
     override fun getItemViewType(position: Int): Int {
-        when (position) {
-            0 -> return TYPE_HEADER
-            pairedList.size + 1 -> return TYPE_HEADER
-            else -> return TYPE_ITEM
+        return when (position) {
+            0 -> TYPE_HEADER
+            pairedList.size + 1 -> TYPE_HEADER
+            else -> TYPE_ITEM
         }
     }
 
@@ -80,12 +80,12 @@ class DevicesAdapter(private val context: Context) : RecyclerView.Adapter<Recycl
     }
 
     class HeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        var header: TextView = itemView.findViewById<TextView>(R.id.tv_header)
-        var emptyMessage: TextView = itemView.findViewById<TextView>(R.id.tv_empty_message)
+        var header: TextView = itemView.findViewById(R.id.tv_header)
+        var emptyMessage: TextView = itemView.findViewById(R.id.tv_empty_message)
     }
 
     class DeviceViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        var name: TextView = itemView.findViewById<TextView>(R.id.tv_name)
-        var macAddress: TextView = itemView.findViewById<TextView>(R.id.tv_mac_address)
+        var name: TextView = itemView.findViewById(R.id.tv_name)
+        var macAddress: TextView = itemView.findViewById(R.id.tv_mac_address)
     }
 }
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/fragment/SettingsFragment.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/fragment/SettingsFragment.kt
similarity index 86%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/fragment/SettingsFragment.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/fragment/SettingsFragment.kt
index 34fbbe83..c5f30a04 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/fragment/SettingsFragment.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/fragment/SettingsFragment.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.fragment
+package com.glodanif.bluetoothchat.ui.fragment
 
 import android.os.Bundle
 import android.preference.PreferenceFragment
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ChatPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ChatPresenter.kt
similarity index 96%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ChatPresenter.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ChatPresenter.kt
index c7a8e50c..f9a7efa8 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ChatPresenter.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ChatPresenter.kt
@@ -1,10 +1,10 @@
-package com.glodanif.bluetoothchat.presenter
+package com.glodanif.bluetoothchat.ui.presenter
 
-import com.glodanif.bluetoothchat.entity.ChatMessage
-import com.glodanif.bluetoothchat.model.*
-import com.glodanif.bluetoothchat.view.ChatView
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.model.*
+import com.glodanif.bluetoothchat.ui.view.ChatView
 import android.bluetooth.BluetoothDevice
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.Conversation
 
 class ChatPresenter(private val deviceAddress: String, private val view: ChatView, private val scanModel: BluetoothScanner,
                     private val connectionModel: BluetoothConnector, private val conversations: ConversationsStorage, private val storage: MessagesStorage) {
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ContactChooserPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ContactChooserPresenter.kt
new file mode 100644
index 00000000..611c45b8
--- /dev/null
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ContactChooserPresenter.kt
@@ -0,0 +1,20 @@
+package com.glodanif.bluetoothchat.ui.presenter
+
+import com.glodanif.bluetoothchat.ui.viewmodel.converter.ContactConverter
+import com.glodanif.bluetoothchat.data.model.ConversationsStorage
+import com.glodanif.bluetoothchat.ui.view.ContactChooserView
+
+class ContactChooserPresenter(private val view: ContactChooserView, private val model: ConversationsStorage) {
+
+    private val converter = ContactConverter()
+
+    fun loadContacts() {
+        model.getConversations {
+            if (!it.isEmpty()) {
+                view.showContacts(converter.transform(it))
+            } else {
+                view.showNoContacts()
+            }
+        }
+    }
+}
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ConversationsPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ConversationsPresenter.kt
similarity index 93%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ConversationsPresenter.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ConversationsPresenter.kt
index eb39ee6e..f52424e1 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ConversationsPresenter.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ConversationsPresenter.kt
@@ -1,10 +1,10 @@
-package com.glodanif.bluetoothchat.presenter
+package com.glodanif.bluetoothchat.ui.presenter
 
 import android.bluetooth.BluetoothDevice
-import com.glodanif.bluetoothchat.entity.ChatMessage
-import com.glodanif.bluetoothchat.entity.Conversation
-import com.glodanif.bluetoothchat.model.*
-import com.glodanif.bluetoothchat.view.ConversationsView
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.entity.Conversation
+import com.glodanif.bluetoothchat.data.model.*
+import com.glodanif.bluetoothchat.ui.view.ConversationsView
 
 class ConversationsPresenter(private val view: ConversationsView, private val connection: BluetoothConnector,
                              private val storage: ConversationsStorage, private val settings: SettingsManager) {
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ProfilePresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ProfilePresenter.kt
similarity index 85%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ProfilePresenter.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ProfilePresenter.kt
index f34555ca..96826e4a 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ProfilePresenter.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ProfilePresenter.kt
@@ -1,8 +1,8 @@
-package com.glodanif.bluetoothchat.presenter
+package com.glodanif.bluetoothchat.ui.presenter
 
 import android.support.annotation.ColorInt
-import com.glodanif.bluetoothchat.model.SettingsManager
-import com.glodanif.bluetoothchat.view.ProfileView
+import com.glodanif.bluetoothchat.data.model.SettingsManager
+import com.glodanif.bluetoothchat.ui.view.ProfileView
 
 class ProfilePresenter(private val view: ProfileView, private val settings: SettingsManager) {
 
@@ -14,7 +14,6 @@ class ProfilePresenter(private val view: ProfileView, private val settings: Sett
         if (!currentName.isEmpty() && currentName.length <= 25 && !currentName.contains("#")) {
             settings.saveUserName(currentName.trim())
             settings.saveUserColor(currentColor)
-            view.addSearchShortcut()
             view.redirectToConversations()
         } else {
             view.showNotValidNameError()
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ScanPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ScanPresenter.kt
similarity index 96%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ScanPresenter.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ScanPresenter.kt
index abf81e59..c02908dd 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/presenter/ScanPresenter.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ScanPresenter.kt
@@ -1,8 +1,8 @@
-package com.glodanif.bluetoothchat.presenter
+package com.glodanif.bluetoothchat.ui.presenter
 
 import android.bluetooth.BluetoothDevice
-import com.glodanif.bluetoothchat.model.*
-import com.glodanif.bluetoothchat.view.ScanView
+import com.glodanif.bluetoothchat.data.model.*
+import com.glodanif.bluetoothchat.ui.view.ScanView
 
 class ScanPresenter(private val view: ScanView, private val scanner: BluetoothScanner,
                     private val connection: BluetoothConnector, private val fileExtractor: FileExtractor) {
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/util/NotificationSettings.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/NotificationSettings.kt
similarity index 72%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/util/NotificationSettings.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/NotificationSettings.kt
index 6b271268..b7341ffe 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/util/NotificationSettings.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/NotificationSettings.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.util
+package com.glodanif.bluetoothchat.ui.util
 
 class NotificationSettings {
     var soundEnabled: Boolean = false
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/util/SimpleTextWatcher.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/SimpleTextWatcher.kt
similarity index 92%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/util/SimpleTextWatcher.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/SimpleTextWatcher.kt
index 3a1460e6..4223f10a 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/util/SimpleTextWatcher.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/SimpleTextWatcher.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.util
+package com.glodanif.bluetoothchat.ui.util
 
 import android.support.annotation.CallSuper
 import android.text.Editable
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/util/StartEndAnimatorListener.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/StartEndAnimatorListener.kt
similarity index 84%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/util/StartEndAnimatorListener.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/StartEndAnimatorListener.kt
index f9a616e7..6ec7b252 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/util/StartEndAnimatorListener.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/StartEndAnimatorListener.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.util
+package com.glodanif.bluetoothchat.ui.util
 
 import android.animation.Animator
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/util/StartStopActivityLifecycleCallbacks.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/StartStopActivityLifecycleCallbacks.kt
similarity index 92%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/util/StartStopActivityLifecycleCallbacks.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/StartStopActivityLifecycleCallbacks.kt
index dfa63f75..6dfc43e7 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/util/StartStopActivityLifecycleCallbacks.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/util/StartStopActivityLifecycleCallbacks.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.util
+package com.glodanif.bluetoothchat.ui.util
 
 import android.app.Activity
 import android.app.Application
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/ChatView.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ChatView.kt
similarity index 85%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/view/ChatView.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ChatView.kt
index 695e2fa8..bb156af5 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/ChatView.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ChatView.kt
@@ -1,7 +1,7 @@
-package com.glodanif.bluetoothchat.view
+package com.glodanif.bluetoothchat.ui.view
 
-import com.glodanif.bluetoothchat.entity.ChatMessage
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.ChatMessage
+import com.glodanif.bluetoothchat.data.entity.Conversation
 
 interface ChatView {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ContactChooserView.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ContactChooserView.kt
new file mode 100644
index 00000000..67c1cee8
--- /dev/null
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ContactChooserView.kt
@@ -0,0 +1,8 @@
+package com.glodanif.bluetoothchat.ui.view
+
+import com.glodanif.bluetoothchat.ui.viewmodel.ContactViewModel
+
+interface ContactChooserView {
+    fun showContacts(contacts: List<ContactViewModel>)
+    fun showNoContacts()
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/ConversationsView.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ConversationsView.kt
similarity index 85%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/view/ConversationsView.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ConversationsView.kt
index 99261934..12532ffa 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/ConversationsView.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ConversationsView.kt
@@ -1,7 +1,7 @@
-package com.glodanif.bluetoothchat.view
+package com.glodanif.bluetoothchat.ui.view
 
 import android.support.annotation.ColorInt
-import com.glodanif.bluetoothchat.entity.Conversation
+import com.glodanif.bluetoothchat.data.entity.Conversation
 
 interface ConversationsView {
 
@@ -16,4 +16,4 @@ interface ConversationsView {
     fun showUserProfile(name: String, @ColorInt color: Int)
     fun dismissConversationNotification()
     fun removeFromShortcuts(address: String)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/NotificationView.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/NotificationView.kt
similarity index 86%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/view/NotificationView.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/NotificationView.kt
index 03013448..24cb16db 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/NotificationView.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/NotificationView.kt
@@ -1,7 +1,7 @@
-package com.glodanif.bluetoothchat.view
+package com.glodanif.bluetoothchat.ui.view
 
 import android.app.Notification
-import com.glodanif.bluetoothchat.util.NotificationSettings
+import com.glodanif.bluetoothchat.ui.util.NotificationSettings
 
 interface NotificationView {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/NotificationViewImpl.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/NotificationViewImpl.kt
similarity index 94%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/view/NotificationViewImpl.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/NotificationViewImpl.kt
index 330dd496..4adc4f5a 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/NotificationViewImpl.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/NotificationViewImpl.kt
@@ -1,18 +1,16 @@
-package com.glodanif.bluetoothchat.view
+package com.glodanif.bluetoothchat.ui.view
 
 import android.app.*
 import android.content.Context
 import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
 import android.graphics.Color
 import android.os.Build
 import android.support.v4.app.NotificationCompat
 import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.activity.ChatActivity
-import com.glodanif.bluetoothchat.activity.ConversationsActivity
-import com.glodanif.bluetoothchat.service.BluetoothConnectionService
-import com.glodanif.bluetoothchat.util.NotificationSettings
+import com.glodanif.bluetoothchat.ui.activity.ChatActivity
+import com.glodanif.bluetoothchat.ui.activity.ConversationsActivity
+import com.glodanif.bluetoothchat.data.service.BluetoothConnectionService
+import com.glodanif.bluetoothchat.ui.util.NotificationSettings
 
 class NotificationViewImpl(private val context: Context) : NotificationView {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/ProfileView.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ProfileView.kt
similarity index 80%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/view/ProfileView.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ProfileView.kt
index 32791151..47acbb15 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/ProfileView.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ProfileView.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.view
+package com.glodanif.bluetoothchat.ui.view
 
 import android.support.annotation.ColorInt
 
@@ -7,6 +7,5 @@ interface ProfileView {
     fun showColorPicker(@ColorInt color: Int)
     fun showNotValidNameError()
     fun prefillUsername(name: String)
-    fun addSearchShortcut()
     fun redirectToConversations()
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/ScanView.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ScanView.kt
similarity index 94%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/view/ScanView.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ScanView.kt
index 177e3662..761033a0 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/view/ScanView.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/view/ScanView.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.view
+package com.glodanif.bluetoothchat.ui.view
 
 import android.bluetooth.BluetoothDevice
 import android.net.Uri
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/ContactViewModel.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/ContactViewModel.kt
new file mode 100644
index 00000000..762d65e2
--- /dev/null
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/ContactViewModel.kt
@@ -0,0 +1,9 @@
+package com.glodanif.bluetoothchat.ui.viewmodel
+
+import com.amulyakhare.textdrawable.TextDrawable
+
+data class ContactViewModel(
+        val address: String,
+        val name: String,
+        val avatar: TextDrawable
+)
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/converter/ContactConverter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/converter/ContactConverter.kt
new file mode 100644
index 00000000..db145155
--- /dev/null
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/converter/ContactConverter.kt
@@ -0,0 +1,27 @@
+package com.glodanif.bluetoothchat.ui.viewmodel.converter
+
+import com.amulyakhare.textdrawable.TextDrawable
+import com.glodanif.bluetoothchat.ui.viewmodel.ContactViewModel
+import com.glodanif.bluetoothchat.data.entity.Conversation
+import com.glodanif.bluetoothchat.extension.getFirstLetter
+import java.util.*
+
+class ContactConverter {
+
+    fun transform(conversation: Conversation): ContactViewModel {
+        return ContactViewModel(
+                conversation.deviceAddress,
+                "${conversation.displayName} (${conversation.deviceName})",
+                TextDrawable.builder()
+                        .buildRound(conversation.displayName.getFirstLetter(), conversation.color)
+        )
+    }
+
+    fun transform(conversationCollection: Collection<Conversation>): List<ContactViewModel> {
+        val list = ArrayList<ContactViewModel>()
+        conversationCollection.forEach{
+            list.add(transform(it))
+        }
+        return list
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ActionView.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ActionView.kt
similarity index 97%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ActionView.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ActionView.kt
index 65f0c50f..faf765bf 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ActionView.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ActionView.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.widget
+package com.glodanif.bluetoothchat.ui.widget
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ExpiringProgressBar.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ExpiringProgressBar.kt
similarity index 98%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ExpiringProgressBar.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ExpiringProgressBar.kt
index 9720a6d6..df95daa9 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ExpiringProgressBar.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ExpiringProgressBar.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.widget
+package com.glodanif.bluetoothchat.ui.widget
 
 import android.content.Context
 import android.graphics.Canvas
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/widget/SettingsPopup.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/SettingsPopup.kt
similarity index 97%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/widget/SettingsPopup.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/SettingsPopup.kt
index 5cd8ed29..47d22f15 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/widget/SettingsPopup.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/SettingsPopup.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.widget
+package com.glodanif.bluetoothchat.ui.widget
 
 import android.animation.Animator
 import android.annotation.SuppressLint
@@ -16,7 +16,7 @@ import android.widget.TextView
 import com.amulyakhare.textdrawable.TextDrawable
 import com.glodanif.bluetoothchat.R
 import com.glodanif.bluetoothchat.extension.getFirstLetter
-import com.glodanif.bluetoothchat.util.StartEndAnimatorListener
+import com.glodanif.bluetoothchat.ui.util.StartEndAnimatorListener
 
 class SettingsPopup(context: Context) : PopupWindow() {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ShortcutManager.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ShortcutManager.kt
similarity index 89%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ShortcutManager.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ShortcutManager.kt
index e1822206..0c31c640 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ShortcutManager.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ShortcutManager.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.widget
+package com.glodanif.bluetoothchat.ui.widget
 
 import android.support.annotation.ColorInt
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ShortcutManagerImpl.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ShortcutManagerImpl.kt
similarity index 89%
rename from app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ShortcutManagerImpl.kt
rename to app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ShortcutManagerImpl.kt
index 5a8c9e49..4f0b5142 100644
--- a/app/src/main/kotlin/com/glodanif/bluetoothchat/widget/ShortcutManagerImpl.kt
+++ b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/widget/ShortcutManagerImpl.kt
@@ -1,4 +1,4 @@
-package com.glodanif.bluetoothchat.widget
+package com.glodanif.bluetoothchat.ui.widget
 
 import android.content.Context
 import android.content.Intent
@@ -10,9 +10,9 @@ import android.support.annotation.ColorInt
 import android.support.annotation.RequiresApi
 import com.amulyakhare.textdrawable.TextDrawable
 import com.glodanif.bluetoothchat.R
-import com.glodanif.bluetoothchat.activity.ChatActivity
-import com.glodanif.bluetoothchat.activity.ConversationsActivity
-import com.glodanif.bluetoothchat.activity.ScanActivity
+import com.glodanif.bluetoothchat.ui.activity.ChatActivity
+import com.glodanif.bluetoothchat.ui.activity.ConversationsActivity
+import com.glodanif.bluetoothchat.ui.activity.ScanActivity
 import com.glodanif.bluetoothchat.extension.getBitmap
 import com.glodanif.bluetoothchat.extension.getFirstLetter
 import java.util.*
@@ -34,6 +34,16 @@ class ShortcutManagerImpl(private val context: Context) : ShortcutManager {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
 
+            if (shortcutManager != null) {
+
+                val isSearchAdded = shortcutManager!!.dynamicShortcuts
+                        .filter { it.id == ID_SEARCH }.any()
+
+                if (isSearchAdded) {
+                    return
+                }
+            }
+
             val shortcut = ShortcutInfo.Builder(context, ID_SEARCH)
                     .setShortLabel(context.getString(R.string.scan__scan))
                     .setLongLabel(context.getString(R.string.scan__scan))
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index 60499389..31d4ce38 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -6,9 +6,9 @@
     android:layout_height="match_parent"
     android:background="@drawable/background"
     android:clipToPadding="false"
-    tools:context="com.glodanif.bluetoothchat.activity.ChatActivity">
+    tools:context=".ui.activity.ChatActivity">
 
-    <com.glodanif.bluetoothchat.widget.ActionView
+    <com.glodanif.bluetoothchat.ui.widget.ActionView
         android:id="@+id/av_actions"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_contact_chooser.xml b/app/src/main/res/layout/activity_contact_chooser.xml
new file mode 100644
index 00000000..7f4c5fbb
--- /dev/null
+++ b/app/src/main/res/layout/activity_contact_chooser.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_weight="1">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_contacts"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/item_contact" />
+
+    <TextView
+        android:id="@+id/tv_no_contacts"
+        android:layout_width="280dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:visibility="gone"
+        android:text="@string/contact_chooser__no_contacts" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_conversations.xml b/app/src/main/res/layout/activity_conversations.xml
index ed13f9b1..792287e7 100644
--- a/app/src/main/res/layout/activity_conversations.xml
+++ b/app/src/main/res/layout/activity_conversations.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.glodanif.bluetoothchat.activity.ConversationsActivity">
+    tools:context=".ui.activity.ConversationsActivity">
 
     <include layout="@layout/content_main" />
 
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index b1b83933..3fd24c6a 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    tools:context="com.glodanif.bluetoothchat.activity.ProfileActivity">
+    tools:context=".ui.activity.ProfileActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan.xml b/app/src/main/res/layout/activity_scan.xml
index e4c894f3..bfb36e08 100644
--- a/app/src/main/res/layout/activity_scan.xml
+++ b/app/src/main/res/layout/activity_scan.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.glodanif.bluetoothchat.activity.ScanActivity">
+    tools:context=".ui.activity.ScanActivity">
 
     <FrameLayout
         android:id="@+id/fl_container"
@@ -113,7 +113,7 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_info" />
 
-            <com.glodanif.bluetoothchat.widget.ExpiringProgressBar
+            <com.glodanif.bluetoothchat.ui.widget.ExpiringProgressBar
                 android:id="@+id/epb_progress"
                 android:layout_width="80dp"
                 android:layout_height="80dp"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 380abddd..c78704c0 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -3,4 +3,4 @@
     android:id="@+id/fl_settings_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.glodanif.bluetoothchat.activity.SettingsActivity"/>
+    tools:context=".ui.activity.SettingsActivity"/>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index e1462159..49d20d54 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -6,10 +6,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="com.glodanif.bluetoothchat.activity.ConversationsActivity"
+    tools:context=".ui.activity.ConversationsActivity"
     tools:showIn="@layout/activity_conversations">
 
-    <com.glodanif.bluetoothchat.widget.ActionView
+    <com.glodanif.bluetoothchat.ui.widget.ActionView
         android:id="@+id/av_actions"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/main/res/layout/item_contact.xml
new file mode 100644
index 00000000..ab82e16a
--- /dev/null
+++ b/app/src/main/res/layout/item_contact.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingBottom="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="8dp">
+
+    <ImageView
+        android:id="@+id/iv_avatar"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginEnd="12dp"
+        android:contentDescription="@string/conversations__cd__partners_avatar" />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="#333333"
+        tools:text="Android Devise HTC G1" />
+</LinearLayout>
diff --git a/app/src/main/res/menu/menu_chat.xml b/app/src/main/res/menu/menu_chat.xml
index 265585f0..5b1f7ddd 100644
--- a/app/src/main/res/menu/menu_chat.xml
+++ b/app/src/main/res/menu/menu_chat.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.glodanif.bluetoothchat.activity.ConversationsActivity">
+    tools:context=".ui.activity.ConversationsActivity">
     <item
         android:id="@+id/action_disconnect"
         android:orderInCategory="100"
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9fe417b8..37604d77 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -116,6 +116,9 @@
     <string name="notification__channel_request">Запрос на соединение</string>
     <string name="notification__channel_message">Новое сообщение</string>
 
+    <string name="contact_chooser__title">Выберете Чат</string>
+    <string name="contact_chooser__no_contacts">Ваш список контактов пуст</string>
+
     <string name="settings__title">Настройки</string>
     <string name="settings__notifications">Уведомления</string>
     <string name="settings__sound">Звук</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8e674183..64577587 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -116,6 +116,9 @@
     <string name="notification__channel_request">Запит на з\'єднання</string>
     <string name="notification__channel_message">Нове повідомлення</string>
 
+    <string name="contact_chooser__title">Виберіть Чат</string>
+    <string name="contact_chooser__no_contacts">Ваш список контактів порожній</string>
+
     <string name="settings__title">Налаштування</string>
     <string name="settings__notifications">Сповіщення</string>
     <string name="settings__sound">Звук</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aea11bf5..cfbaac6a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,6 +110,9 @@
     <string name="notification__channel_request">Connection Request</string>
     <string name="notification__channel_message">New Message</string>
 
+    <string name="contact_chooser__title">Select Chat</string>
+    <string name="contact_chooser__no_contacts">Your contact list is empty</string>
+
     <string name="settings__title">Settings</string>
     <string name="settings__notifications">Notifications</string>
     <string name="settings__sound">Sound</string>
diff --git a/app/src/test/kotlin/com/glodanif/bluetoothchat/ConversationsPresenterUnitTest.kt b/app/src/test/kotlin/com/glodanif/bluetoothchat/ConversationsPresenterUnitTest.kt
index 8ab49c2a..ad4da9e8 100644
--- a/app/src/test/kotlin/com/glodanif/bluetoothchat/ConversationsPresenterUnitTest.kt
+++ b/app/src/test/kotlin/com/glodanif/bluetoothchat/ConversationsPresenterUnitTest.kt
@@ -1,10 +1,10 @@
 package com.glodanif.bluetoothchat
 
-import com.glodanif.bluetoothchat.model.BluetoothConnector
-import com.glodanif.bluetoothchat.model.ConversationsStorage
-import com.glodanif.bluetoothchat.model.SettingsManager
-import com.glodanif.bluetoothchat.presenter.ConversationsPresenter
-import com.glodanif.bluetoothchat.view.ConversationsView
+import com.glodanif.bluetoothchat.data.model.BluetoothConnector
+import com.glodanif.bluetoothchat.data.model.ConversationsStorage
+import com.glodanif.bluetoothchat.data.model.SettingsManager
+import com.glodanif.bluetoothchat.ui.presenter.ConversationsPresenter
+import com.glodanif.bluetoothchat.ui.view.ConversationsView
 import com.nhaarman.mockito_kotlin.verify
 import org.junit.Before
 import org.junit.Rule
diff --git a/app/src/test/kotlin/com/glodanif/bluetoothchat/ProfilePresenterUnitTest.kt b/app/src/test/kotlin/com/glodanif/bluetoothchat/ProfilePresenterUnitTest.kt
index 887fbbe3..a4452f05 100644
--- a/app/src/test/kotlin/com/glodanif/bluetoothchat/ProfilePresenterUnitTest.kt
+++ b/app/src/test/kotlin/com/glodanif/bluetoothchat/ProfilePresenterUnitTest.kt
@@ -1,8 +1,8 @@
 package com.glodanif.bluetoothchat
 
-import com.glodanif.bluetoothchat.model.SettingsManager
-import com.glodanif.bluetoothchat.presenter.ProfilePresenter
-import com.glodanif.bluetoothchat.view.ProfileView
+import com.glodanif.bluetoothchat.data.model.SettingsManager
+import com.glodanif.bluetoothchat.ui.presenter.ProfilePresenter
+import com.glodanif.bluetoothchat.ui.view.ProfileView
 import com.nhaarman.mockito_kotlin.verify
 import org.junit.Before
 import org.junit.Rule
diff --git a/app/src/test/kotlin/com/glodanif/bluetoothchat/ScanningPresenterUnitTest.kt b/app/src/test/kotlin/com/glodanif/bluetoothchat/ScanningPresenterUnitTest.kt
index 4cce292c..848ad565 100644
--- a/app/src/test/kotlin/com/glodanif/bluetoothchat/ScanningPresenterUnitTest.kt
+++ b/app/src/test/kotlin/com/glodanif/bluetoothchat/ScanningPresenterUnitTest.kt
@@ -2,12 +2,12 @@ package com.glodanif.bluetoothchat
 
 import android.bluetooth.BluetoothDevice
 import android.net.Uri
-import com.glodanif.bluetoothchat.model.BluetoothConnector
-import com.glodanif.bluetoothchat.model.BluetoothScanner
-import com.glodanif.bluetoothchat.model.BluetoothScanner.ScanningListener
-import com.glodanif.bluetoothchat.model.FileExtractor
-import com.glodanif.bluetoothchat.presenter.ScanPresenter
-import com.glodanif.bluetoothchat.view.ScanView
+import com.glodanif.bluetoothchat.data.model.BluetoothConnector
+import com.glodanif.bluetoothchat.data.model.BluetoothScanner
+import com.glodanif.bluetoothchat.data.model.BluetoothScanner.ScanningListener
+import com.glodanif.bluetoothchat.data.model.FileExtractor
+import com.glodanif.bluetoothchat.ui.presenter.ScanPresenter
+import com.glodanif.bluetoothchat.ui.view.ScanView
 import com.nhaarman.mockito_kotlin.KArgumentCaptor
 import com.nhaarman.mockito_kotlin.argumentCaptor
 import org.junit.Before