diff --git a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/AccountsTest.kt b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/AccountsTest.kt
similarity index 98%
rename from app/src/androidTest/java/com/ivy/wallet/compose/scenario/AccountsTest.kt
rename to app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/AccountsTest.kt
index 0b803452a0..29417aa5da 100644
--- a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/AccountsTest.kt
+++ b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/AccountsTest.kt
@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.scenario
+package com.ivy.wallet.compose.scenario.core
 
 import com.ivy.wallet.compose.IvyComposeTest
 import com.ivy.wallet.compose.component.ItemStatisticScreen
diff --git a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/CategoriesTest.kt b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/CategoriesTest.kt
similarity index 98%
rename from app/src/androidTest/java/com/ivy/wallet/compose/scenario/CategoriesTest.kt
rename to app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/CategoriesTest.kt
index 53b969dfac..cbd9778eff 100644
--- a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/CategoriesTest.kt
+++ b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/CategoriesTest.kt
@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.scenario
+package com.ivy.wallet.compose.scenario.core
 
 import com.ivy.wallet.compose.IvyComposeTest
 import com.ivy.wallet.compose.component.ItemStatisticScreen
diff --git a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/DonateTest.kt b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/DonateTest.kt
similarity index 97%
rename from app/src/androidTest/java/com/ivy/wallet/compose/scenario/DonateTest.kt
rename to app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/DonateTest.kt
index a43ce3474f..fb0dfa2b98 100644
--- a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/DonateTest.kt
+++ b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/DonateTest.kt
@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.scenario
+package com.ivy.wallet.compose.scenario.core
 
 import com.ivy.wallet.compose.IvyComposeTest
 import dagger.hilt.android.testing.HiltAndroidTest
diff --git a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/OnboardingTest.kt b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/OnboardingTest.kt
similarity index 97%
rename from app/src/androidTest/java/com/ivy/wallet/compose/scenario/OnboardingTest.kt
rename to app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/OnboardingTest.kt
index 7c0bd9a14f..747fdfdb20 100644
--- a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/OnboardingTest.kt
+++ b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/OnboardingTest.kt
@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.scenario
+package com.ivy.wallet.compose.scenario.core
 
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.hasText
diff --git a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/OperationsCoreTest.kt b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/OperationsCoreTest.kt
similarity index 99%
rename from app/src/androidTest/java/com/ivy/wallet/compose/scenario/OperationsCoreTest.kt
rename to app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/OperationsCoreTest.kt
index c42d71a0fe..23432d265c 100644
--- a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/OperationsCoreTest.kt
+++ b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/OperationsCoreTest.kt
@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.scenario
+package com.ivy.wallet.compose.scenario.core
 
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.performClick
diff --git a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/PlannedPaymentsTest.kt b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/PlannedPaymentsTest.kt
similarity index 99%
rename from app/src/androidTest/java/com/ivy/wallet/compose/scenario/PlannedPaymentsTest.kt
rename to app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/PlannedPaymentsTest.kt
index 6d3ac283f3..2b5e9dc7be 100644
--- a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/PlannedPaymentsTest.kt
+++ b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/core/PlannedPaymentsTest.kt
@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.scenario
+package com.ivy.wallet.compose.scenario.core
 
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick