diff --git a/README.md b/README.md
index 8b5decd7..d011e0af 100644
--- a/README.md
+++ b/README.md
@@ -2,20 +2,22 @@
 
 ### Перейти с коллбеков на саспенд функции и корутины
 
-1. Поменять возвращаемый тип в `CatsService` и добавить модификатор `suspend`
-2. Переписать логику в презентере с `Callback` на корутины и `suspend` функции
-3. Реализовать свой скоуп: PresenterScope с `MainDispatcher` и CoroutineName("CatsCoroutine") в качестве элементов контекста
-4. Добавить обработку исключений через try-catch. В случае `java.net.SocketTimeoutException` показываем Toast с текстом "Не удалось получить ответ от сервером". В остальных случаях логируем исключение в `otus.homework.coroutines.CrashMonitor` и показываем Toast с `exception.message`
-5. Не забываем отменять Job в `onStop()`
++1. Поменять возвращаемый тип в `CatFactsService` и добавить модификатор `suspend` 
++2. Переписать логику в презентере с `Callback` на корутины и `suspend` функции
++3. Реализовать свой скоуп: PresenterScope с `MainDispatcher` и CoroutineName("CatsCoroutine") в качестве элементов контекста
++4. Добавить обработку исключений через try-catch. В случае `java.net.SocketTimeoutException` показываем Toast с текстом "Не удалось получить ответ от сервером". В остальных случаях логируем исключение в `otus.homework.coroutines.CrashMonitor` и показываем Toast с `exception.message`
++5. Не забываем отменять Job в `onStop()`
 
 ### Добавить к запросу фактов запрос рандомных картинок с [https://aws.random.cat/meow](https://aws.random.cat/meow)
 
