diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt
index ad210d7625..bd9cc89301 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt
@@ -4,7 +4,7 @@ import arrow.core.getOrElse
 import arrow.core.raise.result
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchainsdk.utils.toNetworkId
-import com.tangem.data.tokens.utils.CryptoCurrencyFactory
+import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.domain.card.DerivePublicKeysUseCase
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.features.addCustomToken.CustomCurrency
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt
index ef320383b2..52af2f7d66 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt
@@ -5,7 +5,7 @@ import com.tangem.common.extensions.guard
 import com.tangem.common.routing.AppRouter
 import com.tangem.core.analytics.Analytics
 
-import com.tangem.data.tokens.utils.CryptoCurrencyFactory
+import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.domain.common.extensions.makePrimaryWalletManager
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.domain.common.util.derivationStyleProvider
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
index 19d77c509e..047a5caaa8 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
@@ -7,7 +7,7 @@ import com.tangem.common.routing.AppRoute
 import com.tangem.common.routing.utils.popTo
 import com.tangem.core.analytics.Analytics
 
-import com.tangem.data.tokens.utils.CryptoCurrencyFactory
+import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.domain.common.extensions.makePrimaryWalletManager
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.domain.common.util.derivationStyleProvider
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
index 41495924b3..5b6249b760 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
@@ -5,7 +5,7 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
 import com.tangem.common.routing.AppRoute
 import com.tangem.common.routing.utils.popTo
