diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1dde4f60b5..b832f99832 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,12 +9,13 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/card-android" />
-            <option value="$PROJECT_DIR$/card-common" />
             <option value="$PROJECT_DIR$/server-android" />
+            <option value="$PROJECT_DIR$/tangem-card" />
+            <option value="$PROJECT_DIR$/tangem-sdk" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 1ee07e57e4..0b381805ed 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,8 +88,8 @@ configurations {
 }
 
 dependencies {
-    implementation project(':card-common')
-    implementation project(':card-android')
+    implementation project(':tangem-card')
+    implementation project(':tangem-sdk')
     implementation project(':server-android')
     //    implementation 'com.github.TangemCash:card-common:0.1.2'
     //    implementation 'com.github.TangemCash:card-android:0.1.3'
diff --git a/app/src/main/java/com/tangem/App.kt b/app/src/main/java/com/tangem/App.kt
index 0a295e366a..5ebc7f51d1 100644
--- a/app/src/main/java/com/tangem/App.kt
+++ b/app/src/main/java/com/tangem/App.kt
@@ -5,9 +5,6 @@ import androidx.appcompat.app.AppCompatDelegate
 import com.crashlytics.android.Crashlytics
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.tangem.card_android.android.data.Firmwares
-import com.tangem.card_android.android.data.PINStorage
-import com.tangem.card_common.data.Issuer
 import com.tangem.data.dp.PrefsManager
 import com.tangem.data.local.PendingTransactionsStorage
 import com.tangem.di.DaggerNetworkComponent
@@ -15,6 +12,9 @@ import com.tangem.di.DaggerToastHelperComponent
 import com.tangem.di.NetworkComponent
 import com.tangem.di.ToastHelperComponent
 import com.tangem.server_android.data.LocalStorage
+import com.tangem.tangem_card.data.Issuer
+import com.tangem.tangem_sdk.android.data.Firmwares
+import com.tangem.tangem_sdk.android.data.PINStorage
 import com.tangem.wallet.BuildConfig
 import io.fabric.sdk.android.Fabric
 import java.io.InputStreamReader
@@ -61,8 +61,8 @@ class App : Application() {
         pendingTransactionsStorage = PendingTransactionsStorage(applicationContext)
 
         if (BuildConfig.DEBUG) {
-            com.tangem.card_common.util.Log.setLogger(
-                    object : com.tangem.card_common.util.LoggerInterface {
+            com.tangem.tangem_card.util.Log.setLogger(
+                    object : com.tangem.tangem_card.util.LoggerInterface {
                         override fun i(logTag: String, message: String) {
                             android.util.Log.i(logTag, message)
                         }
diff --git a/app/src/main/java/com/tangem/data/Blockchain.java b/app/src/main/java/com/tangem/data/Blockchain.java
index 98b451c54e..2f50bdd5de 100644
--- a/app/src/main/java/com/tangem/data/Blockchain.java
+++ b/app/src/main/java/com/tangem/data/Blockchain.java
@@ -1,6 +1,6 @@
 package com.tangem.data;
 
-import com.tangem.card_android.R;
+import com.tangem.tangem_sdk.R;
 
 /**
  * Created by dvol on 06.08.2017.
diff --git a/app/src/main/java/com/tangem/data/Logger.java b/app/src/main/java/com/tangem/data/Logger.java
index cf6b0b24c3..16dcf0dfea 100644
--- a/app/src/main/java/com/tangem/data/Logger.java
+++ b/app/src/main/java/com/tangem/data/Logger.java
@@ -3,7 +3,7 @@ package com.tangem.data;
 import android.content.Context;
 import android.util.Log;
 
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.util.Util;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java b/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java
index e99dc30a23..90b3456b45 100644
--- a/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java
+++ b/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java
@@ -9,7 +9,7 @@ import android.security.keystore.KeyPermanentlyInvalidatedException;
 import android.security.keystore.KeyProperties;
 
 import com.tangem.Constant;
-import com.tangem.card_android.android.data.PINStorage;
+import com.tangem.tangem_sdk.android.data.PINStorage;
 import com.tangem.ui.fragment.pin.PinRequestFragment;
 import com.tangem.util.LOG;
 
diff --git a/app/src/main/java/com/tangem/data/local/PendingTransactionsStorage.kt b/app/src/main/java/com/tangem/data/local/PendingTransactionsStorage.kt
index f15b0d1841..dca7483d44 100644
--- a/app/src/main/java/com/tangem/data/local/PendingTransactionsStorage.kt
+++ b/app/src/main/java/com/tangem/data/local/PendingTransactionsStorage.kt
@@ -3,7 +3,7 @@ package com.tangem.data.local
 import android.content.Context
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.tangem.card_common.data.TangemCard
+import com.tangem.tangem_card.data.TangemCard
 import java.io.File
 import java.util.*
 import kotlin.collections.HashMap
diff --git a/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java b/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java
index b32745757e..48f1480ebd 100644
--- a/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java
+++ b/app/src/main/java/com/tangem/data/network/CryptonitOtherApi.java
@@ -11,7 +11,7 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.internal.LinkedTreeMap;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.util.Util;
 import com.tangem.wallet.R;
 
 import java.io.IOException;
@@ -25,7 +25,6 @@ import io.reactivex.schedulers.Schedulers;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
-//import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 import retrofit2.http.Headers;
@@ -34,6 +33,8 @@ import retrofit2.http.POST;
 import retrofit2.http.Part;
 import retrofit2.http.Path;
 
+//import okhttp3.logging.HttpLoggingInterceptor;
+
 /**
  * HTTP
  * Used in CryptonitOtherApi service
diff --git a/app/src/main/java/com/tangem/data/network/Kraken.java b/app/src/main/java/com/tangem/data/network/Kraken.java
index b3dc04ec8a..4f7eaae457 100644
--- a/app/src/main/java/com/tangem/data/network/Kraken.java
+++ b/app/src/main/java/com/tangem/data/network/Kraken.java
@@ -6,7 +6,7 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
 import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.util.Util;
 import com.tangem.wallet.R;
 
 import org.spongycastle.util.encoders.Base64;
@@ -28,7 +28,6 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-//import okhttp3.logging.HttpLoggingInterceptor;
 import okio.Buffer;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -36,6 +35,8 @@ import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.POST;
 
+//import okhttp3.logging.HttpLoggingInterceptor;
+
 /**
  * HTTP
  * Used in Kraken service
diff --git a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
index bd14533708..3ec382c142 100644
--- a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
@@ -17,9 +17,9 @@ import androidx.lifecycle.ViewModelProviders
 import com.scottyab.rootbeer.RootBeer
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.card_android.android.nfc.NfcLifecycleObserver
-import com.tangem.card_android.android.reader.NfcManager
 import com.tangem.di.ToastHelper
+import com.tangem.tangem_sdk.android.nfc.NfcLifecycleObserver
+import com.tangem.tangem_sdk.android.reader.NfcManager
 import com.tangem.ui.dialog.RootFoundDialog
 import com.tangem.wallet.BuildConfig
 import com.tangem.wallet.R
diff --git a/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java
index b9633c17ca..e517a65e5d 100644
--- a/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java
+++ b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java
@@ -15,7 +15,7 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
 
-import com.tangem.card_common.util.Log;
+import com.tangem.tangem_card.util.Log;
 import com.tangem.wallet.R;
 
 import java.util.Timer;
diff --git a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
index d319f2df8c..03478b6a7c 100644
--- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
@@ -14,17 +14,17 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation
-import com.tangem.card_android.android.reader.NfcReader
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_android.data.loadFromBundle
-import com.tangem.card_android.data.saveToBundle
-import com.tangem.card_common.data.TangemCard
-import com.tangem.card_common.reader.CardProtocol
-import com.tangem.card_common.tasks.CustomReadCardTask
-import com.tangem.card_common.tasks.ReadCardInfoTask
 import com.tangem.data.Logger
+import com.tangem.tangem_card.data.TangemCard
+import com.tangem.tangem_card.reader.CardProtocol
+import com.tangem.tangem_card.tasks.CustomReadCardTask
+import com.tangem.tangem_card.tasks.ReadCardInfoTask
+import com.tangem.tangem_sdk.android.nfc.NfcDeviceAntennaLocation
+import com.tangem.tangem_sdk.android.reader.NfcReader
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangem_sdk.data.loadFromBundle
+import com.tangem.tangem_sdk.data.saveToBundle
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
 import com.tangem.ui.dialog.WaitSecurityDelayDialog
diff --git a/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt b/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt
index d56828abe5..9452150813 100644
--- a/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt
@@ -14,14 +14,14 @@ import android.widget.Toast
 import androidx.core.os.bundleOf
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation
-import com.tangem.card_android.android.reader.NfcReader
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_android.data.asBundle
-import com.tangem.card_common.reader.CardProtocol
-import com.tangem.card_common.tasks.PurgeTask
-import com.tangem.card_common.util.Util
+import com.tangem.tangem_card.reader.CardProtocol
+import com.tangem.tangem_card.tasks.PurgeTask
+import com.tangem.tangem_card.util.Util
+import com.tangem.tangem_sdk.android.nfc.NfcDeviceAntennaLocation
+import com.tangem.tangem_sdk.android.reader.NfcReader
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangem_sdk.data.asBundle
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
 import com.tangem.ui.dialog.WaitSecurityDelayDialog
diff --git a/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt b/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt
index c89140c2ff..a50599dc58 100644
--- a/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt
@@ -8,7 +8,7 @@ import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.card_common.util.Util
+import com.tangem.tangem_card.util.Util
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.event.TransactionFinishWithError
 import com.tangem.ui.event.TransactionFinishWithSuccess
diff --git a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt
index b2f1c36e25..9f32c21aae 100644
--- a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt
@@ -15,13 +15,13 @@ import androidx.activity.OnBackPressedCallback
 import androidx.core.content.ContextCompat
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.card_android.android.data.PINStorage
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_android.data.loadFromBundle
-import com.tangem.card_common.data.TangemCard
-import com.tangem.card_common.reader.CardProtocol
 import com.tangem.data.Blockchain
+import com.tangem.tangem_card.data.TangemCard
+import com.tangem.tangem_card.reader.CardProtocol
+import com.tangem.tangem_sdk.android.data.PINStorage
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangem_sdk.data.loadFromBundle
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.dialog.PINSwapWarningDialog
 import com.tangem.ui.event.DeletingWalletFinish
diff --git a/app/src/main/java/com/tangem/ui/fragment/pin/PinRequestFragment.kt b/app/src/main/java/com/tangem/ui/fragment/pin/PinRequestFragment.kt
index f113e47551..023e9c5e8a 100644
--- a/app/src/main/java/com/tangem/ui/fragment/pin/PinRequestFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/pin/PinRequestFragment.kt
@@ -18,13 +18,13 @@ import android.view.View
 import android.widget.Button
 import androidx.core.app.ActivityCompat
 import com.tangem.Constant
-import com.tangem.card_android.android.data.PINStorage
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_android.data.loadFromBundle
-import com.tangem.card_common.data.TangemCard
 import com.tangem.data.fingerprint.FingerprintHelper
 import com.tangem.data.fingerprint.StartFingerprintReaderTask
+import com.tangem.tangem_card.data.TangemCard
+import com.tangem.tangem_sdk.android.data.PINStorage
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangem_sdk.data.loadFromBundle
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.fragment.BaseFragment
 import com.tangem.util.LOG
diff --git a/app/src/main/java/com/tangem/ui/fragment/pin/PinSaveFragment.kt b/app/src/main/java/com/tangem/ui/fragment/pin/PinSaveFragment.kt
index a64550385a..72d8503cf9 100644
--- a/app/src/main/java/com/tangem/ui/fragment/pin/PinSaveFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/pin/PinSaveFragment.kt
@@ -19,9 +19,9 @@ import android.widget.Button
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import com.tangem.Constant
-import com.tangem.card_android.android.data.PINStorage
 import com.tangem.data.fingerprint.ConfirmWithFingerprintTask
 import com.tangem.data.fingerprint.FingerprintHelper
+import com.tangem.tangem_sdk.android.data.PINStorage
 import com.tangem.ui.fragment.BaseFragment
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.fragment_pin_save.*
diff --git a/app/src/main/java/com/tangem/ui/fragment/pin/PinSwapFragment.kt b/app/src/main/java/com/tangem/ui/fragment/pin/PinSwapFragment.kt
index 0067ea13c9..b694970a0d 100644
--- a/app/src/main/java/com/tangem/ui/fragment/pin/PinSwapFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/pin/PinSwapFragment.kt
@@ -12,15 +12,15 @@ import android.widget.ProgressBar
 import android.widget.Toast
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.card_android.android.reader.NfcReader
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_android.data.asBundle
-import com.tangem.card_android.data.loadFromBundle
-import com.tangem.card_common.data.TangemCard
-import com.tangem.card_common.reader.CardProtocol
-import com.tangem.card_common.tasks.SwapPINTask
-import com.tangem.card_common.util.Util
+import com.tangem.tangem_card.data.TangemCard
+import com.tangem.tangem_card.reader.CardProtocol
+import com.tangem.tangem_card.tasks.SwapPINTask
+import com.tangem.tangem_card.util.Util
+import com.tangem.tangem_sdk.android.reader.NfcReader
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangem_sdk.data.asBundle
+import com.tangem.tangem_sdk.data.loadFromBundle
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
 import com.tangem.ui.dialog.WaitSecurityDelayDialog
diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/CreateNewWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/CreateNewWalletFragment.kt
index 063140edda..1923b8c8da 100644
--- a/app/src/main/java/com/tangem/ui/fragment/wallet/CreateNewWalletFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/wallet/CreateNewWalletFragment.kt
@@ -11,14 +11,14 @@ import android.view.View
 import android.widget.Toast
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation
-import com.tangem.card_android.android.reader.NfcReader
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_android.data.asBundle
-import com.tangem.card_common.reader.CardProtocol
-import com.tangem.card_common.tasks.CreateNewWalletTask
-import com.tangem.card_common.util.Util
+import com.tangem.tangem_card.reader.CardProtocol
+import com.tangem.tangem_card.tasks.CreateNewWalletTask
+import com.tangem.tangem_card.util.Util
+import com.tangem.tangem_sdk.android.nfc.NfcDeviceAntennaLocation
+import com.tangem.tangem_sdk.android.reader.NfcReader
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangem_sdk.data.asBundle
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
 import com.tangem.ui.dialog.WaitSecurityDelayDialog
diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/EmptyWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/EmptyWalletFragment.kt
index eacbc94863..90afb78d2a 100644
--- a/app/src/main/java/com/tangem/ui/fragment/wallet/EmptyWalletFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/wallet/EmptyWalletFragment.kt
@@ -15,15 +15,15 @@ import android.view.View
 import android.widget.Toast
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.card_android.android.reader.NfcReader
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_android.data.asBundle
-import com.tangem.card_android.data.loadFromBundle
-import com.tangem.card_common.data.TangemCard
-import com.tangem.card_common.reader.CardProtocol
-import com.tangem.card_common.tasks.VerifyCardTask
-import com.tangem.card_common.util.Util
+import com.tangem.tangem_card.data.TangemCard
+import com.tangem.tangem_card.reader.CardProtocol
+import com.tangem.tangem_card.tasks.VerifyCardTask
+import com.tangem.tangem_card.util.Util
+import com.tangem.tangem_sdk.android.reader.NfcReader
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangem_sdk.data.asBundle
+import com.tangem.tangem_sdk.data.loadFromBundle
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
 import com.tangem.ui.dialog.WaitSecurityDelayDialog
diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
index 1031bb6bec..6e7e6c9f27 100644
--- a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
@@ -22,19 +22,19 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.card_android.android.reader.NfcReader
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_android.data.loadFromBundle
-import com.tangem.card_common.data.TangemCard
-import com.tangem.card_common.reader.CardProtocol
-import com.tangem.card_common.tasks.VerifyCardTask
-import com.tangem.card_common.util.Util
 import com.tangem.data.Blockchain
 import com.tangem.data.dp.PrefsManager
 import com.tangem.data.network.ServerApiCommon
 import com.tangem.server_android.ServerApiTangem
 import com.tangem.server_android.model.CardVerifyAndGetInfo
+import com.tangem.tangem_card.data.TangemCard
+import com.tangem.tangem_card.reader.CardProtocol
+import com.tangem.tangem_card.tasks.VerifyCardTask
+import com.tangem.tangem_card.util.Util
+import com.tangem.tangem_sdk.android.reader.NfcReader
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangem_sdk.data.loadFromBundle
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
 import com.tangem.ui.dialog.PINSwapWarningDialog
diff --git a/app/src/main/java/com/tangem/util/CryptoUtil.java b/app/src/main/java/com/tangem/util/CryptoUtil.java
index 7c1162da1d..bc6eb16d42 100644
--- a/app/src/main/java/com/tangem/util/CryptoUtil.java
+++ b/app/src/main/java/com/tangem/util/CryptoUtil.java
@@ -2,8 +2,8 @@ package com.tangem.util;
 
 import android.util.Log;
 
+import com.tangem.tangem_card.util.Util;
 import com.tangem.wallet.ECDSASignatureETH;
-import com.tangem.card_common.util.Util;
 
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Integer;
diff --git a/app/src/main/java/com/tangem/wallet/BCHUtils.java b/app/src/main/java/com/tangem/wallet/BCHUtils.java
index 6276cd5170..8264d849d0 100644
--- a/app/src/main/java/com/tangem/wallet/BCHUtils.java
+++ b/app/src/main/java/com/tangem/wallet/BCHUtils.java
@@ -6,12 +6,12 @@ package com.tangem.wallet;
 
 import android.util.Log;
 
+import com.tangem.tangem_card.util.Util;
+import com.tangem.util.CryptoUtil;
+import com.tangem.util.FormatUtil;
 import com.tangem.wallet.btc.BitcoinException;
 import com.tangem.wallet.btc.BitcoinOutputStream;
 import com.tangem.wallet.btc.BtcData;
-import com.tangem.util.CryptoUtil;
-import com.tangem.util.FormatUtil;
-import com.tangem.card_common.util.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/app/src/main/java/com/tangem/wallet/BTCUtils.java b/app/src/main/java/com/tangem/wallet/BTCUtils.java
index f08cf2786e..3985201cc7 100644
--- a/app/src/main/java/com/tangem/wallet/BTCUtils.java
+++ b/app/src/main/java/com/tangem/wallet/BTCUtils.java
@@ -6,12 +6,12 @@ package com.tangem.wallet;
 
 import android.util.Log;
 
+import com.tangem.tangem_card.util.Util;
+import com.tangem.util.CryptoUtil;
+import com.tangem.util.FormatUtil;
 import com.tangem.wallet.btc.BitcoinException;
 import com.tangem.wallet.btc.BitcoinOutputStream;
 import com.tangem.wallet.btc.BtcData;
-import com.tangem.util.CryptoUtil;
-import com.tangem.util.FormatUtil;
-import com.tangem.card_common.util.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/app/src/main/java/com/tangem/wallet/BalanceValidator.java b/app/src/main/java/com/tangem/wallet/BalanceValidator.java
index 1919d5f2ff..9e5bc56951 100644
--- a/app/src/main/java/com/tangem/wallet/BalanceValidator.java
+++ b/app/src/main/java/com/tangem/wallet/BalanceValidator.java
@@ -1,7 +1,7 @@
 package com.tangem.wallet;
 
 import com.tangem.App;
-import com.tangem.card_common.data.TangemCard;
+import com.tangem.tangem_card.data.TangemCard;
 
 public class BalanceValidator {
     private String firstLine;
diff --git a/app/src/main/java/com/tangem/wallet/CoinEngine.java b/app/src/main/java/com/tangem/wallet/CoinEngine.java
index afff4db54d..25b6a47ed2 100644
--- a/app/src/main/java/com/tangem/wallet/CoinEngine.java
+++ b/app/src/main/java/com/tangem/wallet/CoinEngine.java
@@ -3,8 +3,8 @@ package com.tangem.wallet;
 import android.net.Uri;
 import android.text.InputFilter;
 
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.tasks.SignTask;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.tasks.SignTask;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/app/src/main/java/com/tangem/wallet/TangemContext.java b/app/src/main/java/com/tangem/wallet/TangemContext.java
index 9c2d9bbfa2..aba5dc3e3f 100644
--- a/app/src/main/java/com/tangem/wallet/TangemContext.java
+++ b/app/src/main/java/com/tangem/wallet/TangemContext.java
@@ -6,8 +6,8 @@ import android.os.Bundle;
 
 import com.tangem.Constant;
 import com.tangem.data.Blockchain;
-import com.tangem.card_android.data.TangemCardExtensionsKt;
-import com.tangem.card_common.data.TangemCard;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_sdk.data.TangemCardExtensionsKt;
 
 public class TangemContext {
     //    public static final String EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA";
diff --git a/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java
index c0b936d269..731dfc620f 100644
--- a/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java
+++ b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java
@@ -6,23 +6,23 @@ import android.util.Log;
 
 import com.tangem.data.network.ElectrumRequest;
 import com.tangem.data.network.ServerApiElectrum;
-import com.tangem.wallet.BCHUtils;
-import com.tangem.wallet.BTCUtils;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.wallet.BalanceValidator;
-import com.tangem.wallet.btc.BtcData;
-import com.tangem.wallet.CoinData;
-import com.tangem.wallet.CoinEngine;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.wallet.TangemContext;
-import com.tangem.wallet.Transaction;
-import com.tangem.wallet.UnspentOutputInfo;
-import com.tangem.card_common.tasks.SignTask;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.tangem_card.util.Util;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.util.DerEncodingUtil;
-import com.tangem.card_common.util.Util;
+import com.tangem.wallet.BCHUtils;
+import com.tangem.wallet.BTCUtils;
+import com.tangem.wallet.BalanceValidator;
+import com.tangem.wallet.CoinData;
+import com.tangem.wallet.CoinEngine;
 import com.tangem.wallet.R;
+import com.tangem.wallet.TangemContext;
+import com.tangem.wallet.Transaction;
+import com.tangem.wallet.UnspentOutputInfo;
+import com.tangem.wallet.btc.BtcData;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java b/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java
index 4936c28295..efc81cac43 100644
--- a/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java
+++ b/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java
@@ -6,15 +6,15 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.card_common.util.Util;
 import com.tangem.data.Blockchain;
 import com.tangem.data.network.BinanceApi;
 import com.tangem.data.network.Server;
 import com.tangem.data.network.ServerApiBinance;
 import com.tangem.data.network.model.BinanceFees;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.tangem_card.util.Util;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.wallet.BalanceValidator;
diff --git a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java
index 3c2c9b1608..d2247214d8 100644
--- a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java
+++ b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java
@@ -5,10 +5,6 @@ import android.text.InputFilter;
 import android.util.Log;
 
 import com.tangem.App;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.card_common.util.Util;
 import com.tangem.data.Blockchain;
 import com.tangem.data.local.PendingTransactionsStorage;
 import com.tangem.data.network.Server;
@@ -24,6 +20,10 @@ import com.tangem.data.network.model.BlockcypherFee;
 import com.tangem.data.network.model.BlockcypherResponse;
 import com.tangem.data.network.model.BlockcypherTx;
 import com.tangem.data.network.model.BlockcypherTxref;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.tangem_card.util.Util;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.util.DerEncodingUtil;
diff --git a/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java
index 73d154ee51..44b283296d 100644
--- a/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java
+++ b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java
@@ -13,18 +13,18 @@ import com.tangem.data.network.model.AdaliteResponse;
 import com.tangem.data.network.model.AdaliteResponseUtxo;
 import com.tangem.data.network.model.AdaliteTxData;
 import com.tangem.data.network.model.AdaliteUtxoData;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.tangem_card.util.Util;
+import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.wallet.BTCUtils;
 import com.tangem.wallet.BalanceValidator;
 import com.tangem.wallet.Base58;
+import com.tangem.wallet.BuildConfig;
 import com.tangem.wallet.CoinData;
 import com.tangem.wallet.CoinEngine;
-import com.tangem.wallet.TangemContext;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.card_common.util.Util;
-import com.tangem.util.DecimalDigitsInputFilter;
-import com.tangem.wallet.BuildConfig;
 import com.tangem.wallet.R;
+import com.tangem.wallet.TangemContext;
 
 import org.spongycastle.crypto.Digest;
 import org.spongycastle.crypto.util.DigestFactory;
diff --git a/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java
index b3c3853da9..0e07b1f913 100644
--- a/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java
+++ b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java
@@ -6,23 +6,23 @@ import android.util.Log;
 
 import com.tangem.data.network.ServerApiInsight;
 import com.tangem.data.network.model.InsightResponse;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.tangem_card.util.Util;
+import com.tangem.util.CryptoUtil;
+import com.tangem.util.DecimalDigitsInputFilter;
+import com.tangem.util.DerEncodingUtil;
 import com.tangem.wallet.BTCUtils;
 import com.tangem.wallet.BalanceValidator;
 import com.tangem.wallet.Base58;
 import com.tangem.wallet.CoinData;
+import com.tangem.wallet.R;
 import com.tangem.wallet.TangemContext;
 import com.tangem.wallet.Transaction;
 import com.tangem.wallet.UnspentOutputInfo;
 import com.tangem.wallet.btc.BtcData;
 import com.tangem.wallet.btc.BtcEngine;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.card_common.util.Util;
-import com.tangem.util.CryptoUtil;
-import com.tangem.util.DecimalDigitsInputFilter;
-import com.tangem.util.DerEncodingUtil;
-import com.tangem.wallet.R;
 
 import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
diff --git a/app/src/main/java/com/tangem/wallet/eos/EosEngine.java b/app/src/main/java/com/tangem/wallet/eos/EosEngine.java
index 17f281efad..b5b2d7b463 100644
--- a/app/src/main/java/com/tangem/wallet/eos/EosEngine.java
+++ b/app/src/main/java/com/tangem/wallet/eos/EosEngine.java
@@ -5,18 +5,16 @@ import android.text.InputFilter;
 import android.util.Log;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.google.common.primitives.Bytes;
 import com.google.gson.Gson;
 import com.tangem.Constant;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.card_common.util.Util;
 import com.tangem.data.Blockchain;
 import com.tangem.data.network.ServerApiEos;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.tangem_card.util.Util;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
-import com.tangem.util.DerEncodingUtil;
 import com.tangem.wallet.BTCUtils;
 import com.tangem.wallet.BalanceValidator;
 import com.tangem.wallet.BuildConfig;
@@ -24,7 +22,6 @@ import com.tangem.wallet.CoinData;
 import com.tangem.wallet.CoinEngine;
 import com.tangem.wallet.R;
 import com.tangem.wallet.TangemContext;
-import com.tangem.wallet.eos.utilities.EOSFormatter;
 
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java
index bfc7238d51..fa0ad71a18 100644
--- a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java
+++ b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java
@@ -8,20 +8,20 @@ import com.tangem.Constant;
 import com.tangem.data.Blockchain;
 import com.tangem.data.network.ServerApiInfura;
 import com.tangem.data.network.model.InfuraResponse;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.util.CryptoUtil;
+import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.wallet.BTCUtils;
 import com.tangem.wallet.BalanceValidator;
+import com.tangem.wallet.BuildConfig;
 import com.tangem.wallet.CoinData;
 import com.tangem.wallet.CoinEngine;
 import com.tangem.wallet.ECDSASignatureETH;
 import com.tangem.wallet.EthTransaction;
 import com.tangem.wallet.Keccak256;
-import com.tangem.wallet.TangemContext;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.util.CryptoUtil;
-import com.tangem.util.DecimalDigitsInputFilter;
-import com.tangem.wallet.BuildConfig;
 import com.tangem.wallet.R;
+import com.tangem.wallet.TangemContext;
 
 import org.bitcoinj.core.ECKey;
 
diff --git a/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java
index 4758a9ab04..a5c138ae57 100644
--- a/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java
+++ b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java
@@ -5,10 +5,6 @@ import android.text.InputFilter;
 import android.util.Log;
 
 import com.tangem.App;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.card_common.util.Util;
 import com.tangem.data.local.PendingTransactionsStorage;
 import com.tangem.data.network.Server;
 import com.tangem.data.network.ServerApiBlockcypher;
@@ -18,6 +14,10 @@ import com.tangem.data.network.model.BlockcypherResponse;
 import com.tangem.data.network.model.BlockcypherTx;
 import com.tangem.data.network.model.BlockcypherTxref;
 import com.tangem.data.network.model.SoChain;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.tangem_card.util.Util;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.util.DerEncodingUtil;
diff --git a/app/src/main/java/com/tangem/wallet/matic/MaticTokenEngine.java b/app/src/main/java/com/tangem/wallet/matic/MaticTokenEngine.java
index 6282a9b854..f4af03ccd9 100644
--- a/app/src/main/java/com/tangem/wallet/matic/MaticTokenEngine.java
+++ b/app/src/main/java/com/tangem/wallet/matic/MaticTokenEngine.java
@@ -1,12 +1,11 @@
 package com.tangem.wallet.matic;
 
 import android.net.Uri;
-import android.util.Log;
 
-import com.tangem.card_common.tasks.SignTask;
 import com.tangem.data.Blockchain;
 import com.tangem.data.network.ServerApiMatic;
 import com.tangem.data.network.model.InfuraResponse;
+import com.tangem.tangem_card.tasks.SignTask;
 import com.tangem.wallet.BTCUtils;
 import com.tangem.wallet.CoinEngine;
 import com.tangem.wallet.EthTransaction;
diff --git a/app/src/main/java/com/tangem/wallet/nftToken/NftTokenEngine.java b/app/src/main/java/com/tangem/wallet/nftToken/NftTokenEngine.java
index a961068cb3..c8a78b7650 100644
--- a/app/src/main/java/com/tangem/wallet/nftToken/NftTokenEngine.java
+++ b/app/src/main/java/com/tangem/wallet/nftToken/NftTokenEngine.java
@@ -8,6 +8,8 @@ import android.util.Log;
 import com.tangem.data.Blockchain;
 import com.tangem.data.network.ServerApiInfura;
 import com.tangem.data.network.model.InfuraResponse;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.tasks.SignTask;
 import com.tangem.wallet.BTCUtils;
 import com.tangem.wallet.BalanceValidator;
 import com.tangem.wallet.CoinData;
@@ -16,9 +18,6 @@ import com.tangem.wallet.Keccak256;
 import com.tangem.wallet.TangemContext;
 import com.tangem.wallet.eth.EthData;
 import com.tangem.wallet.token.TokenData;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.wallet.R;
 
 import java.math.BigInteger;
 
diff --git a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java
index c207da2832..08fcab5dbd 100644
--- a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java
+++ b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java
@@ -9,6 +9,10 @@ import com.google.common.base.Strings;
 import com.tangem.data.Blockchain;
 import com.tangem.data.network.ServerApiInfura;
 import com.tangem.data.network.model.InfuraResponse;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.util.CryptoUtil;
+import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.wallet.BTCUtils;
 import com.tangem.wallet.BalanceValidator;
 import com.tangem.wallet.CoinData;
@@ -16,13 +20,9 @@ import com.tangem.wallet.CoinEngine;
 import com.tangem.wallet.ECDSASignatureETH;
 import com.tangem.wallet.EthTransaction;
 import com.tangem.wallet.Keccak256;
+import com.tangem.wallet.R;
 import com.tangem.wallet.TangemContext;
 import com.tangem.wallet.eth.EthData;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.util.CryptoUtil;
-import com.tangem.util.DecimalDigitsInputFilter;
-import com.tangem.wallet.R;
 
 import org.bitcoinj.core.ECKey;
 
diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java
index ad3946d022..fcda3eb2b3 100644
--- a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java
+++ b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java
@@ -5,12 +5,12 @@ import android.os.StrictMode;
 import android.text.InputFilter;
 import android.util.Log;
 
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.card_common.util.Util;
 import com.tangem.data.Blockchain;
 import com.tangem.data.network.ServerApiStellar;
 import com.tangem.data.network.StellarRequest;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.tangem_card.util.Util;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.wallet.BalanceValidator;
 import com.tangem.wallet.CoinData;
diff --git a/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java
index 95275bb0a5..6cb75e3c72 100644
--- a/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java
+++ b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java
@@ -9,12 +9,12 @@ import com.ripple.core.coretypes.uint.UInt32;
 import com.ripple.crypto.ecdsa.ECDSASignature;
 import com.ripple.encodings.addresses.Addresses;
 import com.ripple.utils.HashUtils;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.tasks.SignTask;
-import com.tangem.card_common.util.Util;
 import com.tangem.data.network.ServerApiRipple;
 import com.tangem.data.network.model.RippleResponse;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.tasks.SignTask;
+import com.tangem.tangem_card.util.Util;
 import com.tangem.util.CryptoUtil;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.wallet.BTCUtils;
diff --git a/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionFragment.kt b/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionFragment.kt
index 08b28b62e5..bebc25650b 100644
--- a/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionFragment.kt
+++ b/app/src/tangemAccess/java/com/tangem/ui/ConfirmTransactionFragment.kt
@@ -16,11 +16,11 @@ import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.core.os.bundleOf
 import com.tangem.Constant
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_android.data.loadFromBundle
-import com.tangem.card_common.data.TangemCard
 import com.tangem.data.Blockchain
+import com.tangem.tangem_card.data.TangemCard
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangem_sdk.data.loadFromBundle
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.event.TransactionFinishWithError
 import com.tangem.ui.fragment.BaseFragment
diff --git a/app/src/tangemAccess/java/com/tangem/ui/SignTransactionFragment.kt b/app/src/tangemAccess/java/com/tangem/ui/SignTransactionFragment.kt
index 4a29ebe7c4..ac88281919 100644
--- a/app/src/tangemAccess/java/com/tangem/ui/SignTransactionFragment.kt
+++ b/app/src/tangemAccess/java/com/tangem/ui/SignTransactionFragment.kt
@@ -13,14 +13,14 @@ import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import com.tangem.App
 import com.tangem.Constant
-import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation
-import com.tangem.card_android.android.reader.NfcReader
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD
-import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID
-import com.tangem.card_android.data.asBundle
-import com.tangem.card_common.reader.CardProtocol
-import com.tangem.card_common.tasks.SignTask
-import com.tangem.card_common.util.Util
+import com.tangem.tangem_card.reader.CardProtocol
+import com.tangem.tangem_card.tasks.SignTask
+import com.tangem.tangem_card.util.Util
+import com.tangem.tangem_sdk.android.nfc.NfcDeviceAntennaLocation
+import com.tangem.tangem_sdk.android.reader.NfcReader
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD
+import com.tangem.tangem_sdk.data.EXTRA_TANGEM_CARD_UID
+import com.tangem.tangem_sdk.data.asBundle
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.dialog.NoExtendedLengthSupportDialog
 import com.tangem.ui.dialog.WaitSecurityDelayDialog
diff --git a/server-android/build.gradle b/server-android/build.gradle
index c6e7c5bfed..c194ede904 100644
--- a/server-android/build.gradle
+++ b/server-android/build.gradle
@@ -30,7 +30,7 @@ android {
 }
 
 dependencies {
-    implementation project(':card-common')
+    implementation project(':tangem-card')
 //    implementation 'com.github.TangemCash.card_android-common:card_android-android:0.1.0'
 
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
diff --git a/server-android/src/main/java/com/tangem/server_android/ServerApiTangem.java b/server-android/src/main/java/com/tangem/server_android/ServerApiTangem.java
index e5a3616d69..345d032f7c 100644
--- a/server-android/src/main/java/com/tangem/server_android/ServerApiTangem.java
+++ b/server-android/src/main/java/com/tangem/server_android/ServerApiTangem.java
@@ -1,11 +1,12 @@
 package com.tangem.server_android;
 
-import androidx.annotation.NonNull;
 import android.util.Log;
 
-import com.tangem.card_common.data.TangemCard;
+import androidx.annotation.NonNull;
+
 import com.tangem.server_android.model.CardVerifyAndGetInfo;
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.util.Util;
 
 import java.io.InputStream;
 import java.util.ArrayList;
diff --git a/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt b/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt
index 86c32f5572..3bfebc688a 100644
--- a/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt
+++ b/server-android/src/main/java/com/tangem/server_android/data/LocalStorage.kt
@@ -1,26 +1,24 @@
 package com.tangem.server_android.data
 
-import android.content.Context
-import com.tangem.card_common.data.TangemCard
-
 import android.annotation.SuppressLint
+import android.content.Context
 import android.graphics.Bitmap
-import java.io.File
-import kotlin.collections.HashMap
 import android.graphics.BitmapFactory
 import android.util.Log
 import com.google.gson.Gson
 import com.google.gson.annotations.SerializedName
 import com.google.gson.reflect.TypeToken
-import com.tangem.server_android.model.CardVerifyAndGetInfo
 import com.tangem.server_android.R
-import com.tangem.card_common.data.external.CardDataSubstitutionProvider
-import com.tangem.card_common.reader.CardCrypto
-import com.tangem.card_common.util.Util
+import com.tangem.server_android.model.CardVerifyAndGetInfo
+import com.tangem.tangem_card.data.TangemCard
+import com.tangem.tangem_card.data.external.CardDataSubstitutionProvider
+import com.tangem.tangem_card.reader.CardCrypto
+import com.tangem.tangem_card.util.Util
+import java.io.File
 import java.io.InputStream
-import java.lang.Exception
 import java.nio.charset.StandardCharsets
 import java.util.*
+import kotlin.collections.HashMap
 
 class LocalStorage
 (
diff --git a/settings.gradle b/settings.gradle
index ac821b1c6c..9fc098f7fa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':card-android', ':server-android', ':card-common'
+include ':app', ':tangem-sdk', ':server-android', ':tangem-card'
diff --git a/card-android/.gitignore b/tangem-card/.gitignore
similarity index 100%
rename from card-android/.gitignore
rename to tangem-card/.gitignore
diff --git a/card-common/.idea/caches/build_file_checksums.ser b/tangem-card/.idea/caches/build_file_checksums.ser
similarity index 100%
rename from card-common/.idea/caches/build_file_checksums.ser
rename to tangem-card/.idea/caches/build_file_checksums.ser
diff --git a/card-android/.idea/codeStyles/Project.xml b/tangem-card/.idea/codeStyles/Project.xml
similarity index 100%
rename from card-android/.idea/codeStyles/Project.xml
rename to tangem-card/.idea/codeStyles/Project.xml
diff --git a/card-common/.idea/gradle.xml b/tangem-card/.idea/gradle.xml
similarity index 100%
rename from card-common/.idea/gradle.xml
rename to tangem-card/.idea/gradle.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha02_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha02_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha02_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha02_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml b/tangem-card/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha01_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha01_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha01_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha01_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml b/tangem-card/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_biometric_biometric_1_0_0_alpha03_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_biometric_biometric_1_0_0_alpha03_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_biometric_biometric_1_0_0_alpha03_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_biometric_biometric_1_0_0_alpha03_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_alpha01_jar.xml b/tangem-card/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_alpha01_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_alpha01_jar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_alpha01_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml b/tangem-card/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_core_core_1_1_0_alpha01_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_core_core_1_1_0_alpha01_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_core_core_1_1_0_alpha01_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_core_core_1_1_0_alpha01_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha02_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha02_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha02_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha02_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml b/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_alpha01_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_alpha01_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_alpha01_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_alpha01_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/tangem-card/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
rename to tangem-card/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__co_nstant_in_cbor_0_8_jar.xml b/tangem-card/.idea/libraries/Gradle__co_nstant_in_cbor_0_8_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__co_nstant_in_cbor_0_8_jar.xml
rename to tangem-card/.idea/libraries/Gradle__co_nstant_in_cbor_0_8_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha02_aar.xml b/tangem-card/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha02_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha02_aar.xml
rename to tangem-card/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha02_aar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml b/tangem-card/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml b/tangem-card/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_google_dagger_dagger_2_21_jar.xml b/tangem-card/.idea/libraries/Gradle__com_google_dagger_dagger_2_21_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_google_dagger_dagger_2_21_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_google_dagger_dagger_2_21_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml b/tangem-card/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml b/tangem-card/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7_aar.xml b/tangem-card/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7_aar.xml
rename to tangem-card/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1_aar.xml b/tangem-card/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1_aar.xml
rename to tangem-card/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1_aar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/tangem-card/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml b/tangem-card/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml b/tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__core_1_56_0_0.xml b/tangem-card/.idea/libraries/Gradle__core_1_56_0_0.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__core_1_56_0_0.xml
rename to tangem-card/.idea/libraries/Gradle__core_1_56_0_0.xml
diff --git a/card-common/.idea/libraries/Gradle__eddsa_0_3_0.xml b/tangem-card/.idea/libraries/Gradle__eddsa_0_3_0.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__eddsa_0_3_0.xml
rename to tangem-card/.idea/libraries/Gradle__eddsa_0_3_0.xml
diff --git a/card-common/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6_aar.xml b/tangem-card/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6_aar.xml
rename to tangem-card/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml b/tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml
rename to tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml
diff --git a/card-android/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml b/tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml b/tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/tangem-card/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
rename to tangem-card/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/tangem-card/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
rename to tangem-card/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8_aar.xml b/tangem-card/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8_aar.xml
rename to tangem-card/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8_aar.xml
diff --git a/card-common/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8_aar.xml b/tangem-card/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8_aar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8_aar.xml
rename to tangem-card/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8_aar.xml
diff --git a/card-android/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml b/tangem-card/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/tangem-card/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml b/tangem-card/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml b/tangem-card/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml b/tangem-card/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml b/tangem-card/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_21_jar.xml b/tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_21_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_21_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_21_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21_jar.xml b/tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21_jar.xml b/tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_21_jar.xml b/tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_21_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_21_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_21_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml b/tangem-card/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml b/tangem-card/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
rename to tangem-card/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
diff --git a/card-android/.idea/libraries/Gradle__prov_1_56_0_0.xml b/tangem-card/.idea/libraries/Gradle__prov_1_56_0_0.xml
similarity index 100%
rename from card-android/.idea/libraries/Gradle__prov_1_56_0_0.xml
rename to tangem-card/.idea/libraries/Gradle__prov_1_56_0_0.xml
diff --git a/card-android/.idea/misc.xml b/tangem-card/.idea/misc.xml
similarity index 100%
rename from card-android/.idea/misc.xml
rename to tangem-card/.idea/misc.xml
diff --git a/card-common/.idea/modules.xml b/tangem-card/.idea/modules.xml
similarity index 100%
rename from card-common/.idea/modules.xml
rename to tangem-card/.idea/modules.xml
diff --git a/card-android/.idea/runConfigurations.xml b/tangem-card/.idea/runConfigurations.xml
similarity index 100%
rename from card-android/.idea/runConfigurations.xml
rename to tangem-card/.idea/runConfigurations.xml
diff --git a/card-common/.idea/vcs.xml b/tangem-card/.idea/vcs.xml
similarity index 100%
rename from card-common/.idea/vcs.xml
rename to tangem-card/.idea/vcs.xml
diff --git a/card-common/.idea/workspace.xml b/tangem-card/.idea/workspace.xml
similarity index 100%
rename from card-common/.idea/workspace.xml
rename to tangem-card/.idea/workspace.xml
diff --git a/card-common/build.gradle b/tangem-card/build.gradle
similarity index 100%
rename from card-common/build.gradle
rename to tangem-card/build.gradle
diff --git a/card-android/gradle/wrapper/gradle-wrapper.jar b/tangem-card/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from card-android/gradle/wrapper/gradle-wrapper.jar
rename to tangem-card/gradle/wrapper/gradle-wrapper.jar
diff --git a/card-common/gradle/wrapper/gradle-wrapper.properties b/tangem-card/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from card-common/gradle/wrapper/gradle-wrapper.properties
rename to tangem-card/gradle/wrapper/gradle-wrapper.properties
diff --git a/card-android/gradlew b/tangem-card/gradlew
similarity index 100%
rename from card-android/gradlew
rename to tangem-card/gradlew
diff --git a/card-android/gradlew.bat b/tangem-card/gradlew.bat
similarity index 100%
rename from card-android/gradlew.bat
rename to tangem-card/gradlew.bat
diff --git a/card-common/local.properties b/tangem-card/local.properties
similarity index 100%
rename from card-common/local.properties
rename to tangem-card/local.properties
diff --git a/card-common/src/main/java/com/tangem/card_common/data/Issuer.java b/tangem-card/src/main/java/com/tangem/tangem_card/data/Issuer.java
similarity index 95%
rename from card-common/src/main/java/com/tangem/card_common/data/Issuer.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/data/Issuer.java
index 374eea579b..ebc204caf8 100644
--- a/card-common/src/main/java/com/tangem/card_common/data/Issuer.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/data/Issuer.java
@@ -1,8 +1,8 @@
-package com.tangem.card_common.data;
+package com.tangem.tangem_card.data;
 
-import com.tangem.card_common.reader.CardCrypto;
-import com.tangem.card_common.util.PBKDF2;
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.reader.CardCrypto;
+import com.tangem.tangem_card.util.PBKDF2;
+import com.tangem.tangem_card.util.Util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java b/tangem-card/src/main/java/com/tangem/tangem_card/data/Manufacturer.java
similarity index 95%
rename from card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/data/Manufacturer.java
index 23de40b9df..af236764d7 100644
--- a/card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/data/Manufacturer.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.data;
+package com.tangem.tangem_card.data;
 
 /**
  * Created by dvol on 09.08.2017.
diff --git a/card-common/src/main/java/com/tangem/card_common/data/TangemCard.java b/tangem-card/src/main/java/com/tangem/tangem_card/data/TangemCard.java
similarity index 99%
rename from card-common/src/main/java/com/tangem/card_common/data/TangemCard.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/data/TangemCard.java
index 539168740e..365848b417 100644
--- a/card-common/src/main/java/com/tangem/card_common/data/TangemCard.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/data/TangemCard.java
@@ -1,8 +1,8 @@
-package com.tangem.card_common.data;
+package com.tangem.tangem_card.data;
 
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.reader.SettingsMask;
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.reader.SettingsMask;
+import com.tangem.tangem_card.util.Util;
 
 import java.util.Date;
 import java.util.EnumSet;
diff --git a/card-common/src/main/java/com/tangem/card_common/data/external/CardDataSubstitutionProvider.java b/tangem-card/src/main/java/com/tangem/tangem_card/data/external/CardDataSubstitutionProvider.java
similarity index 73%
rename from card-common/src/main/java/com/tangem/card_common/data/external/CardDataSubstitutionProvider.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/data/external/CardDataSubstitutionProvider.java
index fe9369baa6..071d75bda0 100644
--- a/card-common/src/main/java/com/tangem/card_common/data/external/CardDataSubstitutionProvider.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/data/external/CardDataSubstitutionProvider.java
@@ -1,6 +1,6 @@
-package com.tangem.card_common.data.external;
+package com.tangem.tangem_card.data.external;
 
-import com.tangem.card_common.data.TangemCard;
+import com.tangem.tangem_card.data.TangemCard;
 
 /**
  * This interface provide method to make substitution of read card data (token symbol, contract address)
diff --git a/card-common/src/main/java/com/tangem/card_common/data/external/FirmwaresDigestsProvider.java b/tangem-card/src/main/java/com/tangem/tangem_card/data/external/FirmwaresDigestsProvider.java
similarity index 91%
rename from card-common/src/main/java/com/tangem/card_common/data/external/FirmwaresDigestsProvider.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/data/external/FirmwaresDigestsProvider.java
index feb2574739..599070a2d3 100644
--- a/card-common/src/main/java/com/tangem/card_common/data/external/FirmwaresDigestsProvider.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/data/external/FirmwaresDigestsProvider.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.data.external;
+package com.tangem.tangem_card.data.external;
 
 /**
  * This interfaces provide function to randomly select parameters to run one VerifyCode command, check answer and
diff --git a/card-common/src/main/java/com/tangem/card_common/data/external/PINsProvider.java b/tangem-card/src/main/java/com/tangem/tangem_card/data/external/PINsProvider.java
similarity index 94%
rename from card-common/src/main/java/com/tangem/card_common/data/external/PINsProvider.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/data/external/PINsProvider.java
index 7813f137fa..6652623017 100644
--- a/card-common/src/main/java/com/tangem/card_common/data/external/PINsProvider.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/data/external/PINsProvider.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.data.external;
+package com.tangem.tangem_card.data.external;
 
 import java.util.List;
 
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/CardCrypto.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/CardCrypto.java
similarity index 98%
rename from card-common/src/main/java/com/tangem/card_common/reader/CardCrypto.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/CardCrypto.java
index 51edfb2ff5..3a01df636c 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/CardCrypto.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/CardCrypto.java
@@ -1,8 +1,8 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
-import com.tangem.card_common.util.Log;
-import com.tangem.card_common.util.PBKDF2;
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.util.Log;
+import com.tangem.tangem_card.util.PBKDF2;
+import com.tangem.tangem_card.util.Util;
 
 import net.i2p.crypto.eddsa.EdDSAEngine;
 import net.i2p.crypto.eddsa.EdDSAPrivateKey;
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/CardProtocol.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/CardProtocol.java
similarity index 99%
rename from card-common/src/main/java/com/tangem/card_common/reader/CardProtocol.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/CardProtocol.java
index 524cc0ad40..f8d7641d56 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/CardProtocol.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/CardProtocol.java
@@ -1,9 +1,9 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.data.Manufacturer;
-import com.tangem.card_common.util.Log;
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.data.Manufacturer;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.util.Log;
+import com.tangem.tangem_card.util.Util;
 
 import org.spongycastle.jce.ECNamedCurveTable;
 import org.spongycastle.jce.interfaces.ECPublicKey;
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/CommandApdu.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/CommandApdu.java
similarity index 98%
rename from card-common/src/main/java/com/tangem/card_common/reader/CommandApdu.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/CommandApdu.java
index 9ecc6e9549..104138a6a9 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/CommandApdu.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/CommandApdu.java
@@ -1,6 +1,6 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.util.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/INS.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/INS.java
similarity index 94%
rename from card-common/src/main/java/com/tangem/card_common/reader/INS.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/INS.java
index e3d56c3a06..a43783e9c7 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/INS.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/INS.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
 /**
  * Created by dvol on 07.03.2018.
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/NfcReader.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/NfcReader.java
similarity index 89%
rename from card-common/src/main/java/com/tangem/card_common/reader/NfcReader.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/NfcReader.java
index 58b5e20693..d93099f6ac 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/NfcReader.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/NfcReader.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
 import java.io.IOException;
 
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/ResponseApdu.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/ResponseApdu.java
similarity index 97%
rename from card-common/src/main/java/com/tangem/card_common/reader/ResponseApdu.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/ResponseApdu.java
index 917dc79a50..577a8ebe77 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/ResponseApdu.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/ResponseApdu.java
@@ -1,6 +1,6 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.util.Util;
 
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/SW.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/SW.java
similarity index 97%
rename from card-common/src/main/java/com/tangem/card_common/reader/SW.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/SW.java
index 3b09a7e819..f24caee7b9 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/SW.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/SW.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
 /**
  * Created by dvol on 07.03.2018.
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/SettingsMask.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/SettingsMask.java
similarity index 98%
rename from card-common/src/main/java/com/tangem/card_common/reader/SettingsMask.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/SettingsMask.java
index c073c45c7b..2b48a32d36 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/SettingsMask.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/SettingsMask.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
 /**
  * Created by dvol on 07.03.2018.
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/TLV.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/TLV.java
similarity index 98%
rename from card-common/src/main/java/com/tangem/card_common/reader/TLV.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/TLV.java
index f48d6d5906..ef071c1f7b 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/TLV.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/TLV.java
@@ -1,6 +1,6 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.util.Util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/TLVException.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/TLVException.java
similarity index 89%
rename from card-common/src/main/java/com/tangem/card_common/reader/TLVException.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/TLVException.java
index 07705f5ff3..241626ea71 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/TLVException.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/TLVException.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
 public class TLVException extends Exception {
 
diff --git a/card-common/src/main/java/com/tangem/card_common/reader/TLVList.java b/tangem-card/src/main/java/com/tangem/tangem_card/reader/TLVList.java
similarity index 95%
rename from card-common/src/main/java/com/tangem/card_common/reader/TLVList.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/reader/TLVList.java
index a046696d01..d071484cbd 100644
--- a/card-common/src/main/java/com/tangem/card_common/reader/TLVList.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/reader/TLVList.java
@@ -1,10 +1,10 @@
-package com.tangem.card_common.reader;
+package com.tangem.tangem_card.reader;
 
 /**
  * Created by dvol on 23.06.2017.
  */
 
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.util.Util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/card-common/src/main/java/com/tangem/card_common/tasks/CreateNewWalletTask.java b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/CreateNewWalletTask.java
similarity index 74%
rename from card-common/src/main/java/com/tangem/card_common/tasks/CreateNewWalletTask.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/tasks/CreateNewWalletTask.java
index 04fa0aabf5..ca9e485794 100644
--- a/card-common/src/main/java/com/tangem/card_common/tasks/CreateNewWalletTask.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/CreateNewWalletTask.java
@@ -1,11 +1,11 @@
-package com.tangem.card_common.tasks;
+package com.tangem.tangem_card.tasks;
 
-import com.tangem.card_common.data.external.CardDataSubstitutionProvider;
-import com.tangem.card_common.data.external.PINsProvider;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.reader.NfcReader;
-import com.tangem.card_common.util.Log;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangem_card.data.external.PINsProvider;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.reader.NfcReader;
+import com.tangem.tangem_card.util.Log;
 
 public class CreateNewWalletTask extends CustomReadCardTask {
     public static final String TAG = CreateNewWalletTask.class.getSimpleName();
diff --git a/card-common/src/main/java/com/tangem/card_common/tasks/CustomReadCardTask.java b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/CustomReadCardTask.java
similarity index 96%
rename from card-common/src/main/java/com/tangem/card_common/tasks/CustomReadCardTask.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/tasks/CustomReadCardTask.java
index a84eb7187e..94c5e3fcfe 100644
--- a/card-common/src/main/java/com/tangem/card_common/tasks/CustomReadCardTask.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/CustomReadCardTask.java
@@ -1,17 +1,17 @@
-package com.tangem.card_common.tasks;
+package com.tangem.tangem_card.tasks;
 
-import com.tangem.card_common.data.external.CardDataSubstitutionProvider;
-import com.tangem.card_common.data.Manufacturer;
-import com.tangem.card_common.data.external.PINsProvider;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.reader.CardCrypto;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.reader.NfcReader;
-import com.tangem.card_common.reader.TLV;
-import com.tangem.card_common.reader.TLVException;
-import com.tangem.card_common.reader.TLVList;
-import com.tangem.card_common.util.Log;
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.data.Manufacturer;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangem_card.data.external.PINsProvider;
+import com.tangem.tangem_card.reader.CardCrypto;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.reader.NfcReader;
+import com.tangem.tangem_card.reader.TLV;
+import com.tangem.tangem_card.reader.TLVException;
+import com.tangem.tangem_card.reader.TLVList;
+import com.tangem.tangem_card.util.Log;
+import com.tangem.tangem_card.util.Util;
 
 import org.spongycastle.jce.ECNamedCurveTable;
 import org.spongycastle.jce.spec.ECNamedCurveParameterSpec;
diff --git a/card-common/src/main/java/com/tangem/card_common/tasks/OneTouchSignTask.java b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/OneTouchSignTask.java
similarity index 91%
rename from card-common/src/main/java/com/tangem/card_common/tasks/OneTouchSignTask.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/tasks/OneTouchSignTask.java
index 0a4b651599..97e43e5372 100644
--- a/card-common/src/main/java/com/tangem/card_common/tasks/OneTouchSignTask.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/OneTouchSignTask.java
@@ -1,13 +1,13 @@
-package com.tangem.card_common.tasks;
+package com.tangem.tangem_card.tasks;
 
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.data.external.CardDataSubstitutionProvider;
-import com.tangem.card_common.data.external.PINsProvider;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.reader.NfcReader;
-import com.tangem.card_common.reader.TLV;
-import com.tangem.card_common.reader.TLVList;
-import com.tangem.card_common.util.Log;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangem_card.data.external.PINsProvider;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.reader.NfcReader;
+import com.tangem.tangem_card.reader.TLV;
+import com.tangem.tangem_card.reader.TLVList;
+import com.tangem.tangem_card.util.Log;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/card-common/src/main/java/com/tangem/card_common/tasks/PurgeTask.java b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/PurgeTask.java
similarity index 72%
rename from card-common/src/main/java/com/tangem/card_common/tasks/PurgeTask.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/tasks/PurgeTask.java
index b1651c6fff..d7ea753c97 100644
--- a/card-common/src/main/java/com/tangem/card_common/tasks/PurgeTask.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/PurgeTask.java
@@ -1,10 +1,10 @@
-package com.tangem.card_common.tasks;
+package com.tangem.tangem_card.tasks;
 
-import com.tangem.card_common.data.external.PINsProvider;
-import com.tangem.card_common.reader.NfcReader;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangem_card.data.external.PINsProvider;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.reader.NfcReader;
 
 public class PurgeTask extends CustomReadCardTask {
     public static final String TAG = PurgeTask.class.getSimpleName();
diff --git a/card-common/src/main/java/com/tangem/card_common/tasks/ReadCardInfoTask.java b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/ReadCardInfoTask.java
similarity index 85%
rename from card-common/src/main/java/com/tangem/card_common/tasks/ReadCardInfoTask.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/tasks/ReadCardInfoTask.java
index 1913dff407..f081afff9e 100644
--- a/card-common/src/main/java/com/tangem/card_common/tasks/ReadCardInfoTask.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/ReadCardInfoTask.java
@@ -1,10 +1,10 @@
-package com.tangem.card_common.tasks;
+package com.tangem.tangem_card.tasks;
 
-import com.tangem.card_common.data.external.CardDataSubstitutionProvider;
-import com.tangem.card_common.data.external.PINsProvider;
-import com.tangem.card_common.reader.NfcReader;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.data.TangemCard;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangem_card.data.external.PINsProvider;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.reader.NfcReader;
 
 public class ReadCardInfoTask extends CustomReadCardTask {
     public static final String TAG = ReadCardInfoTask.class.getSimpleName();
diff --git a/card-common/src/main/java/com/tangem/card_common/tasks/SignTask.java b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/SignTask.java
similarity index 89%
rename from card-common/src/main/java/com/tangem/card_common/tasks/SignTask.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/tasks/SignTask.java
index d3eebd6bda..4aeb2a2659 100644
--- a/card-common/src/main/java/com/tangem/card_common/tasks/SignTask.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/SignTask.java
@@ -1,13 +1,13 @@
-package com.tangem.card_common.tasks;
+package com.tangem.tangem_card.tasks;
 
-import com.tangem.card_common.data.external.CardDataSubstitutionProvider;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.data.external.PINsProvider;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.reader.NfcReader;
-import com.tangem.card_common.reader.TLV;
-import com.tangem.card_common.reader.TLVList;
-import com.tangem.card_common.util.Log;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangem_card.data.external.PINsProvider;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.reader.NfcReader;
+import com.tangem.tangem_card.reader.TLV;
+import com.tangem.tangem_card.reader.TLVList;
+import com.tangem.tangem_card.util.Log;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/card-common/src/main/java/com/tangem/card_common/tasks/SwapPINTask.java b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/SwapPINTask.java
similarity index 77%
rename from card-common/src/main/java/com/tangem/card_common/tasks/SwapPINTask.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/tasks/SwapPINTask.java
index 43df1e6bbc..7ae47946e1 100644
--- a/card-common/src/main/java/com/tangem/card_common/tasks/SwapPINTask.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/SwapPINTask.java
@@ -1,10 +1,10 @@
-package com.tangem.card_common.tasks;
+package com.tangem.tangem_card.tasks;
 
-import com.tangem.card_common.data.external.CardDataSubstitutionProvider;
-import com.tangem.card_common.data.external.PINsProvider;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.reader.NfcReader;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangem_card.data.external.PINsProvider;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.reader.NfcReader;
 
 public class SwapPINTask extends CustomReadCardTask {
     public static final String TAG = SwapPINTask.class.getSimpleName();
diff --git a/card-common/src/main/java/com/tangem/card_common/tasks/VerifyCardTask.java b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/VerifyCardTask.java
similarity index 81%
rename from card-common/src/main/java/com/tangem/card_common/tasks/VerifyCardTask.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/tasks/VerifyCardTask.java
index 35af35f3c9..57cb73c822 100644
--- a/card-common/src/main/java/com/tangem/card_common/tasks/VerifyCardTask.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/tasks/VerifyCardTask.java
@@ -1,12 +1,12 @@
-package com.tangem.card_common.tasks;
+package com.tangem.tangem_card.tasks;
 
-import com.tangem.card_common.data.TangemCard;
-import com.tangem.card_common.data.external.CardDataSubstitutionProvider;
-import com.tangem.card_common.data.external.FirmwaresDigestsProvider;
-import com.tangem.card_common.data.external.PINsProvider;
-import com.tangem.card_common.reader.CardProtocol;
-import com.tangem.card_common.reader.NfcReader;
-import com.tangem.card_common.util.Log;
+import com.tangem.tangem_card.data.TangemCard;
+import com.tangem.tangem_card.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangem_card.data.external.FirmwaresDigestsProvider;
+import com.tangem.tangem_card.data.external.PINsProvider;
+import com.tangem.tangem_card.reader.CardProtocol;
+import com.tangem.tangem_card.reader.NfcReader;
+import com.tangem.tangem_card.util.Log;
 
 import java.util.Arrays;
 
diff --git a/card-common/src/main/java/com/tangem/card_common/util/Log.java b/tangem-card/src/main/java/com/tangem/tangem_card/util/Log.java
similarity index 93%
rename from card-common/src/main/java/com/tangem/card_common/util/Log.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/util/Log.java
index 937965acc8..b1188b1d72 100644
--- a/card-common/src/main/java/com/tangem/card_common/util/Log.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/util/Log.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.util;
+package com.tangem.tangem_card.util;
 
 public class Log {
     public static void i(String logTag, String message) {
diff --git a/card-common/src/main/java/com/tangem/card_common/util/LoggerInterface.java b/tangem-card/src/main/java/com/tangem/tangem_card/util/LoggerInterface.java
similarity index 81%
rename from card-common/src/main/java/com/tangem/card_common/util/LoggerInterface.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/util/LoggerInterface.java
index dd4b45d1f8..14fdec66d8 100644
--- a/card-common/src/main/java/com/tangem/card_common/util/LoggerInterface.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/util/LoggerInterface.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.util;
+package com.tangem.tangem_card.util;
 
 public interface LoggerInterface {
     void i(String logTag, String message);
diff --git a/card-common/src/main/java/com/tangem/card_common/util/PBKDF2.java b/tangem-card/src/main/java/com/tangem/tangem_card/util/PBKDF2.java
similarity index 98%
rename from card-common/src/main/java/com/tangem/card_common/util/PBKDF2.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/util/PBKDF2.java
index 657c5fd047..048c4656b1 100644
--- a/card-common/src/main/java/com/tangem/card_common/util/PBKDF2.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/util/PBKDF2.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.util;
+package com.tangem.tangem_card.util;
 
 import org.spongycastle.crypto.CipherParameters;
 import org.spongycastle.crypto.digests.SHA256Digest;
diff --git a/card-common/src/main/java/com/tangem/card_common/util/Util.java b/tangem-card/src/main/java/com/tangem/tangem_card/util/Util.java
similarity index 99%
rename from card-common/src/main/java/com/tangem/card_common/util/Util.java
rename to tangem-card/src/main/java/com/tangem/tangem_card/util/Util.java
index 668ba8970e..3a0287f1aa 100644
--- a/card-common/src/main/java/com/tangem/card_common/util/Util.java
+++ b/tangem-card/src/main/java/com/tangem/tangem_card/util/Util.java
@@ -1,4 +1,4 @@
-package com.tangem.card_common.util;
+package com.tangem.tangem_card.util;
 
 import org.spongycastle.crypto.digests.RIPEMD160Digest;
 
diff --git a/card-common/.gitignore b/tangem-sdk/.gitignore
similarity index 100%
rename from card-common/.gitignore
rename to tangem-sdk/.gitignore
diff --git a/card-android/.idea/caches/build_file_checksums.ser b/tangem-sdk/.idea/caches/build_file_checksums.ser
similarity index 100%
rename from card-android/.idea/caches/build_file_checksums.ser
rename to tangem-sdk/.idea/caches/build_file_checksums.ser
diff --git a/card-common/.idea/codeStyles/Project.xml b/tangem-sdk/.idea/codeStyles/Project.xml
similarity index 100%
rename from card-common/.idea/codeStyles/Project.xml
rename to tangem-sdk/.idea/codeStyles/Project.xml
diff --git a/card-android/.idea/gradle.xml b/tangem-sdk/.idea/gradle.xml
similarity index 100%
rename from card-android/.idea/gradle.xml
rename to tangem-sdk/.idea/gradle.xml
diff --git a/card-common/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__core_1_56_0_0.xml b/tangem-sdk/.idea/libraries/Gradle__core_1_56_0_0.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__core_1_56_0_0.xml
rename to tangem-sdk/.idea/libraries/Gradle__core_1_56_0_0.xml
diff --git a/card-common/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/tangem-sdk/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/tangem-sdk/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml b/tangem-sdk/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml b/tangem-sdk/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml b/tangem-sdk/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml b/tangem-sdk/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml b/tangem-sdk/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml b/tangem-sdk/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
rename to tangem-sdk/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
diff --git a/card-common/.idea/libraries/Gradle__prov_1_56_0_0.xml b/tangem-sdk/.idea/libraries/Gradle__prov_1_56_0_0.xml
similarity index 100%
rename from card-common/.idea/libraries/Gradle__prov_1_56_0_0.xml
rename to tangem-sdk/.idea/libraries/Gradle__prov_1_56_0_0.xml
diff --git a/card-common/.idea/misc.xml b/tangem-sdk/.idea/misc.xml
similarity index 100%
rename from card-common/.idea/misc.xml
rename to tangem-sdk/.idea/misc.xml
diff --git a/card-android/.idea/modules.xml b/tangem-sdk/.idea/modules.xml
similarity index 100%
rename from card-android/.idea/modules.xml
rename to tangem-sdk/.idea/modules.xml
diff --git a/card-common/.idea/runConfigurations.xml b/tangem-sdk/.idea/runConfigurations.xml
similarity index 100%
rename from card-common/.idea/runConfigurations.xml
rename to tangem-sdk/.idea/runConfigurations.xml
diff --git a/card-android/.idea/workspace.xml b/tangem-sdk/.idea/workspace.xml
similarity index 100%
rename from card-android/.idea/workspace.xml
rename to tangem-sdk/.idea/workspace.xml
diff --git a/card-android/build.gradle b/tangem-sdk/build.gradle
similarity index 93%
rename from card-android/build.gradle
rename to tangem-sdk/build.gradle
index 2a324d24e4..2f7a51eb93 100644
--- a/card-android/build.gradle
+++ b/tangem-sdk/build.gradle
@@ -37,7 +37,7 @@ android {
 }
 
 dependencies {
-    implementation project(':card-common')
+    implementation project(':tangem-card')
 //    implementation 'com.github.TangemCash.card_android-common:card_android-android:0.1.0'
 
     implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
@@ -49,8 +49,8 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.scottyab:rootbeer-lib:0.0.7'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
 }
diff --git a/card-android/git b/tangem-sdk/git
similarity index 100%
rename from card-android/git
rename to tangem-sdk/git
diff --git a/card-common/gradle/wrapper/gradle-wrapper.jar b/tangem-sdk/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from card-common/gradle/wrapper/gradle-wrapper.jar
rename to tangem-sdk/gradle/wrapper/gradle-wrapper.jar
diff --git a/card-android/gradle/wrapper/gradle-wrapper.properties b/tangem-sdk/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from card-android/gradle/wrapper/gradle-wrapper.properties
rename to tangem-sdk/gradle/wrapper/gradle-wrapper.properties
diff --git a/card-common/gradlew b/tangem-sdk/gradlew
similarity index 100%
rename from card-common/gradlew
rename to tangem-sdk/gradlew
diff --git a/card-common/gradlew.bat b/tangem-sdk/gradlew.bat
similarity index 100%
rename from card-common/gradlew.bat
rename to tangem-sdk/gradlew.bat
diff --git a/card-android/local.properties b/tangem-sdk/local.properties
similarity index 100%
rename from card-android/local.properties
rename to tangem-sdk/local.properties
diff --git a/card-android/proguard-rules.pro b/tangem-sdk/proguard-rules.pro
similarity index 100%
rename from card-android/proguard-rules.pro
rename to tangem-sdk/proguard-rules.pro
diff --git a/card-android/src/androidTest/java/com/tangem/card_android/ExampleInstrumentedTest.java b/tangem-sdk/src/androidTest/java/com/tangem/tangem_sdk/ExampleInstrumentedTest.java
similarity index 95%
rename from card-android/src/androidTest/java/com/tangem/card_android/ExampleInstrumentedTest.java
rename to tangem-sdk/src/androidTest/java/com/tangem/tangem_sdk/ExampleInstrumentedTest.java
index 592d881178..41b93ed28b 100644
--- a/card-android/src/androidTest/java/com/tangem/card_android/ExampleInstrumentedTest.java
+++ b/tangem-sdk/src/androidTest/java/com/tangem/tangem_sdk/ExampleInstrumentedTest.java
@@ -1,6 +1,7 @@
-package com.tangem.card_android;
+package com.tangem.tangem_sdk;
 
 import android.content.Context;
+
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
diff --git a/card-android/src/main/AndroidManifest.xml b/tangem-sdk/src/main/AndroidManifest.xml
similarity index 85%
rename from card-android/src/main/AndroidManifest.xml
rename to tangem-sdk/src/main/AndroidManifest.xml
index 325e18a341..06bf470bd3 100644
--- a/card-android/src/main/AndroidManifest.xml
+++ b/tangem-sdk/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tangem.card_android" >
+    package="com.tangem.tangem_sdk" >
     <uses-feature
         android:name="android.hardware.nfc"
         android:required="true" />
diff --git a/card-android/src/main/java/com/tangem/card_android/android/data/Firmwares.java b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/data/Firmwares.java
similarity index 93%
rename from card-android/src/main/java/com/tangem/card_android/android/data/Firmwares.java
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/data/Firmwares.java
index 1a6fee8e58..faef6b5d8b 100644
--- a/card-android/src/main/java/com/tangem/card_android/android/data/Firmwares.java
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/data/Firmwares.java
@@ -1,12 +1,12 @@
-package com.tangem.card_android.android.data;
+package com.tangem.tangem_sdk.android.data;
 
 import android.content.Context;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.tangem.card_common.data.external.FirmwaresDigestsProvider;
-import com.tangem.card_common.util.Util;
+import com.tangem.tangem_card.data.external.FirmwaresDigestsProvider;
+import com.tangem.tangem_card.util.Util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/card-android/src/main/java/com/tangem/card_android/android/data/PINStorage.java b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/data/PINStorage.java
similarity index 97%
rename from card-android/src/main/java/com/tangem/card_android/android/data/PINStorage.java
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/data/PINStorage.java
index 055d2dfedf..4d0608bd18 100644
--- a/card-android/src/main/java/com/tangem/card_android/android/data/PINStorage.java
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/data/PINStorage.java
@@ -1,12 +1,12 @@
-package com.tangem.card_android.android.data;
+package com.tangem.tangem_sdk.android.data;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Base64;
 
-import com.tangem.card_common.data.external.PINsProvider;
-import com.tangem.card_common.reader.CardProtocol;
+import com.tangem.tangem_card.data.external.PINsProvider;
+import com.tangem.tangem_card.reader.CardProtocol;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/card-android/src/main/java/com/tangem/card_android/android/nfc/NfcDeviceAntennaLocation.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcDeviceAntennaLocation.kt
similarity index 98%
rename from card-android/src/main/java/com/tangem/card_android/android/nfc/NfcDeviceAntennaLocation.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcDeviceAntennaLocation.kt
index 2117dea70b..7476961308 100644
--- a/card-android/src/main/java/com/tangem/card_android/android/nfc/NfcDeviceAntennaLocation.kt
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcDeviceAntennaLocation.kt
@@ -1,4 +1,4 @@
-package com.tangem.card_android.android.nfc
+package com.tangem.tangem_sdk.android.nfc
 
 import android.content.Context
 import android.os.Build
diff --git a/card-android/src/main/java/com/tangem/card_android/android/nfc/NfcLifecycleObserver.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLifecycleObserver.kt
similarity index 84%
rename from card-android/src/main/java/com/tangem/card_android/android/nfc/NfcLifecycleObserver.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLifecycleObserver.kt
index 78a9f24b39..937e67bc2c 100644
--- a/card-android/src/main/java/com/tangem/card_android/android/nfc/NfcLifecycleObserver.kt
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLifecycleObserver.kt
@@ -1,8 +1,8 @@
-package com.tangem.card_android.android.nfc
+package com.tangem.tangem_sdk.android.nfc
 
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import com.tangem.card_android.android.reader.NfcManager
+import com.tangem.tangem_sdk.android.reader.NfcManager
 
 /**
  * Lifecycle observer for all activities and fragments with nfc
diff --git a/card-android/src/main/java/com/tangem/card_android/android/nfc/NfcLocation.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLocation.kt
similarity index 99%
rename from card-android/src/main/java/com/tangem/card_android/android/nfc/NfcLocation.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLocation.kt
index 28fe5c9d67..d87b466385 100644
--- a/card-android/src/main/java/com/tangem/card_android/android/nfc/NfcLocation.kt
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLocation.kt
@@ -1,4 +1,4 @@
-package com.tangem.card_android.android.nfc
+package com.tangem.tangem_sdk.android.nfc
 
 enum class NfcLocation(val codename: String, val fullName: String, val orientation: Int, val x: Int, val y: Int, val z: Int) {
     model1("sailfish", "Google Pixel", 0, 65, 25, 0),
diff --git a/card-android/src/main/java/com/tangem/card_android/android/reader/NfcManager.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/reader/NfcManager.kt
similarity index 97%
rename from card-android/src/main/java/com/tangem/card_android/android/reader/NfcManager.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/reader/NfcManager.kt
index 5b5f5d21b6..b59167f216 100644
--- a/card-android/src/main/java/com/tangem/card_android/android/reader/NfcManager.kt
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/reader/NfcManager.kt
@@ -1,4 +1,4 @@
-package com.tangem.card_android.android.reader
+package com.tangem.tangem_sdk.android.reader
 
 import android.Manifest
 import android.annotation.TargetApi
@@ -15,8 +15,8 @@ import android.os.Build
 import android.os.Bundle
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.FragmentActivity
-import com.tangem.card_android.android.ui.NfcEnableDialog
-import com.tangem.card_common.util.Log
+import com.tangem.tangem_card.util.Log
+import com.tangem.tangem_sdk.android.ui.NfcEnableDialog
 import java.io.IOException
 
 class NfcManager(private val activity: FragmentActivity, private val readerCallback: NfcAdapter.ReaderCallback) {
diff --git a/card-android/src/main/java/com/tangem/card_android/android/reader/NfcReader.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/reader/NfcReader.kt
similarity index 89%
rename from card-android/src/main/java/com/tangem/card_android/android/reader/NfcReader.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/reader/NfcReader.kt
index d371cf629e..c7a0409b99 100644
--- a/card-android/src/main/java/com/tangem/card_android/android/reader/NfcReader.kt
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/reader/NfcReader.kt
@@ -1,11 +1,11 @@
-package com.tangem.card_android.android.reader
+package com.tangem.tangem_sdk.android.reader
 
 import android.nfc.tech.IsoDep
 
 data class NfcReader(
         val nfcManager: NfcManager,
         val isoDep: IsoDep
-) : com.tangem.card_common.reader.NfcReader {
+) : com.tangem.tangem_card.reader.NfcReader {
     override fun getId(): ByteArray {
         return isoDep.tag.id
     }
diff --git a/card-android/src/main/java/com/tangem/card_android/android/ui/NfcEnableDialog.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/ui/NfcEnableDialog.kt
similarity index 93%
rename from card-android/src/main/java/com/tangem/card_android/android/ui/NfcEnableDialog.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/ui/NfcEnableDialog.kt
index dfefdba12c..5a3f2cb6a6 100644
--- a/card-android/src/main/java/com/tangem/card_android/android/ui/NfcEnableDialog.kt
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/ui/NfcEnableDialog.kt
@@ -1,4 +1,4 @@
-package com.tangem.card_android.android.ui
+package com.tangem.tangem_sdk.android.ui
 
 import android.app.Dialog
 import android.content.Intent
@@ -8,7 +8,7 @@ import android.provider.Settings
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 
-import com.tangem.card_android.R
+import com.tangem.tangem_sdk.R
 
 class NfcEnableDialog : DialogFragment() {
     companion object {
diff --git a/card-android/src/main/java/com/tangem/card_android/data/TangemCardExtensions.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/data/TangemCardExtensions.kt
similarity index 97%
rename from card-android/src/main/java/com/tangem/card_android/data/TangemCardExtensions.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk/data/TangemCardExtensions.kt
index 083b876d02..cb697f95a2 100644
--- a/card-android/src/main/java/com/tangem/card_android/data/TangemCardExtensions.kt
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk/data/TangemCardExtensions.kt
@@ -1,9 +1,9 @@
-package com.tangem.card_android.data
+package com.tangem.tangem_sdk.data
 
 import android.os.Bundle
-import com.tangem.card_common.data.Manufacturer
-import com.tangem.card_common.data.TangemCard
-import com.tangem.card_common.util.Log
+import com.tangem.tangem_card.data.Manufacturer
+import com.tangem.tangem_card.data.TangemCard
+import com.tangem.tangem_card.util.Log
 import java.util.*
 
 const val EXTRA_TANGEM_CARD = "Card"
diff --git a/card-android/src/main/res/drawable/card_default.png b/tangem-sdk/src/main/res/drawable/card_default.png
similarity index 100%
rename from card-android/src/main/res/drawable/card_default.png
rename to tangem-sdk/src/main/res/drawable/card_default.png
diff --git a/card-android/src/main/res/drawable/hand_card_horizontal.png b/tangem-sdk/src/main/res/drawable/hand_card_horizontal.png
similarity index 100%
rename from card-android/src/main/res/drawable/hand_card_horizontal.png
rename to tangem-sdk/src/main/res/drawable/hand_card_horizontal.png
diff --git a/card-android/src/main/res/drawable/hand_card_vertical.png b/tangem-sdk/src/main/res/drawable/hand_card_vertical.png
similarity index 100%
rename from card-android/src/main/res/drawable/hand_card_vertical.png
rename to tangem-sdk/src/main/res/drawable/hand_card_vertical.png
diff --git a/card-android/src/main/res/drawable/ic_action_nfc_gray.png b/tangem-sdk/src/main/res/drawable/ic_action_nfc_gray.png
similarity index 100%
rename from card-android/src/main/res/drawable/ic_action_nfc_gray.png
rename to tangem-sdk/src/main/res/drawable/ic_action_nfc_gray.png
diff --git a/card-android/src/main/res/drawable/ic_logo_bat_token.png b/tangem-sdk/src/main/res/drawable/ic_logo_bat_token.png
similarity index 100%
rename from card-android/src/main/res/drawable/ic_logo_bat_token.png
rename to tangem-sdk/src/main/res/drawable/ic_logo_bat_token.png
diff --git a/card-android/src/main/res/drawable/ic_logo_bitcoin.png b/tangem-sdk/src/main/res/drawable/ic_logo_bitcoin.png
similarity index 100%
rename from card-android/src/main/res/drawable/ic_logo_bitcoin.png
rename to tangem-sdk/src/main/res/drawable/ic_logo_bitcoin.png
diff --git a/card-android/src/main/res/drawable/ic_logo_bitcoin_cash.png b/tangem-sdk/src/main/res/drawable/ic_logo_bitcoin_cash.png
similarity index 100%
rename from card-android/src/main/res/drawable/ic_logo_bitcoin_cash.png
rename to tangem-sdk/src/main/res/drawable/ic_logo_bitcoin_cash.png
diff --git a/card-android/src/main/res/drawable/ic_logo_bitcoin_testnet.png b/tangem-sdk/src/main/res/drawable/ic_logo_bitcoin_testnet.png
similarity index 100%
rename from card-android/src/main/res/drawable/ic_logo_bitcoin_testnet.png
rename to tangem-sdk/src/main/res/drawable/ic_logo_bitcoin_testnet.png
diff --git a/card-android/src/main/res/drawable/ic_logo_ethereum.png b/tangem-sdk/src/main/res/drawable/ic_logo_ethereum.png
similarity index 100%
rename from card-android/src/main/res/drawable/ic_logo_ethereum.png
rename to tangem-sdk/src/main/res/drawable/ic_logo_ethereum.png
diff --git a/card-android/src/main/res/drawable/ic_logo_ethereum_testnet.png b/tangem-sdk/src/main/res/drawable/ic_logo_ethereum_testnet.png
similarity index 100%
rename from card-android/src/main/res/drawable/ic_logo_ethereum_testnet.png
rename to tangem-sdk/src/main/res/drawable/ic_logo_ethereum_testnet.png
diff --git a/card-android/src/main/res/drawable/ic_logo_seed.png b/tangem-sdk/src/main/res/drawable/ic_logo_seed.png
similarity index 100%
rename from card-android/src/main/res/drawable/ic_logo_seed.png
rename to tangem-sdk/src/main/res/drawable/ic_logo_seed.png
diff --git a/card-android/src/main/res/drawable/ic_logo_stellar.png b/tangem-sdk/src/main/res/drawable/ic_logo_stellar.png
similarity index 100%
rename from card-android/src/main/res/drawable/ic_logo_stellar.png
rename to tangem-sdk/src/main/res/drawable/ic_logo_stellar.png
diff --git a/card-android/src/main/res/drawable/ic_logo_unknown.png b/tangem-sdk/src/main/res/drawable/ic_logo_unknown.png
similarity index 100%
rename from card-android/src/main/res/drawable/ic_logo_unknown.png
rename to tangem-sdk/src/main/res/drawable/ic_logo_unknown.png
diff --git a/card-android/src/main/res/drawable/tangem2.png b/tangem-sdk/src/main/res/drawable/tangem2.png
similarity index 100%
rename from card-android/src/main/res/drawable/tangem2.png
rename to tangem-sdk/src/main/res/drawable/tangem2.png
diff --git a/card-android/src/main/res/values/strings.xml b/tangem-sdk/src/main/res/values/strings.xml
similarity index 100%
rename from card-android/src/main/res/values/strings.xml
rename to tangem-sdk/src/main/res/values/strings.xml
diff --git a/card-android/src/test/java/com/tangem/card_android/ExampleUnitTest.java b/tangem-sdk/src/test/java/com/tangem/tangem_sdk/ExampleUnitTest.java
similarity index 80%
rename from card-android/src/test/java/com/tangem/card_android/ExampleUnitTest.java
rename to tangem-sdk/src/test/java/com/tangem/tangem_sdk/ExampleUnitTest.java
index eea1a1722a..fddad24076 100644
--- a/card-android/src/test/java/com/tangem/card_android/ExampleUnitTest.java
+++ b/tangem-sdk/src/test/java/com/tangem/tangem_sdk/ExampleUnitTest.java
@@ -1,8 +1,8 @@
-package com.tangem.card_android;
+package com.tangem.tangem_sdk;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Example local unit test, which will execute on the development machine (host).