diff --git a/data/account/build.gradle.kts b/data/account/build.gradle.kts
index dd1d1bd8de..f38f963b64 100644
--- a/data/account/build.gradle.kts
+++ b/data/account/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
+    alias(deps.plugins.ksp)
     id("configuration")
 }
 
@@ -10,41 +11,21 @@ android {
 }
 dependencies {
 
-    implementation(projects.features.virtualAccounts.details.api) // VIRTUAL_ACCOUNTS_ENABLED
-
-    // region Project - Common
-    implementation(projects.common.ui) // It's needed for getting AccountName.DefaultMain value
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
     // endregion
 
-    // region Project - Core
-    implementation(projects.core.datasource)
-    implementation(projects.core.configToggles)
-    implementation(projects.core.res)
-    api(projects.core.utils)
-    // endregion
-
-    // region Project - Domain
-    api(projects.domain.account)
-    api(projects.domain.card)
-    api(projects.domain.common)
-    api(projects.domain.models)
-    api(projects.domain.tokens)
-    api(projects.domain.wallets)
-    api(projects.domain.visa)
-    // endregion
-
-    // region Project - Data
-    implementation(projects.data.common)
-    // endregion
-
-    // region Project - Libs
-    implementation(projects.libs.crypto)
-    implementation(projects.libs.blockchainSdk)
+    // region Other libraries
+    api(deps.moshi)
+    ksp(deps.moshi.kotlin.codegen)
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.datastore)
+    implementation(deps.arrow.core)
     // endregion
 
     // region Tangem dependencies
-    implementation(tangemDeps.card.core)
     implementation(tangemDeps.blockchain)
+    implementation(tangemDeps.card.core)
     implementation(tangemDeps.hot.core)
     // endregion
 
@@ -53,20 +34,44 @@ dependencies {
     kapt(deps.hilt.kapt)
     // endregion
 
-    // region AndroidX libraries
-    implementation(deps.androidx.datastore)
+    // region Project - Core
+    api(projects.core.configToggles)
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    implementation(projects.core.res)
     // endregion
 
-    // region Other Dependencies
-    implementation(deps.arrow.core)
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.moshi)
-    implementation(deps.moshi.kotlin)
+    // region Project - Domain
+    api(projects.domain.account)
+    api(projects.domain.common)
+    api(projects.domain.core)
+    api(projects.domain.models)
+    api(projects.domain.tokens)
+    implementation(projects.domain.card)
+    runtimeOnly(projects.domain.visa)
+    runtimeOnly(projects.domain.wallets)
+    // endregion
+
+    // region Project - Data
+    api(projects.data.common)
+    // endregion
+
+    // region Project - Features
+    api(projects.features.virtualAccounts.details.api) // VIRTUAL_ACCOUNTS_ENABLED
+    // endregion
+
+    // region Project - Common
+    implementation(projects.common.ui) // It's needed for getting AccountName.DefaultMain value
+    // endregion
+
+    // region Project - Libs
+    implementation(projects.libs.blockchainSdk)
+    implementation(projects.libs.crypto)
     // endregion
 
     // region Test
+    testImplementation(deps.test.turbine)
     testImplementation(projects.common.test)
     testImplementation(projects.test.core)
-    testImplementation(deps.test.turbine)
     // endregion
 }
\ No newline at end of file
diff --git a/data/address-book/build.gradle.kts b/data/address-book/build.gradle.kts
index 31c3011678..1457ef8263 100644
--- a/data/address-book/build.gradle.kts
+++ b/data/address-book/build.gradle.kts
@@ -11,27 +11,16 @@ android {
 }
 
 dependencies {
-    // region Project - Core
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
-    // endregion
 
-    // region Project - Data
-    implementation(projects.data.common)
-    // endregion
-
-    // region Project - Domain
-    implementation(projects.domain.addressBook)
-    implementation(projects.domain.common)
-    implementation(projects.domain.models)
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    implementation(deps.kotlin.serialization)
     // endregion
 
     // region SDK
     implementation(deps.androidx.datastore)
     implementation(deps.arrow.core)
     implementation(deps.jodatime)
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.kotlin.serialization)
     // endregion
 
     // region DI
