diff --git a/features/feed/api/build.gradle.kts b/features/feed/api/build.gradle.kts
index b0a3a10ffc..78e13a064e 100644
--- a/features/feed/api/build.gradle.kts
+++ b/features/feed/api/build.gradle.kts
@@ -11,19 +11,20 @@ android {
 }
 
 dependencies {
-    implementation(deps.compose.foundation)
 
-    /* Project - API */
-    api(projects.features.account.api)
+    /* Kotlin */
+    api(deps.kotlin.coroutines)
+    api(deps.kotlin.serialization.core)
+
+    /* Compose */
+    api(deps.compose.foundation)
 
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 
     /* Project - Domain */
-    implementation(projects.domain.core)
-    implementation(projects.domain.models)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.markets.models)
+    api(projects.domain.appCurrency.models)
+    api(projects.domain.markets.models)
+    api(projects.domain.models)
 }
\ No newline at end of file
diff --git a/features/feed/impl/build.gradle.kts b/features/feed/impl/build.gradle.kts
index 48926c4ffd..deccd0db2a 100644
--- a/features/feed/impl/build.gradle.kts
+++ b/features/feed/impl/build.gradle.kts
@@ -18,52 +18,48 @@ android {
 }
 dependencies {
     /* Project - API */
-    api(projects.features.feed.api)
-    api(projects.features.onramp.api)
-    api(projects.features.send.api)
-    api(projects.features.tokenRecieve.api)
-    api(projects.features.wallet.api)
-    api(projects.features.account.api)
     api(projects.features.commonFeatures.api)
+    api(projects.features.feed.api)
     api(projects.features.forYou.api)
-    implementation(projects.features.promoBanners.api)
+    api(projects.features.promoBanners.api)
+    api(projects.features.tokenRecieve.api)
 
     /* Data */
     implementation(projects.data.common)
 
     /* Domain */
+    api(projects.domain.account.status)
+    api(projects.domain.appCurrency)
+    api(projects.domain.balanceHiding)
+    api(projects.domain.common)
+    api(projects.domain.earn)
+    api(projects.domain.feedback)
+    api(projects.domain.markets)
+    api(projects.domain.models)
+    api(projects.domain.news)
+    api(projects.domain.search)
+    api(projects.domain.settings)
+    api(projects.domain.tokens)
+    api(projects.domain.transaction)
+    api(projects.domain.wallets)
+    api(projects.domain.yieldSupply)
     implementation(projects.domain.account)
-    implementation(projects.domain.account.status)
-    implementation(projects.domain.appCurrency)
     implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.balanceHiding)
-    implementation(projects.domain.balanceHiding.models)
     implementation(projects.domain.card)
-    implementation(projects.domain.demo)
-    implementation(projects.domain.feedback)
+    implementation(projects.domain.core)
     implementation(projects.domain.feedback.models)
-    implementation(projects.domain.manageTokens)
-    implementation(projects.domain.markets)
-    implementation(projects.domain.offramp)
-    implementation(projects.domain.onramp.models)
-    implementation(projects.domain.staking.models)
-    implementation(projects.domain.tokens)
     implementation(projects.domain.tokens.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.settings)
-    implementation(projects.domain.notifications.models)
-    implementation(projects.domain.transaction)
-    implementation(projects.domain.news)
     implementation(projects.domain.yieldSupply.models)
-    implementation(projects.domain.yieldSupply)
-    implementation(projects.domain.earn)
-    implementation(projects.domain.search)
+    runtimeOnly(projects.domain.manageTokens)
+    runtimeOnly(projects.domain.offramp)
+
+    /* Domain models */
+    api(projects.domain.markets.models)
 
     /* Compose */
-    implementation(deps.compose.coil)
-    implementation(deps.compose.foundation)
-    implementation(deps.compose.material3)
+    api(deps.compose.coil)
+    api(deps.compose.foundation)
+    api(deps.compose.material3)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
     implementation(deps.compose.ui.utils)
