diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index b09f78e6..f8d9ece1 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -56,8 +56,6 @@ dependencies {
     api(Deps.Ktx.liveDataCore)
     api(Deps.Ktx.liveData)
     api(Deps.Ktx.viewModel)
-    api(Deps.Ktx.liveData)
-    api(Deps.Ktx.viewModel)
     api(Deps.UiTest.espressoIdling)
 
     testImplementation(Deps.Test.junit)
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/viewModel/BackupViewModel.kt b/core/src/main/java/com/example/util/simpletimetracker/core/sharedViewModel/BackupViewModel.kt
similarity index 98%
rename from core/src/main/java/com/example/util/simpletimetracker/core/viewModel/BackupViewModel.kt
rename to core/src/main/java/com/example/util/simpletimetracker/core/sharedViewModel/BackupViewModel.kt
index 53c82a68..c8a1eb02 100644
--- a/core/src/main/java/com/example/util/simpletimetracker/core/viewModel/BackupViewModel.kt
+++ b/core/src/main/java/com/example/util/simpletimetracker/core/sharedViewModel/BackupViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.core.viewModel
+package com.example.util.simpletimetracker.core.sharedViewModel
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/viewModel/RemoveRecordViewModel.kt b/core/src/main/java/com/example/util/simpletimetracker/core/sharedViewModel/RemoveRecordViewModel.kt
similarity index 97%
rename from core/src/main/java/com/example/util/simpletimetracker/core/viewModel/RemoveRecordViewModel.kt
rename to core/src/main/java/com/example/util/simpletimetracker/core/sharedViewModel/RemoveRecordViewModel.kt
index 1ede4788..f37547d4 100644
--- a/core/src/main/java/com/example/util/simpletimetracker/core/viewModel/RemoveRecordViewModel.kt
+++ b/core/src/main/java/com/example/util/simpletimetracker/core/sharedViewModel/RemoveRecordViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.core.viewModel
+package com.example.util.simpletimetracker.core.sharedViewModel
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt
index b20aee60..a271dd74 100644
--- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt
+++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt
@@ -25,7 +25,7 @@ import com.example.util.simpletimetracker.core.extension.toViewData
 import com.example.util.simpletimetracker.core.extension.visible
 import com.example.util.simpletimetracker.core.utils.BuildVersions
 import com.example.util.simpletimetracker.core.utils.setFlipChooserColor
-import com.example.util.simpletimetracker.core.viewModel.RemoveRecordViewModel
+import com.example.util.simpletimetracker.core.sharedViewModel.RemoveRecordViewModel
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordViewData
 import com.example.util.simpletimetracker.feature_change_record.viewModel.ChangeRecordViewModel
diff --git a/features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/MainFragment.kt b/features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/MainFragment.kt
index a5eda4c2..292bfef6 100644
--- a/features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/MainFragment.kt
+++ b/features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/MainFragment.kt
@@ -12,7 +12,7 @@ import com.example.util.simpletimetracker.core.di.BaseViewModelFactory
 import com.example.util.simpletimetracker.core.extension.visible
 import com.example.util.simpletimetracker.core.interactor.NotificationTypeInteractor
 import com.example.util.simpletimetracker.core.interactor.WidgetInteractor
-import com.example.util.simpletimetracker.core.viewModel.BackupViewModel
+import com.example.util.simpletimetracker.core.sharedViewModel.BackupViewModel
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
diff --git a/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsContainerFragment.kt b/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsContainerFragment.kt
index 05f741e5..8ab9c70c 100644
--- a/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsContainerFragment.kt
+++ b/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsContainerFragment.kt
@@ -9,7 +9,7 @@ import com.example.util.simpletimetracker.core.di.BaseViewModelFactory
 import com.example.util.simpletimetracker.core.dialog.DateTimeDialogListener
 import com.example.util.simpletimetracker.core.extension.setOnClick
 import com.example.util.simpletimetracker.core.extension.setOnLongClick
-import com.example.util.simpletimetracker.core.viewModel.RemoveRecordViewModel
+import com.example.util.simpletimetracker.core.sharedViewModel.RemoveRecordViewModel
 import com.example.util.simpletimetracker.feature_records.adapter.RecordsContainerAdapter
 import com.example.util.simpletimetracker.feature_records.viewModel.RecordsContainerViewModel
 import com.example.util.simpletimetracker.navigation.Notification
diff --git a/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsFragment.kt b/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsFragment.kt
index b52a2697..9162b892 100644
--- a/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsFragment.kt
+++ b/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsFragment.kt
@@ -13,7 +13,7 @@ import com.example.util.simpletimetracker.core.adapter.loader.createLoaderAdapte
 import com.example.util.simpletimetracker.core.adapter.record.createRecordAdapterDelegate
 import com.example.util.simpletimetracker.core.base.BaseFragment
 import com.example.util.simpletimetracker.core.di.BaseViewModelFactory
-import com.example.util.simpletimetracker.core.viewModel.RemoveRecordViewModel
+import com.example.util.simpletimetracker.core.sharedViewModel.RemoveRecordViewModel
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.feature_records.extra.RecordsExtra
 import com.example.util.simpletimetracker.feature_records.viewModel.RecordsViewModel
diff --git a/features/feature_records_all/src/main/java/com/example/util/simpletimetracker/feature_records_all/view/RecordsAllFragment.kt b/features/feature_records_all/src/main/java/com/example/util/simpletimetracker/feature_records_all/view/RecordsAllFragment.kt
index 32479b3b..4b4406d5 100644
--- a/features/feature_records_all/src/main/java/com/example/util/simpletimetracker/feature_records_all/view/RecordsAllFragment.kt
+++ b/features/feature_records_all/src/main/java/com/example/util/simpletimetracker/feature_records_all/view/RecordsAllFragment.kt
@@ -12,7 +12,7 @@ import com.example.util.simpletimetracker.core.adapter.loader.createLoaderAdapte
 import com.example.util.simpletimetracker.core.adapter.record.createRecordAdapterDelegate
 import com.example.util.simpletimetracker.core.base.BaseFragment
 import com.example.util.simpletimetracker.core.di.BaseViewModelFactory
-import com.example.util.simpletimetracker.core.viewModel.RemoveRecordViewModel
+import com.example.util.simpletimetracker.core.sharedViewModel.RemoveRecordViewModel
 import com.example.util.simpletimetracker.feature_records_all.adapter.createRecordAllDateAdapterDelegate
 import com.example.util.simpletimetracker.feature_records_all.viewData.RecordsAllSortOrderViewData
 import com.example.util.simpletimetracker.feature_records_all.viewModel.RecordsAllViewModel
diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/view/SettingsFragment.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/view/SettingsFragment.kt
index 5de07d3c..5e58102c 100644
--- a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/view/SettingsFragment.kt
+++ b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/view/SettingsFragment.kt
@@ -15,7 +15,7 @@ import com.example.util.simpletimetracker.core.dialog.DurationDialogListener
 import com.example.util.simpletimetracker.core.dialog.StandardDialogListener
 import com.example.util.simpletimetracker.core.extension.setOnClick
 import com.example.util.simpletimetracker.core.extension.visible
-import com.example.util.simpletimetracker.core.viewModel.BackupViewModel
+import com.example.util.simpletimetracker.core.sharedViewModel.BackupViewModel
 import com.example.util.simpletimetracker.feature_settings.viewData.CardOrderViewData
 import com.example.util.simpletimetracker.feature_settings.viewData.FirstDayOfWeekViewData
 import com.example.util.simpletimetracker.feature_settings.viewModel.SettingsViewModel
diff --git a/gradle.properties b/gradle.properties
index 9d9b761e..c045df2f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,6 +12,6 @@
 org.gradle.parallel=true
 #Sat May 02 07:38:24 MSK 2020
 kotlin.code.style=official
-android.enableJetifier=true
+android.enableJetifier=false
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.useAndroidX=true