-import com.tangem.data.tokens.utils.CryptoCurrencyFactory
+import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.domain.card.DerivePublicKeysUseCase
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.tokens.AddCryptoCurrenciesUseCase
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/CryptoCurrencyConverter.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/CryptoCurrencyConverter.kt
index 041b9561ee..d7a9569c4c 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/CryptoCurrencyConverter.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/CryptoCurrencyConverter.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.network.exchangeServices
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
-import com.tangem.data.tokens.utils.CryptoCurrencyFactory
+import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.tap.common.extensions.inject
diff --git a/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt b/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt
index 6cb075061a..5ecd65378b 100644
--- a/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt
+++ b/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.domain.card
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
-import com.tangem.data.tokens.utils.CryptoCurrencyFactory
+import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.tokens.model.CryptoCurrency
diff --git a/data/common/build.gradle.kts b/data/common/build.gradle.kts
index f1a67e77a3..5a5b6c1d85 100644
--- a/data/common/build.gradle.kts
+++ b/data/common/build.gradle.kts
@@ -10,13 +10,26 @@ android {
 }
 
 dependencies {
+    /* Core */
     implementation(projects.core.datasource)
 
+    /* Domain */
+    implementation(projects.domain.models)
+    implementation(projects.domain.legacy)
+    implementation(projects.domain.tokens.models)
+
+    /* Libs - SDK */
+    implementation(deps.tangem.blockchain)
+    implementation(deps.tangem.card.core)
+    implementation(projects.libs.blockchainSdk)
+
+    /* DI */
+    implementation(deps.hilt.android)
+    kapt(deps.hilt.kapt)
+
+    /* Libs - Other */
     implementation(deps.kotlin.coroutines)
     implementation(deps.jodatime)
     implementation(deps.timber)
     implementation(deps.arrow.core)
-
-    implementation(deps.hilt.android)
-    kapt(deps.hilt.kapt)
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CryptoCurrencyFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt
similarity index 99%
rename from data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CryptoCurrencyFactory.kt
rename to data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt
index b1e215ed19..9af9e67943 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CryptoCurrencyFactory.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt
@@ -1,4 +1,4 @@
-package com.tangem.data.tokens.utils
+package com.tangem.data.common.currency
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchainsdk.utils.fromNetworkId
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt
similarity index 85%
rename from data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt
rename to data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt
index c7986bd414..8f2e5b60ac 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt
@@ -1,4 +1,4 @@
-package com.tangem.data.tokens.utils
+package com.tangem.data.common.currency
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.FeePaidCurrency
@@ -7,14 +7,14 @@ import com.tangem.domain.common.DerivationStyleProvider
 import com.tangem.domain.tokens.model.Network
 import timber.log.Timber
 
-internal fun getBlockchain(networkId: Network.ID): Blockchain {
+fun getBlockchain(networkId: Network.ID): Blockchain {
     return Blockchain.fromId(networkId.value)
 }
 
-internal fun getNetwork(
+fun getNetwork(
     blockchain: Blockchain,
     extraDerivationPath: String?,
-    derivationStyleProvider: DerivationStyleProvider,
+    derivationStyleProvider: DerivationStyleProvider?,
 ): Network? {
     if (blockchain == Blockchain.Unknown) {
         Timber.e("Unable to convert Unknown blockchain to the domain network model")
@@ -36,8 +36,12 @@ internal fun getNetwork(
 private fun getNetworkDerivationPath(
     blockchain: Blockchain,
     extraDerivationPath: String?,
-    cardDerivationStyleProvider: DerivationStyleProvider,
+    cardDerivationStyleProvider: DerivationStyleProvider?,
 ): Network.DerivationPath {
+    if (cardDerivationStyleProvider == null) {
+        return Network.DerivationPath.None
+    }
+
     val defaultDerivationPath = getDefaultDerivationPath(blockchain, cardDerivationStyleProvider)
 
     return if (extraDerivationPath.isNullOrBlank()) {
@@ -55,7 +59,7 @@ private fun getNetworkDerivationPath(
     }
 }
 
-internal fun getNetworkStandardType(blockchain: Blockchain): Network.StandardType {
+fun getNetworkStandardType(blockchain: Blockchain): Network.StandardType {
     return when (blockchain) {
         Blockchain.Ethereum, Blockchain.EthereumTestnet -> Network.StandardType.ERC20
         Blockchain.BSC, Blockchain.BSCTestnet -> Network.StandardType.BEP20
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCryptoCurrenciesFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt
similarity index 99%
rename from data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCryptoCurrenciesFactory.kt
rename to data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt
index 0ad1df2428..9bbdfb7fed 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCryptoCurrenciesFactory.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt
@@ -1,4 +1,4 @@
-package com.tangem.data.tokens.utils
+package com.tangem.data.common.currency
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/TokensOperations.kt
similarity index 78%
rename from data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
rename to data/common/src/main/kotlin/com/tangem/data/common/currency/TokensOperations.kt
index a944703601..72018fc4ed 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/TokensOperations.kt
@@ -1,4 +1,4 @@
-package com.tangem.data.tokens.utils
+package com.tangem.data.common.currency
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.IconsUtil
@@ -18,30 +18,35 @@ private const val DEFAULT_TOKENS_ICONS_HOST = "https://s3.eu-central-1.amazonaws
 private const val TOKEN_ICON_SIZE = "large"
 private const val TOKEN_ICON_EXT = "png"
 
-internal fun isCustomToken(tokenId: ID, network: Network): Boolean {
+fun isCustomToken(tokenId: ID, network: Network): Boolean {
     return network.derivationPath is Network.DerivationPath.Custom || tokenId.rawCurrencyId == null
 }
 
-internal fun isCustomCoin(network: Network): Boolean {
+fun isCustomCoin(network: Network): Boolean {
     return network.derivationPath is Network.DerivationPath.Custom
 }
 
-internal fun getCoinId(network: Network, coinId: String): ID {
+fun getCoinId(network: Network, coinId: String): ID {
     return ID(COIN_ID_PREFIX, getCurrencyIdBody(network), CurrencyIdSuffix(rawId = coinId))
 }
 
-internal fun getTokenId(network: Network, sdkToken: SdkToken): ID {
+fun getTokenId(network: Network, sdkToken: SdkToken): ID {
     val sdkTokenId = sdkToken.id
-    val suffix = if (sdkTokenId == null) {
-        CustomCurrencyIdSuffix(contractAddress = sdkToken.contractAddress)
+
+    return getTokenId(network, sdkTokenId, sdkToken.contractAddress)
+}
+
+fun getTokenId(network: Network, rawTokenId: String?, contractAddress: String): ID {
+    val suffix = if (rawTokenId == null) {
+        CustomCurrencyIdSuffix(contractAddress)
     } else {
-        CurrencyIdSuffix(rawId = sdkTokenId, contractAddress = sdkToken.contractAddress)
+        CurrencyIdSuffix(rawTokenId, contractAddress)
     }
 
     return ID(TOKEN_ID_PREFIX, getCurrencyIdBody(network), suffix)
 }
 
-internal fun getTokenIconUrl(blockchain: Blockchain, token: SdkToken): String? {
+fun getTokenIconUrl(blockchain: Blockchain, token: SdkToken): String? {
     val tokenId = token.id
 
     return if (tokenId == null) {
@@ -51,7 +56,7 @@ internal fun getTokenIconUrl(blockchain: Blockchain, token: SdkToken): String? {
     }
 }
 
-internal fun getCoinIconUrl(blockchain: Blockchain): String? {
+fun getCoinIconUrl(blockchain: Blockchain): String? {
     val coinId = when (blockchain) {
         Blockchain.Unknown -> null
         else -> blockchain.toCoinId()
@@ -60,7 +65,7 @@ internal fun getCoinIconUrl(blockchain: Blockchain): String? {
     return coinId?.let(::getTokenIconUrlFromDefaultHost)
 }
 
-internal fun List<UserTokensResponse.Token>.hasCoinForToken(token: CryptoCurrency.Token): Boolean {
+fun List<UserTokensResponse.Token>.hasCoinForToken(token: CryptoCurrency.Token): Boolean {
     return any {
         val blockchain = getBlockchain(networkId = token.network.id)
         val tokenDerivation = token.network.derivationPath.value
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/UserTokensResponseFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/UserTokensResponseFactory.kt
similarity index 97%
rename from data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/UserTokensResponseFactory.kt
rename to data/common/src/main/kotlin/com/tangem/data/common/currency/UserTokensResponseFactory.kt
index 7e8372da6c..4ba8bbd2a2 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/UserTokensResponseFactory.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/UserTokensResponseFactory.kt
@@ -1,4 +1,4 @@
-package com.tangem.data.tokens.utils
+package com.tangem.data.common.currency
 
 import com.tangem.blockchainsdk.utils.toNetworkId
 import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/paging/CoinsResponseConverter.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/paging/CoinsResponseConverter.kt
index a1a8018cab..611ccafe2b 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/paging/CoinsResponseConverter.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/paging/CoinsResponseConverter.kt
@@ -2,7 +2,7 @@ package com.tangem.data.tokens.paging
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.data.tokens.utils.getNetworkStandardType
+import com.tangem.data.common.currency.getNetworkStandardType
 import com.tangem.datasource.api.tangemTech.models.CoinsResponse
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.Token
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
index 238ab2676a..ec3720fe1b 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
@@ -6,7 +6,10 @@ import com.tangem.blockchainsdk.utils.toCoinId
 import com.tangem.blockchainsdk.utils.toNetworkId
 import com.tangem.data.common.api.safeApiCall
 import com.tangem.data.common.cache.CacheRegistry
-import com.tangem.data.tokens.utils.*
+import com.tangem.data.common.currency.*
+import com.tangem.data.tokens.utils.CardCryptoCurrenciesFactory
+import com.tangem.data.tokens.utils.CustomTokensMerger
+import com.tangem.data.tokens.utils.UserTokensBackwardCompatibility
 import com.tangem.datasource.api.common.response.ApiResponseError
 import com.tangem.datasource.api.common.response.getOrThrow
 import com.tangem.datasource.api.express.TangemExpressApi
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksCompatibilityRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksCompatibilityRepository.kt
index 02fdef2739..c0ea21218c 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksCompatibilityRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksCompatibilityRepository.kt
@@ -3,7 +3,7 @@ package com.tangem.data.tokens.repository
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.common.card.EllipticCurve
-import com.tangem.data.tokens.utils.getNetwork
+import com.tangem.data.common.currency.getNetwork
 import com.tangem.datasource.local.userwallet.UserWalletsStore
 import com.tangem.domain.common.configs.CardConfig
 import com.tangem.domain.common.extensions.*
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt
index 58aa0a6dd6..de6ad111ab 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultNetworksRepository.kt
@@ -5,9 +5,9 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.address.AddressType
 import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.data.common.cache.CacheRegistry
+import com.tangem.data.common.currency.ResponseCryptoCurrenciesFactory
 import com.tangem.data.tokens.utils.CardCryptoCurrenciesFactory
 import com.tangem.data.tokens.utils.NetworkStatusFactory
-import com.tangem.data.tokens.utils.ResponseCryptoCurrenciesFactory
 import com.tangem.datasource.local.network.NetworksStatusesStore
 import com.tangem.datasource.local.token.UserTokensStore
 import com.tangem.datasource.local.userwallet.UserWalletsStore
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt
index a2993452d9..4d6056cbb0 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CardCryptoCurrenciesFactory.kt
@@ -1,6 +1,7 @@
 package com.tangem.data.tokens.utils
 
 import com.tangem.blockchain.common.Blockchain
+import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.domain.common.TapWorkarounds.isTestCard
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.common.util.derivationStyleProvider
diff --git a/features/referral/data/build.gradle.kts b/features/referral/data/build.gradle.kts
index 5ca72579ad..954bac9c2e 100644
--- a/features/referral/data/build.gradle.kts
+++ b/features/referral/data/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
     implementation(projects.core.utils)
 
     /** Data modules */
-    implementation(projects.data.tokens)
+    implementation(projects.data.common)
 
     /** Domain modules */
     implementation(projects.domain.legacy)
diff --git a/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt b/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt
index 2d44c137ff..9a901c1b69 100644
--- a/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt
+++ b/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt
@@ -3,7 +3,7 @@ package com.tangem.feature.referral.data
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
 import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.data.tokens.utils.CryptoCurrencyFactory
+import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.datasource.api.common.AuthProvider
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.api.tangemTech.models.StartReferralBody
diff --git a/features/swap/data/build.gradle.kts b/features/swap/data/build.gradle.kts
index 5998ddafd0..f9d6ff0013 100644
--- a/features/swap/data/build.gradle.kts
+++ b/features/swap/data/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
     implementation(projects.domain.wallets.models)
 
     /** Data */
-    implementation(projects.data.tokens)
+    implementation(projects.data.common)
 
     /** Tangem SDKs */
     implementation(deps.tangem.blockchain)
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
index 48724f9b77..31b1659a73 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
@@ -8,7 +8,7 @@ import arrow.core.right
 import com.squareup.moshi.Moshi
 import com.tangem.blockchain.common.*
 import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.data.tokens.utils.CryptoCurrencyFactory
+import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.datasource.api.common.response.ApiResponse
 import com.tangem.datasource.api.common.response.ApiResponseError
 import com.tangem.datasource.api.common.response.getOrThrow
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/SavedSwapTransactionListConverter.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/SavedSwapTransactionListConverter.kt
index 8e41921960..33112a9591 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/SavedSwapTransactionListConverter.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/SavedSwapTransactionListConverter.kt
@@ -1,7 +1,7 @@
 package com.tangem.feature.swap.converters
 
-import com.tangem.data.tokens.utils.ResponseCryptoCurrenciesFactory
-import com.tangem.data.tokens.utils.UserTokensResponseFactory
+import com.tangem.data.common.currency.ResponseCryptoCurrenciesFactory
+import com.tangem.data.common.currency.UserTokensResponseFactory
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.wallets.models.UserWalletId