-1. На каждый рефреш экрана должен запрашиваться факт + картинка: добавляем сетевой запрос и реализуем логику аналогичную первой задаче. Для загрузки изображений уже подключена библиотека [Picasso](https://github.com/square/picasso)
-2. В метод `view.populate` передаем 1 аргумент, поэтому необходимо реализовать модель презентейшен слоя в которой будут содержаться необходимые данные для рендеринга(текст и ссылка на картинку)
-3. Отменятся запросы должны одновременно
++1. На каждый рефреш экрана должен запрашиваться факт + картинка: добавляем сетевой запрос и реализуем логику аналогичную первой задаче. Для загрузки изображений уже подключена библиотека [Picasso](https://github.com/square/picasso)
++2. В метод `view.populate` передаем 1 аргумент, поэтому необходимо реализовать модель презентейшен слоя в которой будут содержаться необходимые данные для рендеринга(текст и ссылка на картинку)
+Оптимизируем: конвертер добавим, запустим запросы в сеть одновременно, одновременно попробуем джобы отменить
+Для этого сделаем async запуск 2 корутин
++5. Отменятся запросы должны одновременно
 
 ### Реализовать решение ViewModel
 
-1. Реализовать наследника `ViewModel` и продублировать в нем логику из `CatsPresenter`, с необходимыми изменениями. Используйте `viewModelScope` в качестве скоупа.
-2. Добавить логирование ошибок через CoroutineExceptionHanlder. Используйте класс CrashMonitor в качестве фейкового CrashMonitor инструмента
++1. Реализовать наследника `ViewModel` и продублировать в нем логику из `CatsPresenter`, с необходимыми изменениями. Используйте `viewModelScope` в качестве скоупа.
++2. Добавить логирование ошибок через CoroutineExceptionHanlder. Используйте класс CrashMonitor в качестве фейкового CrashMonitor инструмента
 3. Создать sealed класс `Result`. Унаследовать от него классы `Success<T>`, `Error`. Использовать эти классы как стейт необходимый для рендеринга/отображени ошибки
diff --git a/app/build.gradle b/app/build.gradle
index 679dbba4..7c1641c0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "otus.homework.coroutines"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
 
@@ -34,6 +34,10 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
+    implementation 'androidx.fragment:fragment-ktx:1.3.6'
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe34985b..fa531f7d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Coroutines">
-        <activity android:name=".MainActivity"
+        <activity android:name=".presentation.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
deleted file mode 100644
index e4b05120..00000000
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package otus.homework.coroutines
-
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class CatsPresenter(
-    private val catsService: CatsService
-) {
-
-    private var _catsView: ICatsView? = null
-
-    fun onInitComplete() {
-        catsService.getCatFact().enqueue(object : Callback<Fact> {
-
-            override fun onResponse(call: Call<Fact>, response: Response<Fact>) {
-                if (response.isSuccessful && response.body() != null) {
-                    _catsView?.populate(response.body()!!)
-                }
-            }
-
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                CrashMonitor.trackWarning()
-            }
-        })
-    }
-
-    fun attachView(catsView: ICatsView) {
-        _catsView = catsView
-    }
-
-    fun detachView() {
-        _catsView = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsService.kt b/app/src/main/java/otus/homework/coroutines/CatsService.kt
deleted file mode 100644
index 479b2cfb..00000000
--- a/app/src/main/java/otus/homework/coroutines/CatsService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package otus.homework.coroutines
-
-import retrofit2.Call
-import retrofit2.http.GET
-
-interface CatsService {
-
-    @GET("fact")
-    fun getCatFact() : Call<Fact>
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
deleted file mode 100644
index 30ac2531..00000000
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package otus.homework.coroutines
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.Button
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-
-class CatsView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
-
-    var presenter :CatsPresenter? = null
-
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-        findViewById<Button>(R.id.button).setOnClickListener {
-            presenter?.onInitComplete()
-        }
-    }
-
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.text
-    }
-}
-
-interface ICatsView {
-
-    fun populate(fact: Fact)
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
deleted file mode 100644
index 32e6b018..00000000
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package otus.homework.coroutines
-
-object CrashMonitor {
-
-    /**
-     * Pretend this is Crashlytics/AppCenter
-     */
-    fun trackWarning() {
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
deleted file mode 100644
index 23ddc3b2..00000000
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package otus.homework.coroutines
-
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-class DiContainer {
-
-    private val retrofit by lazy {
-        Retrofit.Builder()
-            .baseUrl("https://catfact.ninja/")
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-    }
-
-    val service by lazy { retrofit.create(CatsService::class.java) }
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/Fact.kt b/app/src/main/java/otus/homework/coroutines/Fact.kt
deleted file mode 100644
index 15c6c7ae..00000000
--- a/app/src/main/java/otus/homework/coroutines/Fact.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package otus.homework.coroutines
-
-import com.google.gson.annotations.SerializedName
-
-data class Fact(
-	@field:SerializedName("createdAt")
-	val createdAt: String,
-	@field:SerializedName("deleted")
-	val deleted: Boolean,
-	@field:SerializedName("_id")
-	val id: String,
-	@field:SerializedName("text")
-	val text: String,
-	@field:SerializedName("source")
-	val source: String,
-	@field:SerializedName("used")
-	val used: Boolean,
-	@field:SerializedName("type")
-	val type: String,
-	@field:SerializedName("user")
-	val user: String,
-	@field:SerializedName("updatedAt")
-	val updatedAt: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
deleted file mode 100644
index a9dafb3b..00000000
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package otus.homework.coroutines
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class MainActivity : AppCompatActivity() {
-
-    lateinit var catsPresenter: CatsPresenter
-
-    private val diContainer = DiContainer()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
-        setContentView(view)
-
-        catsPresenter = CatsPresenter(diContainer.service)
-        view.presenter = catsPresenter
-        catsPresenter.attachView(view)
-        catsPresenter.onInitComplete()
-    }
-
-    override fun onStop() {
-        if (isFinishing) {
-            catsPresenter.detachView()
-        }
-        super.onStop()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/data/CatFactsService.kt b/app/src/main/java/otus/homework/coroutines/data/CatFactsService.kt
new file mode 100644
index 00000000..02fc8aa4
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/CatFactsService.kt
@@ -0,0 +1,11 @@
+package otus.homework.coroutines.data
+
+import otus.homework.coroutines.models.Fact
+import otus.homework.coroutines.models.Result
+import retrofit2.http.GET
+
+interface CatFactsService {
+
+    @GET("fact")
+    suspend fun getCatFact() : Fact
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/data/CatImagesService.kt b/app/src/main/java/otus/homework/coroutines/data/CatImagesService.kt
new file mode 100644
index 00000000..3f92f959
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/CatImagesService.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines.data
+
+import otus.homework.coroutines.models.Image
+import otus.homework.coroutines.models.Result
+import retrofit2.http.GET
+
+interface CatImagesService {
+    @GET("search")
+    suspend fun getCatImage(): List<Image>
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/di/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/di/DiContainer.kt
new file mode 100644
index 00000000..59ae1875
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/di/DiContainer.kt
@@ -0,0 +1,30 @@
+package otus.homework.coroutines.di
+
+import otus.homework.coroutines.data.CatFactsService
+import otus.homework.coroutines.data.CatImagesService
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class DiContainer {
+
+    val catFactsService by lazy {
+        Retrofit.Builder()
+            .baseUrl(FACT_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+            .create(CatFactsService::class.java)
+    }
+
+    val catImagesService by lazy {
+        Retrofit.Builder()
+            .baseUrl(IMAGE_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+            .create(CatImagesService::class.java)
+    }
+
+    companion object {
+        private const val FACT_URL = "https://catfact.ninja/"
+        private const val IMAGE_URL = "https://api.thecatapi.com/v1/images/"
+    }
+}
diff --git a/app/src/main/java/otus/homework/coroutines/domain/CrashMonitor.kt b/app/src/main/java/otus/homework/coroutines/domain/CrashMonitor.kt
new file mode 100644
index 00000000..24843216
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/CrashMonitor.kt
@@ -0,0 +1,13 @@
+package otus.homework.coroutines.domain
+
+import android.util.Log
+
+object CrashMonitor {
+
+    /**
+     * Pretend this is Crashlytics/AppCenter
+     */
+    fun trackWarning(warningMessage: String) {
+        Log.d("TAG", "Crash logged: $warningMessage")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/models/Cat.kt b/app/src/main/java/otus/homework/coroutines/models/Cat.kt
new file mode 100644
index 00000000..564038db
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/models/Cat.kt
@@ -0,0 +1,6 @@
+package otus.homework.coroutines.models
+
+data class Cat(
+    val fact: String,
+    val imageUrl: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/models/Fact.kt b/app/src/main/java/otus/homework/coroutines/models/Fact.kt
new file mode 100644
index 00000000..c38db350
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/models/Fact.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines.models
+
+import com.google.gson.annotations.SerializedName
+
+data class Fact(
+	@field:SerializedName("fact")
+	val fact: String,
+	@field:SerializedName("length")
+	val length: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/models/Image.kt b/app/src/main/java/otus/homework/coroutines/models/Image.kt
new file mode 100644
index 00000000..3ec4d532
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/models/Image.kt
@@ -0,0 +1,14 @@
+package otus.homework.coroutines.models
+
+import com.google.gson.annotations.SerializedName
+
+data class Image(
+    @field:SerializedName("id")
+    val id: String,
+    @field:SerializedName("url")
+    val url: String,
+    @field:SerializedName("width")
+    val width: Int,
+    @field:SerializedName("height")
+    val height: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/models/Result.kt b/app/src/main/java/otus/homework/coroutines/models/Result.kt
new file mode 100644
index 00000000..27ca2b01
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/models/Result.kt
@@ -0,0 +1,9 @@
+package otus.homework.coroutines.models
+
+sealed class Result<T>(
+    val data: T? = null,
+    val error: String? = null
+) {
+    class Success<T> (data: T): Result<T>(data = data)
+    class Error<T> (error: String): Result<T>(error = error)
+}
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/CatsView.kt b/app/src/main/java/otus/homework/coroutines/presentation/CatsView.kt
new file mode 100644
index 00000000..a355d6b3
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/CatsView.kt
@@ -0,0 +1,53 @@
+package otus.homework.coroutines.presentation
+
+import android.content.Context
+import android.util.AttributeSet
+import android.util.Log
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.ViewTreeViewModelStoreOwner
+import androidx.lifecycle.get
+import com.squareup.picasso.Picasso
+import otus.homework.coroutines.models.Cat
+import otus.homework.coroutines.R
+import otus.homework.coroutines.presentation.vm.CatsViewModel
+import otus.homework.coroutines.presentation.vm.CatsViewModelFactory
+
+class CatsView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
+
+    fun setOnButtonClick(onButtonClick: () -> Unit) {
+        findViewById<Button>(R.id.button).setOnClickListener {
+            Log.d("TAG", "Button clicked")
+            onButtonClick()
+        }
+    }
+
+    override fun populate(cat: Cat) {
+        findViewById<TextView>(R.id.fact_textView).text = cat.fact
+        val imageView = findViewById<ImageView>(R.id.imageView)
+        Picasso.get().load(cat.imageUrl).into(imageView)
+    }
+
+    override fun showErrorToast(errorMsg: String) {
+        Toast.makeText(context, errorMsg, Toast.LENGTH_SHORT).show()
+    }
+}
+
+interface ICatsView {
+
+    fun populate(cat: Cat)
+
+    fun showErrorToast(errorMsg: String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/presentation/MainActivity.kt
new file mode 100644
index 00000000..7aefbfa4
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/MainActivity.kt
@@ -0,0 +1,57 @@
+package otus.homework.coroutines.presentation
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.activity.viewModels
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import com.squareup.picasso.Picasso
+import otus.homework.coroutines.di.DiContainer
+import otus.homework.coroutines.R
+import otus.homework.coroutines.models.Cat
+import otus.homework.coroutines.models.Result
+import otus.homework.coroutines.presentation.vm.CatsViewModel
+import otus.homework.coroutines.presentation.vm.CatsViewModelFactory
+
+class MainActivity : AppCompatActivity() {
+
+    private val diContainer = DiContainer()
+    private val catsViewModel: CatsViewModel by viewModels {
+        CatsViewModelFactory(
+            diContainer.catFactsService,
+            diContainer.catImagesService
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
+        setContentView(view)
+
+        view.setOnButtonClick {
+            catsViewModel.getCat()
+        }
+
+        val catObserver = Observer<Result<Cat>> { catResult ->
+            when(catResult) {
+                is Result.Success -> view.populate(catResult.data!!)
+                is Result.Error -> view.showErrorToast(catResult.error!!)
+            }
+
+        }
+        catsViewModel.cat.observe(this, catObserver)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        catsViewModel.getCat()
+    }
+
+    override fun onStop() {
+        super.onStop()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/vm/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/presentation/vm/CatsViewModel.kt
new file mode 100644
index 00000000..5232a236
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/vm/CatsViewModel.kt
@@ -0,0 +1,58 @@
+package otus.homework.coroutines.presentation.vm
+
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.*
+import otus.homework.coroutines.data.CatFactsService
+import otus.homework.coroutines.data.CatImagesService
+import otus.homework.coroutines.domain.CrashMonitor
+import otus.homework.coroutines.models.Cat
+import otus.homework.coroutines.models.Result
+import java.net.SocketException
+
+class CatsViewModel(
+    private val CatFactsService: CatFactsService,
+    private val CatImagesService: CatImagesService
+) : ViewModel() {
+
+    private val _cat = MutableLiveData<Result<Cat>>()
+
+    private val exceptionHandler = CoroutineExceptionHandler { _, e -> // TODO why socketExcept handle in try-catch?
+        CrashMonitor.trackWarning("${e.message}")
+        _cat.value = Result.Error("${e.message}")
+    }
+    val cat: LiveData<Result<Cat>>
+        get() = _cat
+
+    fun getCat() {
+
+        viewModelScope.launch(exceptionHandler) {
+                val factJob = async {
+                    CatFactsService.getCatFact()
+                }
+                val imageJob = async {
+                    CatImagesService.getCatImage()[0]
+                }
+                val catResponse = Cat(factJob.await().fact, imageJob.await().url)
+                Log.d("TAG", "Fact is ${catResponse.fact}, image is ${catResponse.imageUrl}")
+                _cat.value = Result.Success(catResponse)
+        }
+    }
+}
+
+class CatsViewModelFactory(
+    private val CatFactsService: CatFactsService,
+    private val CatImagesService: CatImagesService
+) : ViewModelProvider.NewInstanceFactory() {
+
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        if (modelClass.isAssignableFrom(CatsViewModel::class.java)) {
+            return CatsViewModel(CatFactsService, CatImagesService) as T
+        }
+        throw IllegalArgumentException("Unknown ViewModel class")
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..cf5c9c9c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<otus.homework.coroutines.CatsView xmlns:android="http://schemas.android.com/apk/res/android"
+<otus.homework.coroutines.presentation.CatsView 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"
     android:layout_width="match_parent"
     android:padding="16dp"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".presentation.MainActivity">
 
     <TextView
         android:id="@+id/fact_textView"
@@ -22,9 +22,20 @@
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
         android:text="@string/more_facts"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/fact_textView" />
 
-</otus.homework.coroutines.CatsView>
\ No newline at end of file
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="@+id/fact_textView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</otus.homework.coroutines.presentation.CatsView>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8ca0a2e2..7e67df4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.6.20"
+    ext.kotlin_version = "1.8.0"
     repositories {
         mavenCentral()
         google()