@@ -39,8 +28,22 @@ dependencies {
     kapt(deps.hilt.kapt)
     // endregion
 
+    // region Project - Core
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    // endregion
+
+    // region Project - Data
+    api(projects.data.common)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.addressBook)
+    api(projects.domain.common)
+    api(projects.domain.models)
+    // endregion
+
     // region Testing
     testImplementation(projects.test.core)
-    testImplementation(deps.moshi.kotlin)
     // endregion
 }
\ No newline at end of file
diff --git a/data/analytics/build.gradle.kts b/data/analytics/build.gradle.kts
index 1ad08811c1..342495d26b 100644
--- a/data/analytics/build.gradle.kts
+++ b/data/analytics/build.gradle.kts
@@ -11,26 +11,27 @@ android {
 
 dependencies {
 
-    /** Project - Domain */
-    implementation(projects.domain.analytics)
-    implementation(projects.domain.models)
-    implementation(projects.domain.wallets.models)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
-    /** Project - Analytics */
-    implementation(projects.core.analytics.models)
-    implementation(projects.core.utils)
-
-    /** Project - Data */
-    implementation(projects.core.datasource)
-    implementation(projects.data.common)
-
-    /** AndroidX */
+    // region Other libraries
     implementation(deps.androidx.datastore)
+    implementation(deps.moshi)
+    // endregion
 
-    /** DI */
+    // region DI
     implementation(deps.hilt.core)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    /** Other */
-    implementation(deps.kotlin.coroutines)
+    // region Project - Core
+    api(projects.core.datasource)
+    implementation(projects.core.utils)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.analytics)
+    implementation(projects.domain.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/app-currency/build.gradle.kts b/data/app-currency/build.gradle.kts
index 719c23cae7..f93014ee7d 100644
--- a/data/app-currency/build.gradle.kts
+++ b/data/app-currency/build.gradle.kts
@@ -11,26 +11,31 @@ android {
 
 dependencies {
 
-    /** Project - Domain */
-    implementation(projects.domain.core)
-    implementation(projects.domain.appCurrency)
-    implementation(projects.domain.appCurrency.models)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
-    /** Project - Data */
-    implementation(projects.core.datasource)
-    implementation(projects.data.common)
+    // region Other libraries
+    implementation(deps.arrow.core)
+    implementation(deps.jodatime)
+    // endregion
 
-    /** Project - Utils */
-    implementation(projects.core.utils)
-
-    /** AndroidX */
-    implementation(deps.androidx.datastore)
-
-    /** DI */
+    // region DI
     implementation(deps.hilt.core)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    /** Other */
-    implementation(deps.jodatime)
-    implementation(deps.kotlin.coroutines)
+    // region Project - Core
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    // endregion
+
+    // region Project - Data
+    api(projects.data.common)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.appCurrency)
+    implementation(projects.domain.appCurrency.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/app-theme/build.gradle.kts b/data/app-theme/build.gradle.kts
index 92a28083d7..346ecf0897 100644
--- a/data/app-theme/build.gradle.kts
+++ b/data/app-theme/build.gradle.kts
@@ -11,23 +11,27 @@ android {
 
 dependencies {
 
-    /** Project - Domain */
-    implementation(projects.domain.appTheme)
-    implementation(projects.domain.appTheme.models)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
-    /** Project - Data */
-    implementation(projects.core.datasource)
+    // region Other libraries
+    implementation(deps.androidx.datastore)
+    implementation(deps.moshi)
+    // endregion
 
-    /** Project - Utils */
-    implementation(projects.core.utils)
-
-    /** DI */
+    // region DI
     implementation(deps.hilt.core)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    /** Other */
-    implementation(deps.kotlin.coroutines)
+    // region Project - Core
+    api(projects.core.datasource)
+    implementation(projects.core.utils)
+    // endregion
 
-    /** Local storages */
-    implementation(deps.androidx.datastore)
+    // region Project - Domain
+    api(projects.domain.appTheme)
+    implementation(projects.domain.appTheme.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/appsflyer/build.gradle.kts b/data/appsflyer/build.gradle.kts
index 37b32fb365..e8f9fa650b 100644
--- a/data/appsflyer/build.gradle.kts
+++ b/data/appsflyer/build.gradle.kts
@@ -11,10 +11,17 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.datasource)
-
-    implementation(projects.domain.appsflyer)
 
+    // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
+    // endregion
+
+    // region Core modules
+    api(projects.core.datasource)
+    // endregion
+
+    // region Domain
+    api(projects.domain.appsflyer)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/assetsdiscovery/build.gradle.kts b/data/assetsdiscovery/build.gradle.kts
index d043536d23..4c71a0e62f 100644
--- a/data/assetsdiscovery/build.gradle.kts
+++ b/data/assetsdiscovery/build.gradle.kts
@@ -11,27 +11,45 @@ android {
 }
 
 dependencies {
-    api(projects.domain.assetsdiscovery)
-    implementation(projects.domain.tokens)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.models)
-    implementation(projects.domain.walletManager)
-    implementation(projects.domain.wallets)
-    implementation(projects.data.common)
-    implementation(projects.data.walletManager)
-    implementation(projects.libs.blockchainSdk)
-    implementation(projects.libs.tangemSdkApi)
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
 
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
+
+    // region Other libraries
+    api(deps.moshi)
+    implementation(deps.androidx.datastore)
+    // endregion
+
+    // region Tangem SDK
     implementation(tangemDeps.blockchain)
     implementation(tangemDeps.card.core)
+    // endregion
 
-    implementation(deps.androidx.datastore)
-
+    // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.moshi)
+    // region Core modules
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    // endregion
+
+    // region Data
+    api(projects.data.common)
+    implementation(projects.data.walletManager)
+    // endregion
+
+    // region Domain
+    api(projects.domain.assetsdiscovery)
+    api(projects.domain.common)
+    api(projects.domain.models)
+    implementation(projects.domain.wallets)
+    runtimeOnly(projects.domain.tokens)
+    // endregion
+
+    // region Libs
+    api(projects.libs.blockchainSdk)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/balance-hiding/build.gradle.kts b/data/balance-hiding/build.gradle.kts
index 3d3caf3397..ace70654ad 100644
--- a/data/balance-hiding/build.gradle.kts
+++ b/data/balance-hiding/build.gradle.kts
@@ -11,18 +11,29 @@ android {
 }
 
 dependencies {
-    implementation(deps.androidx.datastore)
-    implementation(deps.androidx.appCompat)
 
-    /** DI */
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    // endregion
+
+    // region Other libraries
+    api(deps.lifecycle.runtime.ktx)
+    implementation(deps.androidx.datastore)
+    implementation(deps.moshi)
+    // endregion
+
+    // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    implementation(deps.kotlin.coroutines)
-
+    // region Core modules
+    api(projects.core.datasource)
     implementation(projects.core.utils)
-    implementation(projects.core.datasource)
+    // endregion
 
-    implementation(projects.domain.balanceHiding)
+    // region Domain
+    api(projects.domain.balanceHiding)
     implementation(projects.domain.balanceHiding.models)
+    // endregion
 }
diff --git a/data/blockaid/build.gradle.kts b/data/blockaid/build.gradle.kts
index 8a513989ee..a4f43f9dac 100644
--- a/data/blockaid/build.gradle.kts
+++ b/data/blockaid/build.gradle.kts
@@ -10,35 +10,43 @@ android {
 }
 
 dependencies {
-    /* Project - Domain */
-    implementation(projects.data.common)
-    implementation(projects.domain.models)
-    implementation(projects.domain.blockaid)
-    implementation(projects.domain.blockaid.models)
 
-    /* Project - Data */
-    implementation(projects.core.datasource)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
-    /* Project - Core */
-    implementation(projects.core.utils)
-    implementation(projects.libs.blockchainSdk)
+    // region Other libraries
+    api(deps.arrow.core)
+    // endregion
 
-    /* DI */
+    // region Tangem libraries
+    api(tangemDeps.blockchain)
+    // endregion
+
+    // region DI
     implementation(deps.hilt.core)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    /* Tangem libraries */
-    implementation(tangemDeps.blockchain)
-    implementation(tangemDeps.card.core)
+    // region Core modules
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    // endregion
 
-    /* Other */
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.arrow.core)
+    // region Domain
+    api(projects.domain.blockaid)
+    api(projects.domain.blockaid.models)
+    api(projects.domain.models)
+    // endregion
 
-    /* Tests */
+    // region Libs
+    implementation(projects.libs.blockchainSdk)
+    // endregion
+
+    // region Tests
     testImplementation(deps.test.coroutine)
     testImplementation(deps.test.junit5)
     testImplementation(deps.test.mockk)
-    testImplementation(deps.test.turbine)
     testImplementation(deps.test.truth)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/card/build.gradle.kts b/data/card/build.gradle.kts
index 2f07418317..8688f0a91a 100644
--- a/data/card/build.gradle.kts
+++ b/data/card/build.gradle.kts
@@ -11,27 +11,40 @@ android {
 }
 
 dependencies {
-    implementation(deps.androidx.datastore)
 
-    implementation(tangemDeps.blockchain) {
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
+
+    // region Other libraries
+    api(deps.androidx.fragment)
+    implementation(deps.androidx.datastore)
+    implementation(deps.moshi)
+    // endregion
+
+    // region Tangem SDK
+    api(tangemDeps.blockchain) {
         exclude(module = "joda-time")
     }
+    api(tangemDeps.card.core)
+    // endregion
 
+    // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    implementation(tangemDeps.card.android)
-    implementation(tangemDeps.card.core)
-
-    implementation(projects.core.datasource)
+    // region Core modules
+    api(projects.core.datasource)
     implementation(projects.core.utils)
+    // endregion
 
-    implementation(projects.libs.blockchainSdk)
-
-    implementation(projects.domain.card)
-    implementation(projects.domain.models)
+    // region Domain
+    api(projects.domain.card)
+    api(projects.domain.models)
+    // endregion
 
     // region Tests
     testImplementation(projects.test.core)
-    // end
+    // endregion
 }
\ No newline at end of file
diff --git a/data/common/build.gradle.kts b/data/common/build.gradle.kts
index 696f498317..934cf16db6 100644
--- a/data/common/build.gradle.kts
+++ b/data/common/build.gradle.kts
@@ -9,41 +9,56 @@ android {
     namespace = "com.tangem.data.common"
 }
 dependencies {
-    /* Core */
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
 
-    /* Domain */
-    implementation(projects.domain.account)
-    implementation(projects.domain.demo)
-    implementation(projects.domain.legacy)
-    implementation(projects.domain.card)
-    implementation(projects.domain.models)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.express.models)
-    implementation(projects.domain.networks)
-    implementation(projects.domain.walletManager)
-    implementation(projects.domain.wallets)
+    // region Kotlin
+    api(deps.kotlin.coroutines)
+    // endregion
 
-    /* Libs - SDK */
-    implementation(tangemDeps.blockchain)
+    // region Other libraries
+    api(deps.arrow.core)
+    api(deps.jodatime)
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.datastore)
+    // endregion
+
+    // region Libs - SDK
+    api(tangemDeps.blockchain)
     implementation(tangemDeps.card.core)
-    implementation(projects.libs.crypto)
-    implementation(projects.libs.blockchainSdk)
+    // endregion
 
-    /* DI */
+    // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    /* Libs - Other */
-    implementation(deps.androidx.datastore)
-    implementation(deps.arrow.core)
-    implementation(deps.jodatime)
-    implementation(deps.kotlin.coroutines)
+    // region Core
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    // endregion
 
-    /* Test */
+    // region Domain
+    api(projects.domain.common)
+    api(projects.domain.walletManager)
+    api(projects.domain.wallets)
+    implementation(projects.domain.card)
+    implementation(projects.domain.core)
+    runtimeOnly(projects.domain.account)
+    // endregion
+
+    // region Domain models
+    api(projects.domain.demo.models)
+    api(projects.domain.express.models)
+    api(projects.domain.models)
+    implementation(projects.domain.wallets.models)
+    // endregion
+
+    // region Libs
+    api(projects.libs.blockchainSdk)
+    implementation(projects.libs.crypto)
+    // endregion
+
+    // region Test
     testImplementation(projects.common.test)
     testImplementation(projects.test.core)
-    testImplementation(deps.moshi)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/dynamic-addresses/build.gradle.kts b/data/dynamic-addresses/build.gradle.kts
index 618e0609b7..0529f3efbc 100644
--- a/data/dynamic-addresses/build.gradle.kts
+++ b/data/dynamic-addresses/build.gradle.kts
@@ -9,28 +9,17 @@ android {
     namespace = "com.tangem.data.dynamicaddresses"
 }
 dependencies {
-    // region Project - Core
-    implementation(projects.core.configToggles)
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
+
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
     // endregion
 
-    // region Project - Data
-    implementation(projects.data.common)
-    // endregion
-
-    // region Project - Domain
-    implementation(projects.domain.account)
-    implementation(projects.domain.common)
-    implementation(projects.domain.dynamicAddresses)
-    implementation(projects.domain.dynamicAddresses.models)
-    implementation(projects.domain.models)
-    implementation(projects.domain.walletManager)
+    // region Other libraries
+    implementation(deps.arrow.core)
     // endregion
 
     // region Project - Libs
     implementation(tangemDeps.blockchain) { exclude(module = "joda-time") }
-    implementation(tangemDeps.card.core)
     // endregion
 
     // region DI
@@ -38,7 +27,29 @@ dependencies {
     kapt(deps.hilt.kapt)
     // endregion
 
+    // region Project - Core
+    api(projects.core.configToggles)
+    api(projects.core.utils)
+    implementation(projects.core.datasource)
+    // endregion
+
+    // region Project - Data
+    api(projects.data.common)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.account)
+    api(projects.domain.common)
+    api(projects.domain.dynamicAddresses)
+    api(projects.domain.models)
+    api(projects.domain.walletManager)
+    implementation(projects.domain.dynamicAddresses.models)
+    // endregion
+
     // region Testing
-    testImplementation(projects.test.core)
+    testImplementation(deps.test.coroutine)
+    testImplementation(deps.test.junit5)
+    testImplementation(deps.test.mockk)
+    testImplementation(deps.test.truth)
     // endregion
 }
\ No newline at end of file
diff --git a/data/earn/build.gradle.kts b/data/earn/build.gradle.kts
index 87173ffe7a..41620393d5 100644
--- a/data/earn/build.gradle.kts
+++ b/data/earn/build.gradle.kts
@@ -10,23 +10,14 @@ android {
 }
 
 dependencies {
-    // region Project - Core
-    implementation(projects.core.datasource)
-    api(projects.core.utils)
+
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
     // endregion
 
-    // region Project - Data
-    implementation(projects.data.common)
-    // endregion
-
-    // region Project - Domain
-    implementation(projects.domain.earn)
-    implementation(projects.domain.common)
-    implementation(projects.domain.account.status)
-    // endregion
-
-    // region Project - Libs
-    implementation(projects.libs.blockchainSdk)
+    // region Other libraries
+    implementation(deps.arrow.core)
+    implementation(tangemDeps.blockchain)
     // endregion
 
     // region DI
@@ -34,10 +25,24 @@ dependencies {
     kapt(deps.hilt.kapt)
     // endregion
 
-    // region Other libraries
-    implementation(deps.androidx.datastore)
-    implementation(deps.moshi.kotlin)
-    implementation(tangemDeps.blockchain)
+    // region Project - Core
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    implementation(projects.core.pagination)
     // endregion
 
+    // region Project - Data
+    implementation(projects.data.common)
+    // endregion
+
+    // region Project - Domain
+    api(projects.domain.common)
+    api(projects.domain.earn)
+    implementation(projects.domain.models)
+    runtimeOnly(projects.domain.account.status)
+    // endregion
+
+    // region Project - Libs
+    api(projects.libs.blockchainSdk)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/express/build.gradle.kts b/data/express/build.gradle.kts
index 994d34af6d..db2308e185 100644
--- a/data/express/build.gradle.kts
+++ b/data/express/build.gradle.kts
@@ -3,7 +3,6 @@ plugins {
     alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
     alias(deps.plugins.hilt.android)
-    alias(deps.plugins.ksp)
     id("configuration")
 }
 
@@ -13,26 +12,35 @@ android {
 
 dependencies {
 
-    /** Core */
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
-    /** Data */
-    implementation(projects.data.common)
+    // region Other libraries
+    api(deps.moshi)
+    implementation(deps.arrow.core)
+    // endregion
 
-    /** Domain */
-    implementation(projects.domain.common)
-    implementation(projects.domain.express.models)
-    implementation(projects.domain.express)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.txhistory)
-    api(projects.domain.models)
-
-    /** Other */
-    implementation(deps.moshi)
-    implementation(deps.moshi.kotlin)
-
-    /** DI */
+    // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
+    // endregion
+
+    // region Core
+    api(projects.core.datasource)
+    api(projects.core.utils)
+    // endregion
+
+    // region Data
+    implementation(projects.data.common)
+    // endregion
+
+    // region Domain
+    api(projects.domain.common)
+    api(projects.domain.express)
+    api(projects.domain.express.models)
+    api(projects.domain.txhistory)
+    implementation(projects.domain.core)
+    implementation(projects.domain.models)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/feedback/build.gradle.kts b/data/feedback/build.gradle.kts
index c5ea5e524e..705dfcb29a 100644
--- a/data/feedback/build.gradle.kts
+++ b/data/feedback/build.gradle.kts
@@ -10,8 +10,9 @@ android {
 }
 
 dependencies {
-    // region AndroidX libraries
-    implementation(deps.androidx.datastore)
+
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
     // endregion
 
     // region DI
@@ -24,27 +25,23 @@ dependencies {
     implementation(tangemDeps.card.core)
     // endregion
 
-    // Other libraries
-    // endregion
-
     // region Core modules
-    implementation(projects.core.configToggles)
-    implementation(projects.core.datasource)
-    implementation(projects.core.navigation)
-    implementation(projects.core.utils)
-
+    api(projects.core.configToggles)
+    api(projects.core.datasource)
+    api(projects.core.navigation)
+    api(projects.core.utils)
     // endregion
 
-    // Feature modules
-    implementation(projects.features.hotWallet.api)
-
-    implementation(projects.domain.feedback)
-    implementation(projects.domain.feedback.models)
-    implementation(projects.domain.legacy)
+    // region Domain
+    api(projects.domain.common)
+    api(projects.domain.feedback)
     implementation(projects.domain.card)
+    implementation(projects.domain.feedback.models)
     implementation(projects.domain.models)
     implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
+    // endregion
 
+    // region Libs
     implementation(projects.libs.blockchainSdk)
+    // endregion
 }
\ No newline at end of file
diff --git a/data/hot-wallet/build.gradle.kts b/data/hot-wallet/build.gradle.kts
index 285d04e10c..200cd03f5c 100644
--- a/data/hot-wallet/build.gradle.kts
+++ b/data/hot-wallet/build.gradle.kts
@@ -11,17 +11,29 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.datasource)
-    implementation(projects.core.utils)
 
-    implementation(projects.domain.hotWallet)
-    implementation(projects.domain.models)
+    // region Kotlin
+    implementation(deps.kotlin.coroutines)
+    // endregion
 
+    // region Other libraries
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.datastore)
+    implementation(deps.moshi)
+    // endregion
+
+    // region DI
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
+    // endregion
 
-    implementation(deps.androidx.datastore)
-    implementation(deps.kotlin.coroutines)
-    implementation(deps.moshi)
-    implementation(deps.moshi.kotlin)
+    // region Core modules
+    api(projects.core.datasource)
+    implementation(projects.core.utils)
+    // endregion
+
+    // region Domain
+    api(projects.domain.hotWallet)
+    implementation(projects.domain.models)
+    // endregion
 }
\ No newline at end of file