diff --git a/OsmAnd-telegram/AndroidManifest.xml b/OsmAnd-telegram/AndroidManifest.xml
index 442ca1bbb0..772463e817 100644
--- a/OsmAnd-telegram/AndroidManifest.xml
+++ b/OsmAnd-telegram/AndroidManifest.xml
@@ -20,7 +20,7 @@
         android:theme="@style/AppTheme">
 
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustResize">
diff --git a/OsmAnd-telegram/res/layout/activity_main.xml b/OsmAnd-telegram/res/layout/activity_main.xml
index 26ab79daa4..10c127acd9 100644
--- a/OsmAnd-telegram/res/layout/activity_main.xml
+++ b/OsmAnd-telegram/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
-	tools:context=".MainActivity">
+	tools:context=".ui.MainActivity">
 
 	<FrameLayout
 		android:layout_width="match_parent"
@@ -18,7 +18,7 @@
 			android:layout_height="match_parent"
 			android:scrollbars="vertical" />
 
-		<net.osmand.telegram.views.LockableViewPager
+		<net.osmand.telegram.ui.views.LockableViewPager
 			android:id="@+id/pager"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/notifications/TelegramNotification.kt b/OsmAnd-telegram/src/net/osmand/telegram/notifications/TelegramNotification.kt
index 521a047744..637e8aa7b9 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/notifications/TelegramNotification.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/notifications/TelegramNotification.kt
@@ -5,7 +5,7 @@ import android.app.PendingIntent
 import android.content.Intent
 import android.support.v4.app.NotificationCompat
 import android.support.v4.app.NotificationManagerCompat
-import net.osmand.telegram.MainActivity
+import net.osmand.telegram.ui.MainActivity
 import net.osmand.telegram.TelegramApplication
 
 
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
similarity index 99%
rename from OsmAnd-telegram/src/net/osmand/telegram/LoginDialogFragment.kt
rename to OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index 4042c1f05a..8bc13333b1 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -1,4 +1,4 @@
-package net.osmand.telegram
+package net.osmand.telegram.ui
 
 import android.app.Dialog
 import android.content.DialogInterface
@@ -18,6 +18,7 @@ import android.view.inputmethod.EditorInfo
 import android.widget.Button
 import android.widget.TextView
 import net.osmand.PlatformUtil
+import net.osmand.telegram.R
 import net.osmand.telegram.utils.AndroidUtils
 import studio.carbonylgroup.textfieldboxes.ExtendedEditText
 
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/MainActivity.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
similarity index 98%
rename from OsmAnd-telegram/src/net/osmand/telegram/MainActivity.kt
rename to OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
index 309516cadd..1d9b420784 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/MainActivity.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
@@ -1,4 +1,4 @@
-package net.osmand.telegram
+package net.osmand.telegram.ui
 
 import android.Manifest
 import android.app.Dialog
@@ -16,9 +16,11 @@ import android.support.v7.widget.*
 import android.view.*
 import android.widget.Toast
 import net.osmand.PlatformUtil
-import net.osmand.telegram.LoginDialogFragment.LoginDialogType
+import net.osmand.telegram.R
+import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.helpers.TelegramHelper
 import net.osmand.telegram.helpers.TelegramHelper.*
+import net.osmand.telegram.ui.LoginDialogFragment.LoginDialogType
 import net.osmand.telegram.utils.AndroidUtils
 import org.drinkless.td.libcore.telegram.TdApi
 
@@ -387,7 +389,7 @@ class MainActivity : AppCompatActivity(), TelegramListener {
 			val showOnMapSwitch: SwitchCompat? = view.findViewById(R.id.show_on_map_switch)
 		}
 
-		override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChatsAdapter.ViewHolder {
+		override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
 			val view = LayoutInflater.from(parent.context).inflate(R.layout.chat_list_item, parent, false)
 			return ViewHolder(view)
 		}
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/views/LockableViewPager.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/views/LockableViewPager.kt
similarity index 95%
rename from OsmAnd-telegram/src/net/osmand/telegram/views/LockableViewPager.kt
rename to OsmAnd-telegram/src/net/osmand/telegram/ui/views/LockableViewPager.kt
index 45c931ebb4..d3404dd36f 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/views/LockableViewPager.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/views/LockableViewPager.kt
@@ -1,4 +1,4 @@
-package net.osmand.telegram.views
+package net.osmand.telegram.ui.views
 
 import android.content.Context
 import android.support.v4.view.ViewPager