@@ -76,31 +72,38 @@ dependencies {
     kapt(deps.hilt.kapt)
 
     /* Other */
-    implementation(deps.kotlin.immutable.collections)
-    implementation(deps.decompose.ext.compose)
+    api(deps.decompose.ext.compose)
+    api(deps.kotlin.coroutines)
+    api(deps.kotlin.immutable.collections)
+    api(deps.kotlin.serialization.core)
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.appCompat)
+    implementation(deps.arrow.core)
+    implementation(deps.haze)
+    implementation(deps.jodatime)
 
     /* Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-    implementation(projects.core.configToggles)
-    implementation(projects.core.analytics)
+    api(projects.core.analytics)
+    api(projects.core.decompose)
+    api(projects.core.navigation)
+    api(projects.core.ui)
+    api(projects.core.utils)
     implementation(projects.core.analytics.models)
-    implementation(projects.core.navigation)
-    implementation(projects.core.utils)
     implementation(projects.core.datasource)
+    implementation(projects.core.pagination)
 
     /* Common */
-    implementation(projects.common.ui)
+    api(projects.common.routing)
+    api(projects.common.ui)
+    api(projects.common.uiMarkets)
+    implementation(projects.common)
     implementation(projects.common.uiCharts)
-    implementation(projects.common.routing)
-    implementation(projects.common.uiMarkets)
 
     /* Libs */
+    api(projects.libs.blockchainSdk)
     implementation(projects.libs.crypto)
-    implementation(projects.libs.blockchainSdk)
 
     /** Tangem libraries */
-    implementation(tangemDeps.card.core)
     implementation(tangemDeps.blockchain)
 
     /** Tests */
@@ -108,4 +111,5 @@ dependencies {
     testImplementation(deps.test.mockk)
     testImplementation(deps.test.truth)
     testImplementation(deps.test.coroutine)
+    testImplementation(projects.domain.wallets.models)
 }
