diff --git a/build.gradle.kts b/build.gradle.kts
index f080b06..a6a115f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,9 +1,24 @@
 plugins {
-    androidApplication
+    kotlinAndroid
+    androidLibrary
 }
 
 android {
     namespace = "ru.samsung.test.core"
+    compileSdk = Version.Android.Sdk.compile
+
+    defaultConfig {
+        minSdk = Version.Android.Sdk.min
+    }
+
+    compileOptions {
+        sourceCompatibility = Version.Kotlin.javaSource
+        targetCompatibility = Version.Kotlin.javaSource
+    }
+
+    kotlinOptions {
+        jvmTarget = Version.Kotlin.jvmTarget
+    }
 }
 
 dependencies {
diff --git a/src/main/java/ru/samsung/test/core/core/BaseTest.kt b/src/main/java/ru/samsung/test/core/core/BaseTest.kt
index 247d668..3493045 100644
--- a/src/main/java/ru/samsung/test/core/core/BaseTest.kt
+++ b/src/main/java/ru/samsung/test/core/core/BaseTest.kt
@@ -1,4 +1,4 @@
-package ru.innovationcampus.test.core.core
+package ru.samsung.test.core.core
 
 import android.app.Activity
 import android.app.Instrumentation
@@ -20,16 +20,20 @@ import org.junit.Before
 import org.junit.FixMethodOrder
 import org.junit.Rule
 import org.junit.runners.MethodSorters
-import ru.innovationcampus.test.core.utils.ResultTestsData
+import ru.samsung.test.core.utils.EmptyRule
+import ru.samsung.test.core.utils.ResultTestsData
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 open class BaseTest<LaunchActivity : Activity>(
-    private val clazz: Class<LaunchActivity>
+    private val clazz: Class<LaunchActivity>,
+    private val isEnabledCompose: Boolean = false
 ) : TestCase(kaspressoBuilder = Kaspresso.Builder.simple {
     kautomatorWaitForIdleSettings = KautomatorWaitForIdleSettings.boost()
-}.apply { addComposeSupport() }) {
+}.apply {
+    if (isEnabledCompose) addComposeSupport()
+}) {
     @get:Rule
-    val composeTestRule = createComposeRule()
+    val composeTestRule = if (isEnabledCompose) createComposeRule() else EmptyRule()
 
     protected lateinit var activityScenario: ActivityScenario<LaunchActivity>
         private set
diff --git a/src/main/java/ru/samsung/test/core/core/DescriptionFailureHandler.kt b/src/main/java/ru/samsung/test/core/core/DescriptionFailureHandler.kt
index 3cc070c..d75f89b 100644
--- a/src/main/java/ru/samsung/test/core/core/DescriptionFailureHandler.kt
+++ b/src/main/java/ru/samsung/test/core/core/DescriptionFailureHandler.kt
@@ -1,4 +1,4 @@
-package ru.innovationcampus.test.core.core
+package ru.samsung.test.core.core
 
 import android.app.Instrumentation
 import android.view.View
diff --git a/src/main/java/ru/samsung/test/core/utils/EmptyRule.kt b/src/main/java/ru/samsung/test/core/utils/EmptyRule.kt
new file mode 100644
index 0000000..ffa15d3
--- /dev/null
+++ b/src/main/java/ru/samsung/test/core/utils/EmptyRule.kt
@@ -0,0 +1,6 @@
+package ru.samsung.test.core.utils
+
+import org.junit.rules.TestRule
+import org.junit.rules.TestWatcher
+
+class EmptyRule : TestWatcher()
\ No newline at end of file
diff --git a/src/main/java/ru/samsung/test/core/utils/ResultTestsData.kt b/src/main/java/ru/samsung/test/core/utils/ResultTestsData.kt
index 25b45df..dcdcf9b 100644
--- a/src/main/java/ru/samsung/test/core/utils/ResultTestsData.kt
+++ b/src/main/java/ru/samsung/test/core/utils/ResultTestsData.kt
@@ -1,12 +1,10 @@
-package ru.innovationcampus.test.core.utils
+package ru.samsung.test.core.utils
 
 import android.app.Activity
 import android.app.Instrumentation
-import android.app.Instrumentation.ActivityResult
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 
 object ResultTestsData {
diff --git a/src/main/java/ru/samsung/test/core/utils/UiTextViewExtensions.kt b/src/main/java/ru/samsung/test/core/utils/UiTextViewExtensions.kt
index 8cc4f86..892288c 100644
--- a/src/main/java/ru/samsung/test/core/utils/UiTextViewExtensions.kt
+++ b/src/main/java/ru/samsung/test/core/utils/UiTextViewExtensions.kt
@@ -1,4 +1,4 @@
-package ru.innovationcampus.test.core.utils
+package ru.samsung.test.core.utils
 
 import com.google.common.truth.Truth.assertThat
 import com.kaspersky.components.kautomator.component.text.UiTextViewAssertions
diff --git a/src/main/java/ru/samsung/test/core/utils/UiViewBuilderExtensions.kt b/src/main/java/ru/samsung/test/core/utils/UiViewBuilderExtensions.kt
index 7754a54..fc5e92a 100644
--- a/src/main/java/ru/samsung/test/core/utils/UiViewBuilderExtensions.kt
+++ b/src/main/java/ru/samsung/test/core/utils/UiViewBuilderExtensions.kt
@@ -1,4 +1,4 @@
-package ru.innovationcampus.test.core.utils
+package ru.samsung.test.core.utils
 
 import com.kaspersky.components.kautomator.component.common.builders.UiViewBuilder
 
diff --git a/src/main/java/ru/samsung/test/core/utils/Utils.kt b/src/main/java/ru/samsung/test/core/utils/Utils.kt
index af54c41..faba6c8 100644
--- a/src/main/java/ru/samsung/test/core/utils/Utils.kt
+++ b/src/main/java/ru/samsung/test/core/utils/Utils.kt
@@ -1,4 +1,4 @@
-package ru.innovationcampus.test.core.utils
+package ru.samsung.test.core.utils
 
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
 import io.github.kakaocup.compose.node.element.ComposeScreen