\ No newline at end of file
diff --git a/features/for-you/api/build.gradle.kts b/features/for-you/api/build.gradle.kts
index 95c2a85416..21b67c2ca2 100644
--- a/features/for-you/api/build.gradle.kts
+++ b/features/for-you/api/build.gradle.kts
@@ -12,9 +12,6 @@ android {
 
 dependencies {
     /** Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-
-    /** Other dependencies */
-    implementation(deps.compose.foundation)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 }
\ No newline at end of file
diff --git a/features/for-you/impl/build.gradle.kts b/features/for-you/impl/build.gradle.kts
index 02f9d36a2e..47701bc7ee 100644
--- a/features/for-you/impl/build.gradle.kts
+++ b/features/for-you/impl/build.gradle.kts
@@ -18,37 +18,53 @@ android {
 
 dependencies {
 
-    /** Features */
-    implementation(projects.features.forYou.api)
-    implementation(projects.features.promoBanners.api)
+    /** Project - Features */
+    api(projects.features.forYou.api)
+    api(projects.features.promoBanners.api)
     implementation(projects.features.commonFeatures.api)
 
-    /** Domain */
-    implementation(projects.domain.common)
-    implementation(projects.domain.models)
-    implementation(projects.domain.account.status)
-    implementation(projects.domain.appCurrency)
-
-    /** Core */
-    implementation(projects.core.decompose)
+    /** Project - Core */
+    api(projects.core.configToggles)
+    api(projects.core.decompose)
+    api(projects.core.utils)
     implementation(projects.core.ui)
-    implementation(projects.core.configToggles)
 
-    implementation(projects.common.ui)
+    /** Project - Common */
+    api(projects.common.ui)
 
+    /** Project - Domain */
+    api(projects.domain.account.status)
+    api(projects.domain.appCurrency)
+    api(projects.domain.common)
+    api(projects.domain.wallets)
+    implementation(projects.domain.account)
+    implementation(projects.domain.models)
+
+    /** Project - Domain models */
+    implementation(projects.domain.appCurrency.models)
+
+    /** Compose */
+    api(deps.compose.animation)
+    api(deps.compose.foundation)
+    implementation(deps.compose.material3)
+    implementation(deps.compose.reorderable)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.foundation)
-    implementation(deps.compose.animation)
-    implementation(deps.lifecycle.compose)
-    implementation(deps.compose.material3)
+
+    /** Other libraries */
+    implementation(deps.androidx.appCompat)
+    implementation(deps.arrow.core)
+    implementation(deps.decompose)
+    implementation(deps.haze)
+    implementation(deps.kotlin.coroutines)
     implementation(deps.kotlin.immutable.collections)
+    implementation(deps.lifecycle.compose)
 
     /** DI */
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
 
-    /** Test */
+    /** Tests */
     testImplementation(projects.common.test)
     testImplementation(projects.test.core)
 }
\ No newline at end of file
diff --git a/features/home/api/build.gradle.kts b/features/home/api/build.gradle.kts
index 7f07d748d7..33762d6d00 100644
--- a/features/home/api/build.gradle.kts
+++ b/features/home/api/build.gradle.kts
@@ -9,9 +9,9 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 
     /** Common */
-    implementation(projects.common.routing)
-} 
\ No newline at end of file
+    api(projects.common.routing)
+}
\ No newline at end of file
diff --git a/features/home/impl/build.gradle.kts b/features/home/impl/build.gradle.kts
index ff389bc6fd..0197c7de7e 100644
--- a/features/home/impl/build.gradle.kts
+++ b/features/home/impl/build.gradle.kts
@@ -12,41 +12,48 @@ android {
 
 dependencies {
     /** Api */
-    implementation(projects.features.home.api)
+    api(projects.features.home.api)
 
     /** Core modules */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-    implementation(projects.core.analytics)
+    api(projects.core.analytics)
+    api(projects.core.configToggles)
+    api(projects.core.decompose)
+    api(projects.core.utils)
     implementation(projects.core.analytics.models)
-    implementation(projects.core.utils)
-    implementation(projects.core.configToggles)
+    implementation(projects.core.ui)
 
     /** Common */
     implementation(projects.common.routing)
 
     /** Domain */
-    implementation(projects.domain.common)
+    api(projects.domain.card)
+    api(projects.domain.common)
+    api(projects.domain.settings)
+    api(projects.domain.wallets)
     implementation(projects.domain.models)
-    implementation(projects.domain.card)
-    implementation(projects.domain.settings)
-    implementation(projects.domain.wallets)
 
     /** Referral */
-    implementation(projects.features.referral.domain)
+    api(projects.features.referral.domain)
 
     /** Compose libraries */
+    api(deps.compose.animation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
     implementation(deps.compose.foundation)
     implementation(deps.compose.material3)
-    implementation(deps.compose.animation)
 
     /** Tangem libraries */
     implementation(tangemDeps.card.core)
 
     /** Other libraries */
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.appCompat)
+    implementation(deps.arrow.core)
+    implementation(deps.decompose)
+    implementation(deps.kotlin.coroutines)
     implementation(deps.kotlin.immutable.collections)
+    implementation(deps.lifecycle.compose)
+    implementation(deps.lifecycle.runtime.ktx)
 
     /** DI */
     implementation(deps.hilt.android)
diff --git a/features/hot-wallet/api/build.gradle.kts b/features/hot-wallet/api/build.gradle.kts
index 4ab40a7a26..0f5d1d1128 100644
--- a/features/hot-wallet/api/build.gradle.kts
+++ b/features/hot-wallet/api/build.gradle.kts
@@ -9,24 +9,17 @@ android {
 }
 
 dependencies {
-    implementation(projects.common.routing)
+    api(projects.common.routing)
 
     /* Project - Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
+    api(projects.domain.models)
+    api(projects.domain.wallets)
 
     /* Project - Core */
     api(projects.core.analytics.models)
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 
     /* Tangem libraries */
-    implementation(tangemDeps.card.core)
-
-    /* Compose */
-    implementation(deps.compose.runtime)
-
-    /* Tangem libs */
-    implementation(tangemDeps.hot.core)
+    api(tangemDeps.card.core)
 }
\ No newline at end of file
diff --git a/features/hot-wallet/impl/build.gradle.kts b/features/hot-wallet/impl/build.gradle.kts
index 5548f44c80..2cfcd31172 100644
--- a/features/hot-wallet/impl/build.gradle.kts
+++ b/features/hot-wallet/impl/build.gradle.kts
@@ -12,65 +12,67 @@ android {
 }
 dependencies {
     /** Api */
-    implementation(projects.features.hotWallet.api)
-    implementation(projects.features.onboardingV2.api)
-    implementation(projects.features.pushNotifications.api)
+    api(projects.features.hotWallet.api)
+    api(projects.features.onboardingV2.api)
+    api(projects.features.pushNotifications.api)
 
     /** Core modules */
-    implementation(projects.core.configToggles)
-    implementation(projects.core.analytics)
+    api(projects.core.analytics)
+    api(projects.core.configToggles)
+    api(projects.core.datasource)
+    api(projects.core.decompose)
+    api(projects.core.navigation)
+    api(projects.core.ui)
+    api(projects.core.utils)
     implementation(projects.core.analytics.models)
-    implementation(projects.core.utils)
-    implementation(projects.core.ui)
     implementation(projects.core.res)
-    implementation(projects.core.decompose)
-    implementation(projects.core.navigation)
-    implementation(projects.core.datasource)
 
     /** Domain */
-    implementation(projects.domain.card)
-    implementation(projects.domain.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.models)
-    implementation(projects.domain.settings)
-    implementation(projects.domain.feedback)
+    api(projects.domain.assetsdiscovery)
+    api(projects.domain.card)
+    api(projects.domain.common)
+    api(projects.domain.feedback)
+    api(projects.domain.hotWallet)
+    api(projects.domain.settings)
+    api(projects.domain.wallets)
     implementation(projects.domain.feedback.models)
-    implementation(projects.domain.hotWallet)
-    implementation(projects.domain.assetsdiscovery)
+    implementation(projects.domain.models)
+    implementation(projects.domain.wallets.models)
 
     /** Common */
-    implementation(projects.common.ui)
     implementation(projects.common.routing)
+    runtimeOnly(projects.common.ui)
 
     /** Tangem libraries */
-    implementation(projects.libs.tangemSdkApi)
+    api(projects.libs.tangemSdkApi)
+    api(tangemDeps.hot.core)
     implementation(tangemDeps.card.core)
     implementation(tangemDeps.card.android) {
         exclude(module = "joda-time")
     }
-    implementation(tangemDeps.hot.core)
-    implementation(tangemDeps.hot.android)
+    runtimeOnly(tangemDeps.hot.android)
 
     /** AndroidX libraries */
-    implementation(deps.androidx.core.ktx)
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.appCompat)
+    implementation(deps.lifecycle.compose)
     implementation(deps.lifecycle.runtime.ktx)
 
     /** Compose libraries */
+    api(deps.compose.animation)
     implementation(deps.compose.material3)
-    implementation(deps.compose.animation)
     implementation(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.coil)
+    implementation(deps.lottie)
     implementation(deps.lottie.compose)
     implementation(deps.decompose.ext.compose)
     implementation(deps.androidx.activity.compose)
-    implementation(deps.androidx.datastore)
 
     /** Other libraries */
+    api(deps.kotlin.coroutines)
+    api(deps.kotlin.immutable.collections)
     implementation(deps.arrow.core)
-    implementation(deps.kotlin.immutable.collections)
     implementation(deps.kotlin.serialization)
     implementation(deps.firebase.crashlytics)
 
@@ -81,6 +83,5 @@ dependencies {
     /** Test */
     testImplementation(deps.test.junit5)
     testImplementation(deps.test.mockk)
-    testImplementation(deps.test.truth)
     testImplementation(deps.test.coroutine)
 }
\ No newline at end of file
diff --git a/features/kyc/api/build.gradle.kts b/features/kyc/api/build.gradle.kts
index 3133f2c7de..aec205d774 100644
--- a/features/kyc/api/build.gradle.kts
+++ b/features/kyc/api/build.gradle.kts
@@ -10,13 +10,10 @@ android {
 
 dependencies {
 
-    /* Project - Domain */
-    implementation(projects.domain.models)
-
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 
-    /* Compose */
-    implementation(deps.compose.runtime)
+    /* Project - Domain */
+    api(projects.domain.models)
 }
\ No newline at end of file
diff --git a/features/kyc/impl/build.gradle.kts b/features/kyc/impl/build.gradle.kts
index f51dea8c7d..a08fc2acc9 100644
--- a/features/kyc/impl/build.gradle.kts
+++ b/features/kyc/impl/build.gradle.kts
@@ -13,45 +13,36 @@ android {
 
 dependencies {
     /** Api */
-    implementation(projects.features.kyc.api)
+    api(projects.features.kyc.api)
 
     /** Domain */
-    implementation(projects.domain.visa)
-    implementation(projects.domain.wallets.models)
+    api(projects.domain.visa)
+    api(projects.domain.visa.models)
+    implementation(projects.domain.models)
 
     /** Core modules */
-    implementation(projects.core.configToggles)
-    implementation(projects.core.analytics)
+    api(projects.core.analytics)
+    api(projects.core.decompose)
+    api(projects.core.utils)
     implementation(projects.core.analytics.models)
-    implementation(projects.core.utils)
     implementation(projects.core.ui)
-    implementation(projects.core.res)
-    implementation(projects.core.decompose)
-    implementation(projects.core.navigation)
-    implementation(projects.core.datasource)
-    implementation(projects.core.error)
-
-    /** Common */
-    implementation(projects.common.ui)
-    implementation(projects.common.routing)
 
     /** Compose libraries */
+    api(deps.compose.animation)
+    api(deps.decompose.ext.compose)
     implementation(deps.compose.material3)
-    implementation(deps.compose.animation)
     implementation(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.coil)
-    implementation(deps.lottie.compose)
-    implementation(deps.decompose.ext.compose)
-    implementation(deps.androidx.activity.compose)
 
     /** Other libraries */
-    implementation(deps.kotlin.immutable.collections)
-    implementation(deps.kotlin.serialization)
+    api(deps.androidx.appCompat)
+    api(deps.kotlin.coroutines)
+    implementation(deps.androidx.core)
     implementation(deps.firebase.crashlytics)
     implementation(deps.sumsub.sdk)
     implementation(deps.arrow.core)
+    runtimeOnly(deps.lottie)
 
     /** DI */
     implementation(deps.hilt.android)
diff --git a/features/kyc/mock/build.gradle.kts b/features/kyc/mock/build.gradle.kts
index 2ba00e1182..17020be4c3 100644
--- a/features/kyc/mock/build.gradle.kts
+++ b/features/kyc/mock/build.gradle.kts
@@ -12,11 +12,10 @@ android {
 
 dependencies {
     /** Api */
-    implementation(projects.features.kyc.api)
+    api(projects.features.kyc.api)
 
-    implementation(projects.core.decompose)
+    api(projects.core.decompose)
     implementation(deps.compose.ui)
-    implementation(projects.core.ui)
 
     /** DI */
     implementation(deps.hilt.android)
diff --git a/features/manage-tokens/api/build.gradle.kts b/features/manage-tokens/api/build.gradle.kts
index 0cf7ab210c..8f6978d6a5 100644
--- a/features/manage-tokens/api/build.gradle.kts
+++ b/features/manage-tokens/api/build.gradle.kts
@@ -10,15 +10,16 @@ android {
 }
 
 dependencies {
+    /* Kotlin */
+    api(deps.kotlin.serialization.core)
+
     /* Project - Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.manageTokens.models)
+    api(projects.domain.models)
 
     /* Project - Core */
-    implementation(projects.core.ui)
-    implementation(projects.core.decompose)
-    implementation(projects.core.analytics.models)
+    api(projects.core.analytics.models)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 
     /* Compose */
     implementation(deps.compose.runtime)
diff --git a/features/manage-tokens/impl/build.gradle.kts b/features/manage-tokens/impl/build.gradle.kts
index b0d78716c5..0557b12620 100644
--- a/features/manage-tokens/impl/build.gradle.kts
+++ b/features/manage-tokens/impl/build.gradle.kts
@@ -16,33 +16,34 @@ dependencies {
     implementation(tangemDeps.card.core)
 
     /* Project - API */
-    implementation(projects.features.manageTokens.api)
-    implementation(projects.features.swapV2.api)
-    implementation(projects.features.commonFeatures.api)
+    api(projects.features.commonFeatures.api)
+    api(projects.features.manageTokens.api)
+    api(projects.features.swapV2.api)
 
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-    implementation(projects.core.configToggles)
-    implementation(projects.core.analytics)
-    implementation(projects.core.utils)
+    api(projects.core.analytics)
+    api(projects.core.decompose)
+    api(projects.core.ui)
+    api(projects.core.utils)
+    implementation(projects.core.analytics.models)
+    implementation(projects.core.pagination)
     implementation(projects.common.routing)
     implementation(projects.common.ui)
 
     /* Project - Domain */
-    implementation(projects.domain.account.status)
-    implementation(projects.domain.account)
-    implementation(projects.domain.card)
-    implementation(projects.domain.legacy)
-    implementation(projects.domain.manageTokens)
-    implementation(projects.domain.tokens)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.swap.models)
+    api(projects.domain.account)
+    api(projects.domain.account.status)
+    api(projects.domain.dynamicAddresses)
+    api(projects.domain.manageTokens)
+    api(projects.domain.manageTokens.models)
+    api(projects.domain.models)
+    api(projects.domain.notifications)
+    api(projects.domain.wallets)
+    implementation(projects.domain.core)
     implementation(projects.domain.markets.models)
-    implementation(projects.domain.notifications)
-    implementation(projects.domain.dynamicAddresses)
+    implementation(projects.domain.swap.models)
+    runtimeOnly(projects.domain.card)
+    runtimeOnly(projects.domain.tokens)
 
     // region Project - Libs
     implementation(projects.libs.blockchainSdk)
@@ -54,21 +55,24 @@ dependencies {
     // endregion
 
     /* AndroidX */
-    implementation(deps.androidx.activity.compose)
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.appCompat)
     implementation(deps.lifecycle.compose)
 
     /* Compose */
+    api(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.foundation)
     implementation(deps.compose.material3)
-    implementation(deps.compose.shimmer)
 
     /* DI */
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
 
     /* Other */
-    implementation(deps.kotlin.immutable.collections)
+    api(deps.kotlin.coroutines)
+    implementation(deps.arrow.core)
     implementation(deps.decompose.ext.compose)
+    implementation(deps.kotlin.immutable.collections)
+    implementation(deps.kotlin.serialization.core)
 }
\ No newline at end of file
diff --git a/features/markets/api/build.gradle.kts b/features/markets/api/build.gradle.kts
index 7257245162..06597618bf 100644
--- a/features/markets/api/build.gradle.kts
+++ b/features/markets/api/build.gradle.kts
@@ -11,15 +11,12 @@ android {
 }
 
 dependencies {
-    implementation(deps.compose.foundation)
+    api(deps.kotlin.serialization.core)
 
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 
     /* Project - Domain */
-    implementation(projects.domain.core)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.markets.models)
+    api(projects.domain.models)
 }
\ No newline at end of file
diff --git a/features/markets/impl/build.gradle.kts b/features/markets/impl/build.gradle.kts
index c11bf4b2eb..52a825195b 100644
--- a/features/markets/impl/build.gradle.kts
+++ b/features/markets/impl/build.gradle.kts
@@ -14,82 +14,41 @@ android {
 dependencies {
     /* Project - API */
     api(projects.features.markets.api)
-    api(projects.features.onramp.api)
-    api(projects.features.send.api)
-    api(projects.features.tokenRecieve.api)
-    api(projects.features.wallet.api)
-    api(projects.features.account.api)
-
-    /* Data */
-    implementation(projects.data.common)
 
     /* Domain */
-    implementation(projects.domain.account)
-    implementation(projects.domain.account.status)
-    implementation(projects.domain.appCurrency)
+    api(projects.domain.appCurrency)
+    api(projects.domain.markets)
     implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.balanceHiding)
-    implementation(projects.domain.balanceHiding.models)
-    implementation(projects.domain.card)
-    implementation(projects.domain.demo)
-    implementation(projects.domain.feedback)
-    implementation(projects.domain.feedback.models)
-    implementation(projects.domain.manageTokens)
-    implementation(projects.domain.markets)
-    implementation(projects.domain.offramp)
-    implementation(projects.domain.onramp.models)
-    implementation(projects.domain.staking.models)
-    implementation(projects.domain.staking)
-    implementation(projects.domain.tokens)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.wallets)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.settings)
-    implementation(projects.domain.notifications.models)
-    implementation(projects.domain.transaction)
-    implementation(projects.domain.yieldSupply.models)
-    implementation(projects.domain.yieldSupply)
-
+    implementation(projects.domain.markets.models)
+    implementation(projects.domain.models)
 
     /* Compose */
-    implementation(deps.compose.coil)
     implementation(deps.compose.foundation)
     implementation(deps.compose.material3)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
     implementation(deps.compose.ui.utils)
     implementation(deps.lifecycle.compose)
-    implementation(deps.androidx.activity.compose)
-    implementation(deps.markdown.composeview)
 
     /* DI */
     implementation(deps.hilt.android)
     kapt(deps.hilt.kapt)
 
     /* Other */
+    implementation(deps.androidx.appCompat)
+    implementation(deps.arrow.core)
+    implementation(deps.kotlin.coroutines)
     implementation(deps.kotlin.immutable.collections)
     implementation(deps.decompose.ext.compose)
 
     /* Core */
-    implementation(projects.core.decompose)
+    api(projects.core.decompose)
+    api(projects.core.utils)
     implementation(projects.core.ui)
-    implementation(projects.core.configToggles)
-    implementation(projects.core.analytics)
-    implementation(projects.core.analytics.models)
-    implementation(projects.core.navigation)
-    implementation(projects.core.utils)
 
     /* Common */
     implementation(projects.common.ui)
     implementation(projects.common.uiMarkets)
     implementation(projects.common.uiCharts)
     implementation(projects.common.routing)
-
-    /* Libs */
-    implementation(projects.libs.crypto)
-    implementation(projects.libs.blockchainSdk)
-
-    /** Tangem libraries */
-    implementation(tangemDeps.card.core)
-    implementation(tangemDeps.blockchain)
 }
\ No newline at end of file
diff --git a/features/nft/api/build.gradle.kts b/features/nft/api/build.gradle.kts
index 23f846a5b2..6550e7de15 100644
--- a/features/nft/api/build.gradle.kts
+++ b/features/nft/api/build.gradle.kts
@@ -11,15 +11,10 @@ android {
 dependencies {
 
     /* Project - Domain */
-    implementation(projects.domain.models)
-    implementation(projects.domain.nft.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.account)
+    api(projects.domain.models)
+    api(projects.domain.nft.models)
 
     /* Project - Core */
-    implementation(projects.core.decompose)
-    implementation(projects.core.ui)
-
-    /* Compose */
-    implementation(deps.compose.runtime)
+    api(projects.core.decompose)
+    api(projects.core.ui)
 }
\ No newline at end of file
diff --git a/features/nft/impl/build.gradle.kts b/features/nft/impl/build.gradle.kts
index 797564dd0e..03abf03910 100644
--- a/features/nft/impl/build.gradle.kts
+++ b/features/nft/impl/build.gradle.kts
@@ -13,65 +13,55 @@ android {
 
 dependencies {
     /** Api */
-    implementation(projects.features.commonFeatures.api)
-    implementation(projects.features.nft.api)
-    implementation(projects.features.tokenRecieve.api)
+    api(projects.features.commonFeatures.api)
+    api(projects.features.nft.api)
+    api(projects.features.tokenRecieve.api)
 
     /** Core modules */
-    implementation(projects.core.configToggles)
-    implementation(projects.core.analytics)
+    api(projects.core.analytics)
+    api(projects.core.decompose)
+    api(projects.core.navigation)
+    api(projects.core.ui)
+    api(projects.core.utils)
     implementation(projects.core.analytics.models)
-    implementation(projects.core.utils)
-    implementation(projects.core.ui)
-    implementation(projects.core.res)
-    implementation(projects.core.decompose)
-    implementation(projects.core.navigation)
-    implementation(projects.core.datasource)
 
     /** Domain modules */
-    implementation(projects.domain.account.status)
-    implementation(projects.domain.wallets)
+    api(projects.domain.account)
+    api(projects.domain.account.status)
+    api(projects.domain.appCurrency)
+    api(projects.domain.nft)
+    api(projects.domain.transaction)
+    api(projects.domain.wallets)
     implementation(projects.domain.appCurrency.models)
-    implementation(projects.domain.appCurrency)
+    implementation(projects.domain.core)
     implementation(projects.domain.models)
-    implementation(projects.domain.nft)
     implementation(projects.domain.nft.models)
-    implementation(projects.domain.tokens.models)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.transaction)
-    implementation(projects.domain.tokens)
+    runtimeOnly(projects.domain.tokens)
 
     /** Common */
     implementation(projects.common.ui)
     implementation(projects.common.routing)
 
-    /** Tangem libraries */
-    implementation(projects.libs.tangemSdkApi)
-    implementation(projects.libs.crypto)
-    implementation(tangemDeps.card.core)
-    implementation(tangemDeps.card.android) {
-        exclude(module = "joda-time")
-    }
-
     /** AndroidX libraries */
-    implementation(deps.androidx.core.ktx)
+    implementation(deps.androidx.annotation)
+    implementation(deps.androidx.appCompat)
+    implementation(deps.lifecycle.compose)
     implementation(deps.lifecycle.runtime.ktx)
 
     /** Compose libraries */
+    api(deps.compose.animation)
+    api(deps.compose.coil)
+    api(deps.compose.foundation)
+    api(deps.decompose.ext.compose)
     implementation(deps.compose.material3)
-    implementation(deps.compose.animation)
-    implementation(deps.compose.foundation)
     implementation(deps.compose.ui)
     implementation(deps.compose.ui.tooling)
-    implementation(deps.compose.coil)
-    implementation(deps.lottie.compose)
-    implementation(deps.decompose.ext.compose)
     implementation(deps.androidx.activity.compose)
-    implementation(deps.androidx.datastore)
 
     /** Other libraries */
+    api(deps.kotlin.coroutines)
+    api(deps.kotlin.immutable.collections)
     implementation(deps.arrow.core)
-    implementation(deps.kotlin.immutable.collections)
     implementation(deps.kotlin.serialization)
     implementation(deps.firebase.crashlytics)