From 7737b890bbde0ecd18a29f1a506b9360efd4b87f Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 10 Dec 2018 12:05:32 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .idea/gradle.xml                              |   4 +-
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |   1 +
 app/src/main/java/com/tangem/App.java         |  47 +-
 .../java/com/tangem}/data/Blockchain.java     |   2 +-
 .../StartFingerprintReaderTask.java           |   2 +-
 .../tangem/data/network/ServerApiCommon.java  |   9 -
 .../data/network/ServerApiElectrum.java       |  16 +-
 app/src/main/java/com/tangem/di/Navigator.kt  |   4 -
 .../com/tangem/domain/wallet/CoinData.java    |   2 +-
 .../com/tangem/domain/wallet/CoinEngine.java  |   4 +-
 .../tangem/domain/wallet/CoinEngineFactory.kt |   2 +-
 .../tangem/domain/wallet/TangemContext.java   |  39 +-
 .../domain/wallet/bch/BtcCashEngine.java      |   5 +-
 .../tangem/domain/wallet/btc/BtcEngine.java   |   4 +-
 .../tangem/domain/wallet/eth/EthEngine.java   |   8 +-
 .../domain/wallet/token/TokenEngine.java      |   5 -
 .../activity/ConfirmPaymentActivity.kt        |   9 +-
 .../activity/CreateNewWalletActivity.kt       |  11 +-
 .../activity/EmptyWalletActivity.kt           |  19 +-
 .../presentation/activity/MainActivity.kt     |  14 +-
 .../activity/PinRequestActivity.kt            |  11 +-
 .../presentation/activity/PinSaveActivity.kt  |   2 +-
 .../presentation/activity/PinSwapActivity.kt  |  14 +-
 ...pareCryptonitOtherApiWithdrawalActivity.kt |   4 +-
 .../PrepareCryptonitWithdrawalActivity.kt     |   6 +-
 .../PrepareKrakenWithdrawalActivity.kt        |   4 +-
 .../activity/PreparePaymentActivity.kt        |   8 +-
 .../presentation/activity/PurgeActivity.kt    |   9 +-
 .../activity/SendTransactionActivity.kt       |  13 +-
 .../activity/SignPaymentActivity.kt           |   9 +-
 .../activity/VerifyCardActivity.kt            |   2 -
 .../presentation/fragment/LoadedWallet.kt     |  73 ++--
 .../presentation/fragment/VerifyCard.kt       |  23 +-
 settings.gradle                               |   2 +-
 {tangemcard => tangemcard-android}/.gitignore |   0
 .../build.gradle                              |  18 +-
 .../proguard-rules.pro                        |   0
 .../android}/ExampleInstrumentedTest.java     |   2 +-
 .../src/main/AndroidManifest.xml              |   8 +
 .../tangemcard/android/data}/Firmwares.java   |  24 +-
 .../tangemcard/android/data}/PINStorage.java  |  21 +-
 .../android}/nfc/DeviceNFCAntennaLocation.kt  |   2 +-
 .../tangemcard/android}/nfc/NFCLocation.kt    |   2 +-
 .../presentation/dialog/NfcEnableDialog.kt    |   2 +-
 .../android}/reader/NfcManager.java           |   4 +-
 .../tangemcard/android/reader/NfcReader.kt    |  41 ++
 .../tangemcard/data/TangemCardExtensions.kt   | 150 +++++++
 .../src/main/res/drawable/card_default.png    | Bin
 .../src/main/res/drawable/card_ru006.png      | Bin
 .../src/main/res/drawable/card_ru007.png      | Bin
 .../src/main/res/drawable/card_ru011.png      | Bin
 .../src/main/res/drawable/card_ru012.png      | Bin
 .../src/main/res/drawable/card_ru013.png      | Bin
 .../src/main/res/drawable/card_ru014.png      | Bin
 .../src/main/res/drawable/card_ru015.png      | Bin
 .../src/main/res/drawable/card_ru016.png      | Bin
 .../src/main/res/drawable/card_ru020.png      | Bin
 .../src/main/res/drawable/card_ru021.png      | Bin
 .../src/main/res/drawable/card_ru022.png      | Bin
 .../src/main/res/drawable/card_ru023.png      | Bin
 .../src/main/res/drawable/card_ru024.png      | Bin
 .../src/main/res/drawable/card_ru028.png      | Bin
 .../src/main/res/drawable/card_ru029.png      | Bin
 .../src/main/res/drawable/card_ru030.png      | Bin
 .../res/drawable/hand_card_horizontal.png     | Bin
 .../main/res/drawable/hand_card_vertical.png  | Bin
 .../main/res/drawable/ic_action_nfc_gray.png  | Bin
 .../main/res/drawable/ic_logo_bat_token.png   | Bin
 .../src/main/res/drawable/ic_logo_bitcoin.png | Bin
 .../res/drawable/ic_logo_bitcoin_cash.png     | Bin
 .../res/drawable/ic_logo_bitcoin_testnet.png  | Bin
 .../main/res/drawable/ic_logo_ethereum.png    | Bin
 .../res/drawable/ic_logo_ethereum_testnet.png | Bin
 .../src/main/res/drawable/ic_logo_seed.png    | Bin
 .../src/main/res/drawable/ic_logo_unknown.png | Bin
 .../src/main/res/drawable/tangem2.png         | Bin
 .../src/main/res/values/strings.xml           |   0
 .../tangemcard/android/ExampleUnitTest.java   |  17 +
 tangemcard-common/.gitignore                  |   1 +
 tangemcard-common/build.gradle                |  12 +
 .../com/tangem/tangemcard/data/Issuer.java    |  41 +-
 .../tangem/tangemcard/data/Manufacturer.java  |   0
 .../tangem/tangemcard/data/TangemCard.java    | 410 ++++++++----------
 .../CardDataSubstitutionProvider.java         |   7 +
 .../external/FirmwaresDigestsProvider.java    |  14 +
 .../data/external/PINsProvider.java           |  11 +
 .../tangem/tangemcard/reader/CardCrypto.java  |   3 +-
 .../tangemcard/reader/CardProtocol.java       |  72 +--
 .../tangem/tangemcard/reader/CommandApdu.java |   0
 .../com/tangem/tangemcard/reader/INS.java     |   0
 .../tangem/tangemcard/reader/NfcReader.java   |  20 +
 .../tangemcard/reader/ResponseApdu.java       |   0
 .../java/com/tangem/tangemcard/reader/SW.java |   0
 .../tangemcard/reader/SettingsMask.java       |  67 +++
 .../com/tangem/tangemcard/reader/TLV.java     |  29 +-
 .../tangemcard/reader/TLVException.java       |   0
 .../com/tangem/tangemcard/reader/TLVList.java |   4 +-
 .../tangemcard/tasks/CreateNewWalletTask.java |  15 +-
 .../tangemcard/tasks/CustomReadCardTask.java  |  60 ++-
 .../tangem/tangemcard/tasks/PurgeTask.java    |  14 +-
 .../tangemcard/tasks/ReadCardInfoTask.java    |  18 +-
 .../com/tangem/tangemcard/tasks/SignTask.java |  22 +-
 .../tangem/tangemcard/tasks/SwapPINTask.java  |  13 +-
 .../tangemcard/tasks/VerifyCardTask.java      |  25 +-
 .../java/com/tangem/tangemcard/util/Log.java  |  13 +
 .../com/tangem/tangemcard/util/PBKDF2.java    |   0
 .../java/com/tangem/tangemcard/util/Util.java |  37 +-
 tangemcard/src/main/AndroidManifest.xml       |  16 -
 .../tangemcard/reader/SettingsMask.java       |  27 --
 tangemserver-android/.gitignore               |   1 +
 tangemserver-android/build.gradle             |  47 ++
 tangemserver-android/proguard-rules.pro       |  21 +
 .../tangemserver/ExampleInstrumentedTest.java |  26 ++
 .../src/main/AndroidManifest.xml              |   5 +
 .../tangem/tangemserver/android}/Server.java  |   2 +-
 .../android}/ServerApiTangem.java             |   4 +-
 .../tangemserver/android}/ServerURL.java      |   2 +-
 .../tangemserver/android}/TangemApi.java      |   4 +-
 .../android/data}/LocalStorage.kt             |  19 +-
 .../android}/model/CardVerify.java            |   2 +-
 .../android}/model/CardVerifyAndGetInfo.kt    |   2 +-
 .../src/main/res/values/strings.xml           |   3 +
 .../tangem/tangemserver}/ExampleUnitTest.java |   2 +-
 124 files changed, 1067 insertions(+), 706 deletions(-)
 rename {tangemcard/src/main/java/com/tangem/tangemcard => app/src/main/java/com/tangem}/data/Blockchain.java (98%)
 rename {tangemcard => tangemcard-android}/.gitignore (100%)
 rename {tangemcard => tangemcard-android}/build.gradle (75%)
 rename {tangemcard => tangemcard-android}/proguard-rules.pro (100%)
 rename {tangemcard/src/androidTest/java/com/tangem/tangemcard => tangemcard-android/src/androidTest/java/com/tangem/tangemcard/android}/ExampleInstrumentedTest.java (94%)
 create mode 100644 tangemcard-android/src/main/AndroidManifest.xml
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data/local => tangemcard-android/src/main/java/com/tangem/tangemcard/android/data}/Firmwares.java (75%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data/local => tangemcard-android/src/main/java/com/tangem/tangemcard/android/data}/PINStorage.java (93%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data => tangemcard-android/src/main/java/com/tangem/tangemcard/android}/nfc/DeviceNFCAntennaLocation.kt (95%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data => tangemcard-android/src/main/java/com/tangem/tangemcard/android}/nfc/NFCLocation.kt (99%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard => tangemcard-android/src/main/java/com/tangem/tangemcard/android}/presentation/dialog/NfcEnableDialog.kt (95%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard => tangemcard-android/src/main/java/com/tangem/tangemcard/android}/reader/NfcManager.java (97%)
 create mode 100644 tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt
 create mode 100644 tangemcard-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_default.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru006.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru007.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru011.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru012.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru013.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru014.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru015.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru016.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru020.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru021.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru022.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru023.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru024.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru028.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru029.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/card_ru030.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/hand_card_horizontal.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/hand_card_vertical.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/ic_action_nfc_gray.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/ic_logo_bat_token.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/ic_logo_bitcoin.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/ic_logo_bitcoin_cash.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/ic_logo_bitcoin_testnet.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/ic_logo_ethereum.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/ic_logo_ethereum_testnet.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/ic_logo_seed.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/ic_logo_unknown.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/drawable/tangem2.png (100%)
 rename {tangemcard => tangemcard-android}/src/main/res/values/strings.xml (100%)
 create mode 100644 tangemcard-android/src/test/java/com/tangem/tangemcard/android/ExampleUnitTest.java
 create mode 100644 tangemcard-common/.gitignore
 create mode 100644 tangemcard-common/build.gradle
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/data/Issuer.java (72%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/data/Manufacturer.java (100%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/data/TangemCard.java (61%)
 create mode 100644 tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/CardDataSubstitutionProvider.java
 create mode 100644 tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/FirmwaresDigestsProvider.java
 create mode 100644 tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/PINsProvider.java
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/reader/CardCrypto.java (99%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/reader/CardProtocol.java (97%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/reader/CommandApdu.java (100%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/reader/INS.java (100%)
 create mode 100644 tangemcard-common/src/main/java/com/tangem/tangemcard/reader/NfcReader.java
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/reader/ResponseApdu.java (100%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/reader/SW.java (100%)
 create mode 100644 tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/reader/TLV.java (78%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/reader/TLVException.java (100%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/reader/TLVList.java (94%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/tasks/CreateNewWalletTask.java (57%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/tasks/CustomReadCardTask.java (90%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/tasks/PurgeTask.java (53%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/tasks/ReadCardInfoTask.java (71%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/tasks/SignTask.java (71%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/tasks/SwapPINTask.java (57%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/tasks/VerifyCardTask.java (58%)
 create mode 100644 tangemcard-common/src/main/java/com/tangem/tangemcard/util/Log.java
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/util/PBKDF2.java (100%)
 rename {tangemcard => tangemcard-common}/src/main/java/com/tangem/tangemcard/util/Util.java (97%)
 delete mode 100644 tangemcard/src/main/AndroidManifest.xml
 delete mode 100644 tangemcard/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java
 create mode 100644 tangemserver-android/.gitignore
 create mode 100644 tangemserver-android/build.gradle
 create mode 100644 tangemserver-android/proguard-rules.pro
 create mode 100644 tangemserver-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java
 create mode 100644 tangemserver-android/src/main/AndroidManifest.xml
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data/network => tangemserver-android/src/main/java/com/tangem/tangemserver/android}/Server.java (92%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data/network => tangemserver-android/src/main/java/com/tangem/tangemserver/android}/ServerApiTangem.java (97%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data/network => tangemserver-android/src/main/java/com/tangem/tangemserver/android}/ServerURL.java (66%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data/network => tangemserver-android/src/main/java/com/tangem/tangemserver/android}/TangemApi.java (84%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data/local => tangemserver-android/src/main/java/com/tangem/tangemserver/android/data}/LocalStorage.kt (97%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data/network => tangemserver-android/src/main/java/com/tangem/tangemserver/android}/model/CardVerify.java (80%)
 rename {tangemcard/src/main/java/com/tangem/tangemcard/data/network => tangemserver-android/src/main/java/com/tangem/tangemserver/android}/model/CardVerifyAndGetInfo.kt (96%)
 create mode 100644 tangemserver-android/src/main/res/values/strings.xml
 rename {tangemcard/src/test/java/com/tangem/tangemcard => tangemserver-android/src/test/java/com/tangem/tangemserver}/ExampleUnitTest.java (91%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 255a33e953..ada7acbd0c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,7 +9,9 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/tangemcard" />
+            <option value="$PROJECT_DIR$/tangemcard-android" />
+            <option value="$PROJECT_DIR$/tangemcard-common" />
+            <option value="$PROJECT_DIR$/tangemserver-android" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/app/build.gradle b/app/build.gradle
index 4edcf50124..c252361570 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,9 @@ android {
 }
 
 dependencies {
-    implementation project(':tangemcard')
+    implementation project(':tangemcard-common')
+    implementation project(':tangemcard-android')
+    implementation project(':tangemserver-android')
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support:support-compat:28.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ac8f4dbac1..033a88b840 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
         android:required="true" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/app/src/main/java/com/tangem/App.java b/app/src/main/java/com/tangem/App.java
index f99acd8605..1fc6a45aaf 100644
--- a/app/src/main/java/com/tangem/App.java
+++ b/app/src/main/java/com/tangem/App.java
@@ -3,13 +3,25 @@ package com.tangem;
 import android.app.Application;
 import android.support.v7.app.AppCompatDelegate;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.tangem.tangemserver.android.data.LocalStorage;
 import com.tangem.di.DaggerNavigatorComponent;
 import com.tangem.di.DaggerNetworkComponent;
 import com.tangem.di.NavigatorComponent;
 import com.tangem.di.NetworkComponent;
 import com.tangem.tangemcard.data.Issuer;
-import com.tangem.tangemcard.data.local.Firmwares;
-import com.tangem.tangemcard.data.local.PINStorage;
+import com.tangem.tangemcard.android.data.Firmwares;
+import com.tangem.tangemcard.android.data.PINStorage;
+import com.tangem.tangemcard.data.external.FirmwaresDigestsProvider;
+import com.tangem.tangemcard.data.external.PINsProvider;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 
 public class App extends Application {
 
@@ -33,6 +45,10 @@ public class App extends Application {
         return navigatorComponent;
     }
 
+    public static LocalStorage localStorage;
+    public static PINsProvider pinStorage;
+    public static FirmwaresDigestsProvider firmwaresStorage;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -46,11 +62,13 @@ public class App extends Application {
         if (PINStorage.needInit())
             PINStorage.init(getApplicationContext());
 
-        if (Issuer.needInit())
-            Issuer.init(getApplicationContext());
+        initIssuers();
 
-        if (Firmwares.needInit())
-            Firmwares.init(getApplicationContext());
+        firmwaresStorage=new Firmwares(getApplicationContext());
+
+        localStorage=new LocalStorage(getApplicationContext());
+
+        pinStorage=new PINStorage();
     }
 
     /**
@@ -69,4 +87,21 @@ public class App extends Application {
                 .build();
     }
 
+
+    public void initIssuers() {
+        try {
+            try (InputStream is = getApplicationContext().getAssets().open("issuers.json")) {
+                try (InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
+                    Type listType = new TypeToken<List<Issuer>>() {
+                    }.getType();
+
+
+                    Issuer.fillIssuers(new Gson().fromJson(reader, listType));
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/Blockchain.java b/app/src/main/java/com/tangem/data/Blockchain.java
similarity index 98%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/Blockchain.java
rename to app/src/main/java/com/tangem/data/Blockchain.java
index 07e6fe64b4..28d38c45df 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/Blockchain.java
+++ b/app/src/main/java/com/tangem/data/Blockchain.java
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard.data;
+package com.tangem.data;
 
 import com.tangem.tangemcard.R;
 
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 401e5c4018..9f1daeeae7 100644
--- a/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java
+++ b/app/src/main/java/com/tangem/data/fingerprint/StartFingerprintReaderTask.java
@@ -8,7 +8,7 @@ import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyPermanentlyInvalidatedException;
 import android.security.keystore.KeyProperties;
 
-import com.tangem.tangemcard.data.local.PINStorage;
+import com.tangem.tangemcard.android.data.PINStorage;
 import com.tangem.presentation.activity.PinRequestActivity;
 
 import java.io.IOException;
diff --git a/app/src/main/java/com/tangem/data/network/ServerApiCommon.java b/app/src/main/java/com/tangem/data/network/ServerApiCommon.java
index ea5539b26a..cc0fc7edcc 100644
--- a/app/src/main/java/com/tangem/data/network/ServerApiCommon.java
+++ b/app/src/main/java/com/tangem/data/network/ServerApiCommon.java
@@ -5,16 +5,7 @@ import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.tangem.App;
-import com.tangem.tangemcard.data.network.TangemApi;
-import com.tangem.tangemcard.data.network.model.CardVerifyAndGetInfo;
 import com.tangem.data.network.model.RateInfoResponse;
-import com.tangem.tangemcard.data.TangemCard;
-import com.tangem.tangemcard.util.Util;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
diff --git a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java
index e61d44dff5..227a6d9812 100644
--- a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java
+++ b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java
@@ -3,8 +3,8 @@ package com.tangem.data.network;
 import android.util.Log;
 
 import com.tangem.App;
-import com.tangem.tangemcard.data.Blockchain;
-import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.domain.wallet.TangemContext;
+import com.tangem.data.Blockchain;
 import com.tangem.domain.wallet.bch.BitcoinCashNode;
 import com.tangem.domain.wallet.btc.BitcoinNode;
 import com.tangem.domain.wallet.btc.BitcoinNodeTestNet;
@@ -62,9 +62,9 @@ public class ServerApiElectrum {
         electrumRequestDataListener = listener;
     }
 
-    public void electrumRequestData(TangemCard card, ElectrumRequest electrumRequest) {
+    public void electrumRequestData(TangemContext ctx, ElectrumRequest electrumRequest) {
         Observable<ElectrumRequest> checkElectrumDataObserver = Observable.just(electrumRequest)
-                .doOnNext(electrumRequest1 -> doElectrumRequest(card, electrumRequest))
+                .doOnNext(electrumRequest1 -> doElectrumRequest(ctx, electrumRequest))
 
                 .flatMap(electrumRequest1 -> {
                     if (electrumRequest1.answerData == null) {
@@ -106,11 +106,11 @@ public class ServerApiElectrum {
         });
     }
 
-    private List<ElectrumRequest> doElectrumRequest(TangemCard card, ElectrumRequest electrumRequest) {
+    private List<ElectrumRequest> doElectrumRequest(TangemContext ctx, ElectrumRequest electrumRequest) {
         String host;
         int port;
         String proto;
-        if (card.getBlockchain() == Blockchain.BitcoinTestNet) {
+        if (ctx.getBlockchain() == Blockchain.BitcoinTestNet) {
             BitcoinNodeTestNet bitcoinNodeTestNet = BitcoinNodeTestNet.values()[new Random().nextInt(BitcoinNodeTestNet.values().length)];
             host = bitcoinNodeTestNet.getHost();
             port = bitcoinNodeTestNet.getPort();
@@ -120,7 +120,7 @@ public class ServerApiElectrum {
 
             return doElectrumRequestTcp(electrumRequest, host, port);
 
-        } else if (card.getBlockchain() == Blockchain.BitcoinCash) {
+        } else if (ctx.getBlockchain() == Blockchain.BitcoinCash) {
             BitcoinCashNode bitcoinCashNode = BitcoinCashNode.values()[new Random().nextInt(BitcoinCashNode.values().length)];
             host = bitcoinCashNode.getHost();
             port = bitcoinCashNode.getPort();
@@ -135,7 +135,7 @@ public class ServerApiElectrum {
                 return doElectrumRequestSsl(electrumRequest, host, port);
             }
 
-        } else if (card.getBlockchain() == Blockchain.Bitcoin) {
+        } else if (ctx.getBlockchain() == Blockchain.Bitcoin) {
             BitcoinNode bitcoinNode = BitcoinNode.values()[new Random().nextInt(BitcoinNode.values().length)];
             host = bitcoinNode.getHost();
             port = bitcoinNode.getPort();
diff --git a/app/src/main/java/com/tangem/di/Navigator.kt b/app/src/main/java/com/tangem/di/Navigator.kt
index 79d5732855..7aee2a29ce 100644
--- a/app/src/main/java/com/tangem/di/Navigator.kt
+++ b/app/src/main/java/com/tangem/di/Navigator.kt
@@ -2,16 +2,12 @@ package com.tangem.di
 
 import android.app.Activity
 import android.nfc.Tag
-import android.os.Bundle
 import com.tangem.Constant
-import com.tangem.domain.wallet.CoinData
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.presentation.activity.EmptyWalletActivity
 import com.tangem.presentation.activity.LoadedWalletActivity
 import com.tangem.presentation.activity.MainActivity
 import com.tangem.presentation.activity.VerifyCardActivity
-import com.tangem.presentation.fragment.LoadedWallet
-import com.tangem.tangemcard.data.TangemCard
 import com.tangem.presentation.activity.*
 
 class Navigator {
diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinData.java b/app/src/main/java/com/tangem/domain/wallet/CoinData.java
index b64f8f8cb3..1fe6c38df8 100644
--- a/app/src/main/java/com/tangem/domain/wallet/CoinData.java
+++ b/app/src/main/java/com/tangem/domain/wallet/CoinData.java
@@ -3,7 +3,7 @@ package com.tangem.domain.wallet;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.tangem.tangemcard.data.Blockchain;
+import com.tangem.data.Blockchain;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
index ede4dee25f..15c5c6ebee 100644
--- a/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/CoinEngine.java
@@ -3,12 +3,10 @@ package com.tangem.domain.wallet;
 import android.net.Uri;
 import android.text.InputFilter;
 
-import com.tangem.tangemcard.data.Blockchain;
+import com.tangem.data.Blockchain;
 import com.tangem.tangemcard.reader.CardProtocol;
 import com.tangem.tangemcard.tasks.SignTask;
 
-import org.jetbrains.annotations.Nullable;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
diff --git a/app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt b/app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt
index f8b9e47d62..2d8e4f64ab 100644
--- a/app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt
+++ b/app/src/main/java/com/tangem/domain/wallet/CoinEngineFactory.kt
@@ -6,7 +6,7 @@ import com.tangem.domain.wallet.btc.BtcEngine
 import com.tangem.domain.wallet.eth.EthEngine
 import com.tangem.domain.wallet.token.TokenEngine
 import com.tangem.domain.wallet.bch.BtcCashEngine
-import com.tangem.tangemcard.data.Blockchain
+import com.tangem.data.Blockchain
 
 /**
  * Factory for create specific engine
diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java
index 77d7954639..8f1c9b06a3 100644
--- a/app/src/main/java/com/tangem/domain/wallet/TangemContext.java
+++ b/app/src/main/java/com/tangem/domain/wallet/TangemContext.java
@@ -5,8 +5,9 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.tangem.Constant;
-import com.tangem.tangemcard.data.Blockchain;
+import com.tangem.data.Blockchain;
 import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.tangemcard.data.TangemCardExtensionsKt;
 
 
 public class TangemContext {
@@ -17,7 +18,6 @@ public class TangemContext {
     private String error;
     private String message;
 
-
     public TangemContext() {
 
     }
@@ -28,12 +28,29 @@ public class TangemContext {
 
     public Blockchain getBlockchain() {
         if (card == null) return Blockchain.Unknown;
-        return card.getBlockchain();
+        Blockchain blockchain=Blockchain.fromId(card.getBlockchainID());
+        if( (blockchain==Blockchain.Ethereum || blockchain==Blockchain.EthereumTestNet)&& card.isToken() )
+        {
+            return Blockchain.Token;
+        }
+        return blockchain;
     }
 
-    public void setBlockchain(Blockchain blockchain) {
-        if (card == null) return;
-        card.setBlockchain(blockchain);
+//    public void setBlockchain(Blockchain blockchain) {
+//        if (card == null) return;
+//        card.setBlockchainID(blockchain.getID());
+//    }
+
+//    private String blockchainName = "";
+
+    public String getBlockchainName() {
+        Blockchain blockchain=getBlockchain();
+        if( (blockchain==Blockchain.Ethereum || blockchain==Blockchain.EthereumTestNet)&& card.isToken() ) {
+            String token = card.getTokenSymbol();
+            return token + " <br><small><small> " + getBlockchain().getOfficialName() + " ERC20 token</small></small>";
+        }else {
+            return blockchain.getOfficialName();
+        }
     }
 
     public Context getContext() {
@@ -85,9 +102,9 @@ public class TangemContext {
         TangemContext tangemContext = new TangemContext();
         tangemContext.setContext(context);
 
-        if (bundle.containsKey(TangemCard.EXTRA_UID)) {
-            tangemContext.card = new TangemCard(bundle.getString(TangemCard.EXTRA_UID));
-            tangemContext.card.loadFromBundle(bundle.getBundle(TangemCard.EXTRA_CARD));
+        if (bundle.containsKey(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID)) {
+            tangemContext.card = new TangemCard(bundle.getString(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID));
+            TangemCardExtensionsKt.loadFromBundle(tangemContext.card, bundle.getBundle(TangemCardExtensionsKt.EXTRA_TANGEM_CARD));
         }
 
         if (tangemContext.getBlockchain() != null) {
@@ -106,8 +123,8 @@ public class TangemContext {
     public void saveToIntent(Intent intent) {
 
         if (card != null) {
-            intent.putExtra(TangemCard.EXTRA_UID, card.getUID());
-            intent.putExtra(TangemCard.EXTRA_CARD, card.getAsBundle());
+            intent.putExtra(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID, card.getUID());
+            intent.putExtra(TangemCardExtensionsKt.EXTRA_TANGEM_CARD, TangemCardExtensionsKt.getAsBundle(card));
         }
 
         if (coinData != null) {
diff --git a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java
index 44f98ae69f..bc0d12357d 100644
--- a/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/bch/BtcCashEngine.java
@@ -4,12 +4,9 @@ import android.net.Uri;
 import android.text.InputFilter;
 
 import com.tangem.domain.wallet.BCHUtils;
-import com.tangem.tangemcard.data.local.PINStorage;
 import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.reader.TLV;
 import com.tangem.domain.wallet.BalanceValidator;
-import com.tangem.tangemcard.data.Blockchain;
-import com.tangem.domain.wallet.CoinEngineFactory;
+import com.tangem.data.Blockchain;
 import com.tangem.domain.wallet.btc.BtcData;
 import com.tangem.domain.wallet.CoinData;
 import com.tangem.domain.wallet.CoinEngine;
diff --git a/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java
index b5643b73ac..2fab6a6467 100644
--- a/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/btc/BtcEngine.java
@@ -3,12 +3,10 @@ package com.tangem.domain.wallet.btc;
 import android.net.Uri;
 import android.text.InputFilter;
 
-import com.tangem.tangemcard.data.local.PINStorage;
 import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.reader.TLV;
 import com.tangem.domain.wallet.BalanceValidator;
 import com.tangem.domain.wallet.Base58;
-import com.tangem.tangemcard.data.Blockchain;
+import com.tangem.data.Blockchain;
 import com.tangem.domain.wallet.CoinData;
 import com.tangem.domain.wallet.CoinEngine;
 import com.tangem.tangemcard.data.TangemCard;
diff --git a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java
index 7614c9a2c7..c467879cc9 100644
--- a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java
@@ -4,16 +4,12 @@ import android.net.Uri;
 import android.text.InputFilter;
 import android.util.Log;
 
-import com.tangem.tangemcard.data.local.PINStorage;
-import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.reader.TLV;
 import com.tangem.domain.wallet.BalanceValidator;
-import com.tangem.tangemcard.data.Blockchain;
+import com.tangem.data.Blockchain;
 import com.tangem.domain.wallet.CoinData;
 import com.tangem.domain.wallet.CoinEngine;
 import com.tangem.domain.wallet.ECDSASignatureETH;
 import com.tangem.domain.wallet.EthTransaction;
-import com.tangem.tangemcard.data.Issuer;
 import com.tangem.domain.wallet.Keccak256;
 import com.tangem.tangemcard.data.TangemCard;
 import com.tangem.domain.wallet.TangemContext;
@@ -236,7 +232,7 @@ public class EthEngine extends CoinEngine {
 
     @Override
     public Uri getShareWalletUriExplorer() {
-        if (ctx.getCard().getBlockchain() == Blockchain.EthereumTestNet)
+        if (ctx.getBlockchain() == Blockchain.EthereumTestNet)
             return Uri.parse("https://rinkeby.etherscan.io/address/" + ctx.getCoinData().getWallet());
         else
             return Uri.parse("https://etherscan.io/address/" + ctx.getCoinData().getWallet());
diff --git a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java
index bfcd0a4d34..b6d67206eb 100644
--- a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java
@@ -5,16 +5,11 @@ import android.text.InputFilter;
 import android.util.Log;
 
 import com.google.common.base.Strings;
-import com.tangem.tangemcard.data.Blockchain;
-import com.tangem.tangemcard.data.local.PINStorage;
-import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.reader.TLV;
 import com.tangem.domain.wallet.BalanceValidator;
 import com.tangem.domain.wallet.CoinData;
 import com.tangem.domain.wallet.CoinEngine;
 import com.tangem.domain.wallet.ECDSASignatureETH;
 import com.tangem.domain.wallet.EthTransaction;
-import com.tangem.tangemcard.data.Issuer;
 import com.tangem.domain.wallet.Keccak256;
 import com.tangem.tangemcard.data.TangemCard;
 import com.tangem.domain.wallet.TangemContext;
diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
index 2aaa34670b..93dc3ab3af 100644
--- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
@@ -18,11 +18,12 @@ import com.tangem.data.network.ServerApiCommon
 import com.tangem.data.network.ServerApiElectrum
 import com.tangem.data.network.ServerApiInfura
 import com.tangem.data.network.model.InfuraResponse
-import com.tangem.tangemcard.reader.NfcManager
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.domain.wallet.*
 import com.tangem.domain.wallet.btc.BtcData
-import com.tangem.tangemcard.data.Blockchain
+import com.tangem.data.Blockchain
 import com.tangem.tangemcard.data.TangemCard
+import com.tangem.tangemcard.data.loadFromBundle
 import com.tangem.tangemcard.util.Util
 import com.tangem.util.*
 import com.tangem.wallet.R
@@ -456,9 +457,9 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
         return realTX.size
     }
 
-    private fun requestElectrum(card: TangemCard, electrumRequest: ElectrumRequest) {
+    private fun requestElectrum(ctx: TangemContext, electrumRequest: ElectrumRequest) {
         if (UtilHelper.isOnline(this)) {
-            serverApiElectrum.electrumRequestData(card, electrumRequest)
+            serverApiElectrum.electrumRequestData(ctx, electrumRequest)
         } else
             finishWithError(Activity.RESULT_CANCELED, getString(R.string.cannot_obtain_data_from_blockchain))
     }
diff --git a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt
index 0915beda6b..6c6c2da8d3 100644
--- a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt
@@ -12,13 +12,16 @@ import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.widget.ProgressBar
 import android.widget.Toast
+import com.tangem.App
 import com.tangem.tangemcard.tasks.CreateNewWalletTask
 import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.reader.NfcManager
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.WaitSecurityDelayDialog
+import com.tangem.tangemcard.android.reader.NfcReader
 import com.tangem.tangemcard.util.Util
+import com.tangem.tangemcard.data.asBundle
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_create_new_wallet.*
 
@@ -31,7 +34,7 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
     }
 
     private lateinit var ctx: TangemContext
-    private var nfcManager: NfcManager? = null
+    private lateinit var nfcManager: NfcManager
 
     private var createNewWalletTask: CreateNewWalletTask? = null
     private var lastReadSuccess = true
@@ -70,7 +73,7 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
                 } else {
                     isoDep.timeout = ctx.card!!.pauseBeforePIN2 + 65000
                 }
-                createNewWalletTask = CreateNewWalletTask(this, ctx.card, nfcManager, isoDep, this)
+                createNewWalletTask = CreateNewWalletTask(ctx.card, NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage,this)
                 createNewWalletTask!!.start()
             } else {
 //                Log.d(TAG, "Mismatch card UID (" + sUID + " instead of " + mCard.getUID() + ")");
@@ -137,7 +140,7 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback,
                             val intent = Intent()
                             intent.putExtra("message", "Cannot create wallet. Make sure you enter correct PIN2!")
                             intent.putExtra("UID", cardProtocol.card.uid)
-                            intent.putExtra("Card", cardProtocol.card.asBundle)
+                            intent.putExtra("Card", cardProtocol.card!!.asBundle)
                             setResult(RESULT_INVALID_PIN, intent)
                             finish()
                         } catch (e: Exception) {
diff --git a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt
index dcdda83775..19532e4713 100644
--- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt
@@ -13,13 +13,18 @@ import android.support.v7.app.AppCompatActivity
 import android.text.Html
 import android.view.View
 import android.widget.Toast
+import com.tangem.App
+import com.tangem.di.Navigator
 import com.tangem.tangemcard.tasks.VerifyCardTask
 import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.reader.NfcManager
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.data.TangemCard
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.WaitSecurityDelayDialog
+import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.tangemcard.data.asBundle
+import com.tangem.tangemcard.data.loadFromBundle
 import com.tangem.tangemcard.util.Util
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_empty_wallet.*
@@ -40,7 +45,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
         }
     }
 
-    private var nfcManager: NfcManager? = null
+    private lateinit var nfcManager: NfcManager
     private lateinit var ctx: TangemContext
     private var lastReadSuccess = true
     private var verifyCardTask: VerifyCardTask? = null
@@ -59,15 +64,15 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
         tvIssuer.text = ctx.card!!.issuerDescription
         //tvBlockchain.text = ctx.card!!.blockchainName
         if (ctx.card!!.tokenSymbol.length > 1) {
-            val html = Html.fromHtml(ctx.card!!.blockchainName)
+            val html = Html.fromHtml(ctx.blockchainName)
             tvBlockchain.text = html
         } else
-            tvBlockchain.text = ctx.card!!.blockchainName
+            tvBlockchain.text = ctx.blockchainName
 
         tvCardID.text = ctx.card!!.cidDescription
-        imgBlockchain.setImageResource(ctx.card!!.blockchain.getImageResource(this, ctx.card!!.tokenSymbol))
+        imgBlockchain.setImageResource(ctx.blockchain.getImageResource(this, ctx.card!!.tokenSymbol))
 
-        if (ctx.card!!.useDefaultPIN1()!!) {
+        if (ctx.card!!.useDefaultPIN1()) {
             imgPIN.setImageResource(R.drawable.unlock_pin1)
             imgPIN.setOnClickListener { Toast.makeText(this@EmptyWalletActivity, R.string.this_banknote_protected_default_PIN1_code, Toast.LENGTH_LONG).show() }
         } else {
@@ -175,7 +180,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
                 isoDep.timeout = 65000
             }
             //lastTag = tag;
-            verifyCardTask = VerifyCardTask(this, ctx.card, nfcManager, isoDep, this)
+            verifyCardTask = VerifyCardTask(ctx.card, NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, App.firmwaresStorage, this)
             verifyCardTask!!.start()
         } catch (e: Exception) {
             e.printStackTrace()
diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
index 47ed3bf96d..86e7dbe7d3 100644
--- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
@@ -27,21 +27,21 @@ import com.scottyab.rootbeer.RootBeer
 import com.tangem.App
 import com.tangem.Constant
 import com.tangem.data.Logger
-import com.tangem.tangemcard.data.local.PINStorage
 import com.tangem.data.network.ServerApiCommon
-import com.tangem.tangemcard.data.nfc.DeviceNFCAntennaLocation
+import com.tangem.tangemcard.android.nfc.DeviceNFCAntennaLocation
 import com.tangem.tangemcard.tasks.ReadCardInfoTask
 import com.tangem.di.Navigator
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.data.local.Firmwares
-import com.tangem.tangemcard.reader.NfcManager
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.RootFoundDialog
 import com.tangem.presentation.dialog.WaitSecurityDelayDialog
-import com.tangem.tangemcard.data.Issuer
+import com.tangem.tangemcard.android.reader.NfcReader
 import com.tangem.tangemcard.data.TangemCard
+import com.tangem.tangemcard.data.loadFromBundle
+import com.tangem.tangemcard.data.saveToBundle
 import com.tangem.util.CommonUtil
 import com.tangem.util.PhoneUtility
 import com.tangem.wallet.BuildConfig
@@ -70,7 +70,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
 //        }
     }
 
-    private var nfcManager: NfcManager? = null
+    private lateinit var nfcManager: NfcManager
     private var zipFile: File? = null
     private var antenna: DeviceNFCAntennaLocation? = null
     private var unsuccessReadCount = 0
@@ -264,7 +264,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
             }
             lastTag = tag
 
-            readCardInfoTask = ReadCardInfoTask(this, nfcManager, isoDep, this)
+            readCardInfoTask = ReadCardInfoTask(NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, this)
             readCardInfoTask!!.start()
 
 //            Log.i(TAG, "onTagDiscovered " + Arrays.toString(tag.getId()));
diff --git a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt
index a13df1d92c..f979f89619 100644
--- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt
@@ -21,10 +21,13 @@ import android.view.View
 import android.widget.Button
 import com.tangem.Constant
 import com.tangem.data.fingerprint.StartFingerprintReaderTask
-import com.tangem.tangemcard.reader.NfcManager
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.data.fingerprint.FingerprintHelper
-import com.tangem.tangemcard.data.local.PINStorage
+import com.tangem.tangemcard.android.data.PINStorage
 import com.tangem.tangemcard.data.TangemCard
+import com.tangem.tangemcard.data.loadFromBundle
+import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD
+import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_pin_request.*
 import kotlinx.android.synthetic.main.layout_pin_buttons.*
@@ -89,9 +92,9 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge
         else if (mode == Mode.ConfirmNewPIN2)
             tvPinPrompt.setText(R.string.confirm_new_pin_2)
         else if (mode == Mode.RequestPIN2) {
-            val uid = intent.getStringExtra(TangemCard.EXTRA_UID)
+            val uid = intent.getStringExtra(EXTRA_TANGEM_CARD_UID)
             val card = TangemCard(uid)
-            card.loadFromBundle(intent.getBundleExtra(TangemCard.EXTRA_CARD))
+            card.loadFromBundle(intent.getBundleExtra(EXTRA_TANGEM_CARD))
 
             if (card.PIN2 == TangemCard.PIN2_Mode.DefaultPIN2 || card.PIN2 == TangemCard.PIN2_Mode.Unchecked) {
                 // if we know PIN2 or not try default previously - use it
diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt
index 9dbbccf075..ab41c4a2d5 100644
--- a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt
@@ -23,7 +23,7 @@ import android.widget.Toast
 import com.tangem.Constant
 import com.tangem.data.fingerprint.ConfirmWithFingerprintTask
 import com.tangem.data.fingerprint.FingerprintHelper
-import com.tangem.tangemcard.data.local.PINStorage
+import com.tangem.tangemcard.android.data.PINStorage
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_pin_save.*
 import kotlinx.android.synthetic.main.layout_pin_buttons.*
diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt
index 3907eb5f7c..24e5fac3dd 100644
--- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt
@@ -13,13 +13,15 @@ import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.widget.ProgressBar
 import android.widget.Toast
+import com.tangem.App
 import com.tangem.Constant
 import com.tangem.tangemcard.tasks.SwapPINTask
 import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.reader.NfcManager
-import com.tangem.tangemcard.data.TangemCard
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.WaitSecurityDelayDialog
+import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.tangemcard.data.*
 import com.tangem.tangemcard.util.Util
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_pin_swap.*
@@ -39,7 +41,7 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt
         const val RESULT_INVALID_PIN = Activity.RESULT_FIRST_USER
     }
 
-    private var nfcManager: NfcManager? = null
+    private lateinit var nfcManager: NfcManager
     private var card: TangemCard? = null
 
     private var newPIN: String? = null
@@ -57,8 +59,8 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt
 
         nfcManager = NfcManager(this, this)
 
-        card = TangemCard(intent.getStringExtra(TangemCard.EXTRA_UID))
-        card!!.loadFromBundle(intent.extras!!.getBundle(TangemCard.EXTRA_CARD))
+        card = TangemCard(intent.getStringExtra(EXTRA_TANGEM_CARD_UID))
+        card!!.loadFromBundle(intent.extras!!.getBundle(EXTRA_TANGEM_CARD))
 
         newPIN = intent.getStringExtra(Constant.EXTRA_NEW_PIN)
         newPIN2 = intent.getStringExtra(Constant.EXTRA_NEW_PIN_2)
@@ -81,7 +83,7 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt
 
             if (sUID == card!!.uid) {
                 isoDep.timeout = card!!.pauseBeforePIN2 + 65000
-                swapPinTask = SwapPINTask(this, card, nfcManager, newPIN, newPIN2, isoDep, this)
+                swapPinTask = SwapPINTask(card, NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, this, newPIN, newPIN2)
                 swapPinTask!!.start()
             } else {
 //                Log.d(TAG, "Mismatch card UID (" + sUID + " instead of " + mCard!!.uid + ")")
diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt
index 220341a888..03bf1b1378 100644
--- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt
@@ -10,10 +10,10 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.View
 import com.tangem.data.network.CryptonitOtherApi
-import com.tangem.tangemcard.reader.NfcManager
-import com.tangem.tangemcard.data.Blockchain
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
+import com.tangem.data.Blockchain
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_prepare_cryptonit_other_api_withdrawal.*
 import java.io.IOException
diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt
index 21159fe897..1ac026bc44 100644
--- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt
@@ -13,8 +13,8 @@ import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import com.tangem.data.network.Cryptonit
-import com.tangem.tangemcard.reader.NfcManager
-import com.tangem.tangemcard.data.Blockchain
+import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.data.Blockchain
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.util.DecimalDigitsInputFilter
@@ -145,7 +145,7 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade
             rlProgressBar.visibility = View.VISIBLE
             tvProgressDescription.text = getString(R.string.cryptonit_request_balance)
             tvError.visibility = View.INVISIBLE
-            cryptonit!!.requestBalance(ctx.card!!.blockchain.currency)
+            cryptonit!!.requestBalance(ctx.blockchain.currency)
         } else {
             tvError.visibility = View.VISIBLE
             tvError.text = getString(R.string.cryptonit_not_enough_account_data)
diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt
index 8e102caed8..7a7866bede 100644
--- a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt
@@ -16,8 +16,8 @@ import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import com.tangem.data.network.Kraken
-import com.tangem.tangemcard.reader.NfcManager
-import com.tangem.tangemcard.data.Blockchain
+import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.data.Blockchain
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.wallet.R
diff --git a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt
index f421882539..f861c66ca5 100644
--- a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt
@@ -12,8 +12,8 @@ import android.text.Html
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
-import com.tangem.tangemcard.reader.NfcManager
-import com.tangem.tangemcard.data.Blockchain
+import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.data.Blockchain
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.wallet.R
@@ -50,7 +50,7 @@ class PreparePaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
         tvBalance.text = html
 
         //TODO - to engine
-        if (ctx.card!!.blockchain == Blockchain.Token && engine.balance.currency!="ETH") {
+        if (ctx.blockchain == Blockchain.Token && engine.balance.currency!="ETH") {
             rgIncFee!!.visibility = View.INVISIBLE
         } else {
             rgIncFee!!.visibility = View.VISIBLE
@@ -152,7 +152,7 @@ class PreparePaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == REQUEST_CODE_SCAN_QR && resultCode == Activity.RESULT_OK && data != null && data.extras!!.containsKey("QRCode")) {
             var code = data.getStringExtra("QRCode")
-            when (ctx.card!!.blockchain) {
+            when (ctx.blockchain) {
                 Blockchain.Bitcoin -> {
                     if (code.contains("bitcoin:")) {
                         val tmp = code.split("bitcoin:".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
diff --git a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt
index 932f01a659..99a9e11304 100644
--- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt
@@ -12,12 +12,15 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.widget.Toast
+import com.tangem.App
 import com.tangem.tangemcard.tasks.PurgeTask
 import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.reader.NfcManager
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.WaitSecurityDelayDialog
+import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.tangemcard.data.asBundle
 import com.tangem.tangemcard.util.Util
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_purge.*
@@ -30,7 +33,7 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc
     }
 
     private lateinit var ctx: TangemContext
-    private var nfcManager: NfcManager? = null
+    private lateinit var nfcManager: NfcManager
     private var purgeTask: PurgeTask? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -79,7 +82,7 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc
 
             if (sUID == ctx.card!!.uid) {
                 isoDep.timeout = ctx.card!!.pauseBeforePIN2 + 65000
-                purgeTask = PurgeTask(this, ctx.card, nfcManager, isoDep, this)
+                purgeTask = PurgeTask(ctx.card, NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, this)
                 purgeTask!!.start()
             } else {
                 //               this Log.d(TAG, "Mismatch card UID (" + sUID + " instead of " + card.getUID() + ")");
diff --git a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
index 33f141e82f..f91991a62e 100644
--- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
@@ -11,11 +11,10 @@ import com.tangem.data.network.ElectrumRequest
 import com.tangem.data.network.ServerApiElectrum
 import com.tangem.data.network.ServerApiInfura
 import com.tangem.data.network.model.InfuraResponse
-import com.tangem.tangemcard.reader.NfcManager
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.domain.wallet.*
 import com.tangem.domain.wallet.eth.EthData
-import com.tangem.tangemcard.data.Blockchain
-import com.tangem.tangemcard.data.TangemCard
+import com.tangem.data.Blockchain
 import com.tangem.util.UtilHelper
 import com.tangem.wallet.R
 import java.io.IOException
@@ -51,9 +50,9 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
         if (ctx.blockchain == Blockchain.Ethereum || ctx.blockchain == Blockchain.EthereumTestNet || ctx.blockchain == Blockchain.Token)
             requestInfura(ServerApiInfura.INFURA_ETH_SEND_RAW_TRANSACTION, "")
         else if (ctx.blockchain == Blockchain.Bitcoin || ctx.blockchain == Blockchain.BitcoinTestNet)
-            requestElectrum(ctx.card!!, ElectrumRequest.broadcast(ctx.coinData!!.wallet, tx))
+            requestElectrum(ctx, ElectrumRequest.broadcast(ctx.coinData!!.wallet, tx))
         else if (ctx.blockchain == Blockchain.BitcoinCash)
-            requestElectrum(ctx.card!!, ElectrumRequest.broadcast(ctx.coinData!!.wallet, tx))
+            requestElectrum(ctx, ElectrumRequest.broadcast(ctx.coinData!!.wallet, tx))
 
         // request electrum listener
         val electrumBodyListener: ServerApiElectrum.ElectrumRequestDataListener = object : ServerApiElectrum.ElectrumRequestDataListener {
@@ -151,9 +150,9 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
             finishWithError(getString(R.string.no_connection))
     }
 
-    private fun requestElectrum(card: TangemCard, electrumRequest: ElectrumRequest) {
+    private fun requestElectrum(ctx: TangemContext, electrumRequest: ElectrumRequest) {
         if (UtilHelper.isOnline(this)) {
-            serverApiElectrum.electrumRequestData(card, electrumRequest)
+            serverApiElectrum.electrumRequestData(ctx, electrumRequest)
         } else
             finishWithError(getString(R.string.no_connection))
     }
diff --git a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt
index 67bb7e1a78..4466ea5315 100644
--- a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt
@@ -13,15 +13,18 @@ import android.view.KeyEvent
 import android.view.View
 import android.widget.ProgressBar
 import android.widget.Toast
+import com.tangem.App
 import com.tangem.domain.wallet.BTCUtils
 import com.tangem.domain.wallet.CoinEngine
 import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.WaitSecurityDelayDialog
-import com.tangem.tangemcard.data.Blockchain
+import com.tangem.data.Blockchain
 import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.reader.NfcManager
+import com.tangem.tangemcard.android.reader.NfcManager
+import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.tangemcard.data.asBundle
 import com.tangem.tangemcard.tasks.SignTask
 import com.tangem.tangemcard.util.Util
 import com.tangem.wallet.R
@@ -43,7 +46,7 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
         const val RESULT_INVALID_PIN = Activity.RESULT_FIRST_USER
     }
 
-    private var nfcManager: NfcManager? = null
+    private lateinit var nfcManager: NfcManager
     private lateinit var ctx: TangemContext
 
 //    private var signPaymentTask: SignPaymentTask? = null
diff --git a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt
index 622afc27f3..d5e0d083d1 100644
--- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt
@@ -7,9 +7,7 @@ import android.support.v7.app.AppCompatActivity
 import com.tangem.App
 import com.tangem.Constant
 import com.tangem.di.Navigator
-import com.tangem.domain.wallet.CoinData
 import com.tangem.domain.wallet.TangemContext
-import com.tangem.tangemcard.data.TangemCard
 import com.tangem.presentation.fragment.VerifyCard
 import com.tangem.wallet.R
 import javax.inject.Inject
diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
index 8c3bd20cf9..528d9299af 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -19,18 +19,17 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import com.tangem.App
 import com.tangem.Constant
-import com.tangem.tangemcard.data.local.LocalStorage
-import com.tangem.tangemcard.data.local.PINStorage
 import com.tangem.data.network.ElectrumRequest
 import com.tangem.data.network.ServerApiCommon
 import com.tangem.data.network.ServerApiElectrum
 import com.tangem.data.network.ServerApiInfura
-import com.tangem.tangemcard.data.network.model.CardVerifyAndGetInfo
+import com.tangem.tangemserver.android.model.CardVerifyAndGetInfo
 import com.tangem.data.network.model.InfuraResponse
 import com.tangem.tangemcard.tasks.VerifyCardTask
 import com.tangem.tangemcard.reader.CardProtocol
-import com.tangem.tangemcard.reader.NfcManager
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.domain.wallet.*
 import com.tangem.domain.wallet.bch.BtcCashEngine
 import com.tangem.domain.wallet.btc.BtcData
@@ -42,11 +41,14 @@ import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.PINSwapWarningDialog
 import com.tangem.presentation.dialog.ShowQRCodeDialog
 import com.tangem.presentation.dialog.WaitSecurityDelayDialog
-import com.tangem.tangemcard.data.Blockchain
+import com.tangem.data.Blockchain
+import com.tangem.tangemcard.android.reader.NfcReader
+import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD
+import com.tangem.tangemcard.data.EXTRA_TANGEM_CARD_UID
 import com.tangem.tangemcard.data.TangemCard
-import com.tangem.tangemcard.data.network.Server
-import com.tangem.tangemcard.data.network.ServerApiTangem
+import com.tangem.tangemcard.data.loadFromBundle
 import com.tangem.tangemcard.util.Util
+import com.tangem.tangemserver.android.ServerApiTangem
 import com.tangem.util.UtilHelper
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.fr_loaded_wallet.*
@@ -60,7 +62,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
         val TAG: String = LoadedWallet::class.java.simpleName
     }
 
-    private var nfcManager: NfcManager? = null
+    private lateinit var nfcManager: NfcManager
 
     private var serverApiCommon: ServerApiCommon = ServerApiCommon()
     private var serverApiInfura: ServerApiInfura = ServerApiInfura()
@@ -82,7 +84,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
     private val activeColor: ColorStateList by lazy { resources.getColorStateList(R.color.colorAccent) }
     private var requestCounter = 0
     private var timerRepeatRefresh: Timer? = null
-    private lateinit var localStorage: LocalStorage
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -92,7 +93,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
 
         lastTag = activity?.intent?.getParcelableExtra(Constant.EXTRA_LAST_DISCOVERED_TAG)
 
-        localStorage = activity?.let { LocalStorage(it) }!!
+        //localStorage = activity?.let { CardDataSubstitutionProvider(it) }!!
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -105,7 +106,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
         if (ctx.blockchain == Blockchain.Token)
             tvBalance.setSingleLine(false)
 
-        ivTangemCard.setImageBitmap(localStorage.getCardArtworkBitmap(ctx.card))
+        ivTangemCard.setImageBitmap(App.localStorage.getCardArtworkBitmap(ctx.card))
 
         btnExtract.isEnabled = false
         btnExtract.backgroundTintList = inactiveColor
@@ -419,18 +420,20 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
 
                 if (!result.passed) return
 
-                if (localStorage.checkBatchInfoChanged(ctx.card!!, result)) {
+                if (App.localStorage.checkBatchInfoChanged(ctx.card!!, result)) {
                     Log.w(TAG, "Batch ${result.batch} info  changed to '$result'")
-                    ivTangemCard.setImageBitmap(localStorage.getCardArtworkBitmap(ctx.card!!))
-                    localStorage.applySubstitution(ctx.card!!)
-                    if (ctx.card!!.blockchain == Blockchain.Token || ctx.card!!.blockchain == Blockchain.Ethereum) {
-                        ctx.card!!.setBlockchainIDFromCard(Blockchain.Ethereum.id)
+                    ivTangemCard.setImageBitmap(App.localStorage.getCardArtworkBitmap(ctx.card!!))
+                    App.localStorage.applySubstitution(ctx.card!!)
+                    //todo - check this is not need after refactoring
+//                    if (ctx.blockchain == Blockchain.Token || ctx.blockchain == Blockchain.Ethereum) {
+//                        ctx.card!!.setBlockchainIDFromCard(Blockchain.Ethereum.id)
+
                         //ctx.blockchain=Blockchain.Ethereum
                         //engine=engine!!.swithToOtherEngine(Blockchain.Ethereum)
-                    }
+//                    }
                     refresh()
                 }
-                if (result.artwork != null && localStorage.checkNeedUpdateArtwork(result.artwork)) {
+                if (result.artwork != null && App.localStorage.checkNeedUpdateArtwork(result.artwork)) {
                     Log.w(TAG, "Artwork '${result.artwork!!.id}' updated, need download")
                     serverApiTangem.requestArtwork(result.artwork!!.id, result.artwork!!.getUpdateDate(), ctx.card!!)
                     updateViews()
@@ -447,8 +450,8 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
         // request artwork listener
         val artworkListener: ServerApiTangem.ArtworkListener = object : ServerApiTangem.ArtworkListener {
             override fun onSuccess(artworkId: String?, inputStream: InputStream?, updateDate: Date?) {
-                localStorage.updateArtwork(artworkId!!, inputStream!!, updateDate!!)
-                ivTangemCard.setImageBitmap(localStorage.getCardArtworkBitmap(ctx.card!!))
+                App.localStorage.updateArtwork(artworkId!!, inputStream!!, updateDate!!)
+                ivTangemCard.setImageBitmap(App.localStorage.getCardArtworkBitmap(ctx.card!!))
             }
 
             override fun onFail(message: String?) {
@@ -538,12 +541,12 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                     newPIN = ctx.card!!.pin
 
                 if (newPIN2 == "")
-                    newPIN2 = PINStorage.getPIN2()
+                    newPIN2 = App.pinStorage.piN2
 
                 val pinSwapWarningDialog = PINSwapWarningDialog()
                 pinSwapWarningDialog.setOnRefreshPage { (activity as LoadedWalletActivity).navigator.showPinSwap(context as Activity, newPIN, newPIN2) }
                 val bundle = Bundle()
-                if (!PINStorage.isDefaultPIN(newPIN) || !PINStorage.isDefaultPIN2(newPIN2))
+                if (!CardProtocol.isDefaultPIN(newPIN) || !CardProtocol.isDefaultPIN2(newPIN2))
                     bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_forget))
                 else
                     bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_use_default))
@@ -563,9 +566,9 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                 activity?.finish()
 
             } else {
-                if (data != null && data.extras != null && data.extras!!.containsKey(TangemCard.EXTRA_UID) && data.extras!!.containsKey(TangemCard.EXTRA_CARD)) {
-                    val updatedCard = TangemCard(data.getStringExtra(TangemCard.EXTRA_UID))
-                    updatedCard.loadFromBundle(data.getBundleExtra(TangemCard.EXTRA_CARD))
+                if (data != null && data.extras != null && data.extras!!.containsKey(EXTRA_TANGEM_CARD_UID) && data.extras!!.containsKey(EXTRA_TANGEM_CARD)) {
+                    val updatedCard = TangemCard(data.getStringExtra(EXTRA_TANGEM_CARD_UID))
+                    updatedCard.loadFromBundle(data.getBundleExtra(EXTRA_TANGEM_CARD))
                     ctx.card = updatedCard
                 }
                 if (resultCode == CreateNewWalletActivity.RESULT_INVALID_PIN && requestPIN2Count < 2) {
@@ -599,9 +602,9 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                 activity?.finish()
 
             } else {
-                if (data != null && data.extras != null && data.extras!!.containsKey(TangemCard.EXTRA_UID) && data.extras!!.containsKey(TangemCard.EXTRA_CARD)) {
-                    val updatedCard = TangemCard(data.getStringExtra(TangemCard.EXTRA_UID))
-                    updatedCard.loadFromBundle(data.getBundleExtra(TangemCard.EXTRA_CARD))
+                if (data != null && data.extras != null && data.extras!!.containsKey(EXTRA_TANGEM_CARD_UID) && data.extras!!.containsKey(EXTRA_TANGEM_CARD)) {
+                    val updatedCard = TangemCard(data.getStringExtra(EXTRA_TANGEM_CARD_UID))
+                    updatedCard.loadFromBundle(data.getBundleExtra(EXTRA_TANGEM_CARD))
                     ctx.card = updatedCard
                 }
                 if (resultCode == CreateNewWalletActivity.RESULT_INVALID_PIN && requestPIN2Count < 2) {
@@ -627,9 +630,9 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                 }
 
                 if (data != null && data.extras != null) {
-                    if (data.extras!!.containsKey(TangemCard.EXTRA_UID) && data.extras!!.containsKey(TangemCard.EXTRA_CARD)) {
-                        val updatedCard = TangemCard(data.getStringExtra(TangemCard.EXTRA_UID))
-                        updatedCard.loadFromBundle(data.getBundleExtra(TangemCard.EXTRA_CARD))
+                    if (data.extras!!.containsKey(EXTRA_TANGEM_CARD_UID) && data.extras!!.containsKey(EXTRA_TANGEM_CARD)) {
+                        val updatedCard = TangemCard(data.getStringExtra(EXTRA_TANGEM_CARD_UID))
+                        updatedCard.loadFromBundle(data.getBundleExtra(EXTRA_TANGEM_CARD))
                         ctx.card = updatedCard
                     }
                     if (data.extras!!.containsKey("message")) {
@@ -773,10 +776,10 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
         tvWallet.text = ctx.coinData!!.wallet
 
         if (ctx.card!!.tokenSymbol.length > 1) {
-            val html = Html.fromHtml(ctx.card!!.blockchainName)
+            val html = Html.fromHtml(ctx.blockchainName)
             tvBlockchain.text = html
         } else
-            tvBlockchain.text = ctx.card!!.blockchainName
+            tvBlockchain.text = ctx.blockchainName
 
         if (engine.hasBalanceInfo()) {
             btnExtract.isEnabled = true
@@ -842,7 +845,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
     private fun requestElectrum(electrumRequest: ElectrumRequest) {
         if (UtilHelper.isOnline(context as Activity)) {
             requestCounter++
-            serverApiElectrum.electrumRequestData(ctx.card, electrumRequest)
+            serverApiElectrum.electrumRequestData(ctx, electrumRequest)
         } else {
             Toast.makeText(activity, getString(R.string.no_connection), Toast.LENGTH_SHORT).show()
             srl?.isRefreshing = false
@@ -898,7 +901,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
             else
                 isoDep.timeout = 65000
 
-            verifyCardTask = VerifyCardTask(activity, ctx.card, nfcManager, isoDep, this)
+            verifyCardTask = VerifyCardTask(ctx.card, NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, App.firmwaresStorage, this)
             verifyCardTask?.start()
 
         } catch (e: Exception) {
diff --git a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt
index eb9f69222a..08ce72d5ab 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt
@@ -8,19 +8,23 @@ import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v4.content.ContextCompat
 import android.text.Html
+import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupMenu
 import android.widget.Toast
-import com.tangem.tangemcard.data.local.PINStorage
-import com.tangem.tangemcard.reader.NfcManager
+import com.tangem.App
+import com.tangem.tangemcard.android.data.PINStorage
+import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.Constant
 import com.tangem.domain.wallet.*
 import com.tangem.presentation.activity.*
 import com.tangem.presentation.dialog.PINSwapWarningDialog
-import com.tangem.tangemcard.data.Blockchain
+import com.tangem.data.Blockchain
 import com.tangem.tangemcard.data.TangemCard
+import com.tangem.tangemcard.data.loadFromBundle
+import com.tangem.tangemcard.reader.CardProtocol
 import com.tangem.wallet.BuildConfig
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.fr_verify_card.*
@@ -123,12 +127,12 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback {
             Constant.REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) {
                 if (newPIN == "") newPIN = ctx.card!!.pin
 
-                if (newPIN2 == "") newPIN2 = PINStorage.getPIN2()
+                if (newPIN2 == "") newPIN2 = App.pinStorage.getPIN2()
 
                 val pinSwapWarningDialog = PINSwapWarningDialog()
                 pinSwapWarningDialog.setOnRefreshPage { (activity as VerifyCardActivity).navigator.showPinSwap(context as Activity, newPIN, newPIN2) }
                 val bundle = Bundle()
-                if (!PINStorage.isDefaultPIN(newPIN) || !PINStorage.isDefaultPIN2(newPIN2))
+                if (!CardProtocol.isDefaultPIN(newPIN) || !CardProtocol.isDefaultPIN2(newPIN2))
                     bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_forget))
                 else
                     bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_use_default))
@@ -203,7 +207,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback {
                 if (resultCode == Activity.RESULT_OK) {
                     srlVerifyCard.isRefreshing = true
                     ctx.coinData!!.clearInfo()
-                    ctx.card!!.switchToInitialBlockchain()
+                    //ctx.card!!.switchToInitialBlockchain()
                     updateViews()
                 }
 
@@ -269,8 +273,9 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback {
             }
 
             tvIssuer.text = ctx.card!!.issuerDescription
-            tvCardRegistredDate.text = ctx.card!!.personalizationDateTimeDescription
-            val html = Html.fromHtml(ctx.card!!.blockchainName)
+
+            tvCardRegistredDate.text = DateUtils.formatDateTime(null, ctx.card!!.personalizationDateTime.time, DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NUMERIC_DATE or DateUtils.FORMAT_SHOW_YEAR)
+            val html = Html.fromHtml(ctx.blockchainName)
             tvBlockchain.text = html
 
             tvValidationNode.text = ctx.coinData!!.validationNodeDescription
@@ -350,7 +355,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback {
 
             tvFeatures.text = features
 
-            if (ctx.card!!.useDefaultPIN1()!!) {
+            if (ctx.card!!.useDefaultPIN1()) {
                 imgPIN.setImageResource(R.drawable.unlock_pin1)
                 imgPIN.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_default_PIN1_code, Toast.LENGTH_LONG).show() }
             } else {
diff --git a/settings.gradle b/settings.gradle
index 753d1d9277..38ca2a86f1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':tangemcard'
+include ':app', ':tangemcard-android', ':tangemserver-android', ':tangemcard-common'
diff --git a/tangemcard/.gitignore b/tangemcard-android/.gitignore
similarity index 100%
rename from tangemcard/.gitignore
rename to tangemcard-android/.gitignore
diff --git a/tangemcard/build.gradle b/tangemcard-android/build.gradle
similarity index 75%
rename from tangemcard/build.gradle
rename to tangemcard-android/build.gradle
index 62b0e16735..6c4bbc429b 100644
--- a/tangemcard/build.gradle
+++ b/tangemcard-android/build.gradle
@@ -23,25 +23,25 @@ android {
 }
 
 dependencies {
+    implementation project(':tangemcard-common')
+
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:28.0.0'
 //    implementation 'com.android.support:design:28.0.0'
     implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.madgag.spongycastle:core:1.56.0.0'
-    implementation 'com.madgag.spongycastle:prov:1.56.0.0'
     implementation 'com.scottyab:rootbeer-lib:0.0.7'
 
 //    implementation 'com.android.support:support-compat:28.0.0'
 //    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
+//    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
+//    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
+//    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
 //    implementation 'com.skyfishjy.ripplebackground:library:1.0.1'
 //    implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
-    implementation 'com.google.dagger:dagger:2.16'
-    implementation 'org.bitcoinj:bitcoinj-parent:0.14.7'
-    implementation 'org.bitcoinj:bitcoinj-core:0.14.7'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.16'
+//    implementation 'com.google.dagger:dagger:2.16'
+//    implementation 'org.bitcoinj:bitcoinj-parent:0.14.7'
+//    implementation 'org.bitcoinj:bitcoinj-core:0.14.7'
+//    annotationProcessor 'com.google.dagger:dagger-compiler:2.16'
 //    implementation 'info.hoang8f:android-segmented:1.0.6'
 //    implementation 'io.reactivex.rxjava2:rxjava:2.2.0'
 //    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
diff --git a/tangemcard/proguard-rules.pro b/tangemcard-android/proguard-rules.pro
similarity index 100%
rename from tangemcard/proguard-rules.pro
rename to tangemcard-android/proguard-rules.pro
diff --git a/tangemcard/src/androidTest/java/com/tangem/tangemcard/ExampleInstrumentedTest.java b/tangemcard-android/src/androidTest/java/com/tangem/tangemcard/android/ExampleInstrumentedTest.java
similarity index 94%
rename from tangemcard/src/androidTest/java/com/tangem/tangemcard/ExampleInstrumentedTest.java
rename to tangemcard-android/src/androidTest/java/com/tangem/tangemcard/android/ExampleInstrumentedTest.java
index 6349f4aa67..b278ba0d2e 100644
--- a/tangemcard/src/androidTest/java/com/tangem/tangemcard/ExampleInstrumentedTest.java
+++ b/tangemcard-android/src/androidTest/java/com/tangem/tangemcard/android/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard;
+package com.tangem.tangemcard.android;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
diff --git a/tangemcard-android/src/main/AndroidManifest.xml b/tangemcard-android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..9df3c4db3d
--- /dev/null
+++ b/tangemcard-android/src/main/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tangem.tangemcard" >
+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="true" />
+
+    <uses-permission android:name="android.permission.NFC" />
+</manifest>
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/local/Firmwares.java b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/data/Firmwares.java
similarity index 75%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/local/Firmwares.java
rename to tangemcard-android/src/main/java/com/tangem/tangemcard/android/data/Firmwares.java
index 53fbb2708d..2282f61618 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/local/Firmwares.java
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/data/Firmwares.java
@@ -1,10 +1,11 @@
-package com.tangem.tangemcard.data.local;
+package com.tangem.tangemcard.android.data;
 
 import android.content.Context;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.tangem.tangemcard.data.external.FirmwaresDigestsProvider;
 import com.tangem.tangemcard.util.Util;
 
 import java.io.IOException;
@@ -12,14 +13,10 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
-public class Firmwares {
+public class Firmwares implements FirmwaresDigestsProvider {
     private static JsonArray jaFirmwares = null;
 
-    public static boolean needInit() {
-        return jaFirmwares == null;
-    }
-
-    public static void init(Context context) {
+    public Firmwares(Context context) {
         try (InputStream is = context.getAssets().open("fw_hashes.json")) {
             try (InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
                 JsonParser parser = new JsonParser();
@@ -30,21 +27,14 @@ public class Firmwares {
         }
     }
 
-    public static class VerifyCodeRecord {
-        public String hashAlg;
-        public int blockIndex;
-        public int blockCount;
-        public byte[] challenge;
-        public byte[] digest;
-    }
-
-    public static VerifyCodeRecord selectRandomVerifyCodeBlock(String firmwareVersion) throws IOException {
+    @Override
+    public FirmwaresDigestsProvider.VerifyCodeRecord selectRandomVerifyCodeBlock(String firmwareVersion) {
 
         try {
             for (int i = 0; i < jaFirmwares.size(); i++) {
                 JsonObject jsVersion = jaFirmwares.get(i).getAsJsonObject();
                 if (jsVersion.get("fw").getAsString().equals(firmwareVersion)) {
-                    VerifyCodeRecord result = new VerifyCodeRecord();
+                    FirmwaresDigestsProvider.VerifyCodeRecord result = new FirmwaresDigestsProvider.VerifyCodeRecord();
                     result.hashAlg = "sha-256";
                     JsonArray jsHashes = jsVersion.get(result.hashAlg).getAsJsonArray();
                     result.challenge = Util.hexToBytes(jsVersion.get("challenge").getAsString());
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/local/PINStorage.java b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/data/PINStorage.java
similarity index 93%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/local/PINStorage.java
rename to tangemcard-android/src/main/java/com/tangem/tangemcard/android/data/PINStorage.java
index 435347b94a..739fe3796c 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/local/PINStorage.java
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/data/PINStorage.java
@@ -1,10 +1,11 @@
-package com.tangem.tangemcard.data.local;
+package com.tangem.tangemcard.android.data;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Base64;
 
+import com.tangem.tangemcard.data.external.PINsProvider;
 import com.tangem.tangemcard.reader.CardProtocol;
 
 import java.util.ArrayList;
@@ -17,7 +18,7 @@ import javax.crypto.Cipher;
  * Global PIN Storage
  */
 
-public class PINStorage {
+public class PINStorage implements PINsProvider {
     private static String mSavedPIN, mUserPIN, mLastUsedPIN, mEncryptedPIN, mPIN2;
     private static SharedPreferences sharedPreferences = null;
 
@@ -30,8 +31,8 @@ public class PINStorage {
         mPIN2 = null;
     }
 
-
-    public static List<String> getPINs() {
+    @Override
+    public List<String> getPINs() {
         ArrayList<String> result = new ArrayList<>();
         if (mLastUsedPIN != null) result.add(mLastUsedPIN);
         if (mEncryptedPIN != null && !result.contains(mEncryptedPIN)) result.add(mEncryptedPIN);
@@ -41,7 +42,7 @@ public class PINStorage {
         return result;
     }
 
-    public static void setLastUsedPIN(String PIN) {
+    public void setLastUsedPIN(String PIN) {
         mLastUsedPIN = PIN;
     }
 
@@ -177,18 +178,10 @@ public class PINStorage {
         editor.apply();
     }
 
-    public static String getPIN2() {
+    public String getPIN2() {
         return mPIN2;
     }
 
-    public static boolean isDefaultPIN(String pin) {
-        return (CardProtocol.DefaultPIN.equals(pin));
-    }
-
-    public static boolean isDefaultPIN2(String pin2) {
-        return (CardProtocol.DefaultPIN2.equals(pin2));
-    }
-
     public static String getDefaultPIN() {
         return CardProtocol.DefaultPIN;
     }
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/nfc/DeviceNFCAntennaLocation.kt b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/nfc/DeviceNFCAntennaLocation.kt
similarity index 95%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/nfc/DeviceNFCAntennaLocation.kt
rename to tangemcard-android/src/main/java/com/tangem/tangemcard/android/nfc/DeviceNFCAntennaLocation.kt
index ed0bef115a..92cdaaa6c2 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/nfc/DeviceNFCAntennaLocation.kt
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/nfc/DeviceNFCAntennaLocation.kt
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard.data.nfc
+package com.tangem.tangemcard.android.nfc
 
 import android.os.Build
 
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/nfc/NFCLocation.kt b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/nfc/NFCLocation.kt
similarity index 99%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/nfc/NFCLocation.kt
rename to tangemcard-android/src/main/java/com/tangem/tangemcard/android/nfc/NFCLocation.kt
index 0b9859767c..cbb341b966 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/nfc/NFCLocation.kt
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/nfc/NFCLocation.kt
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard.data.nfc
+package com.tangem.tangemcard.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/tangemcard/src/main/java/com/tangem/tangemcard/presentation/dialog/NfcEnableDialog.kt b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt
similarity index 95%
rename from tangemcard/src/main/java/com/tangem/tangemcard/presentation/dialog/NfcEnableDialog.kt
rename to tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt
index 8660e29ab4..24f0cabe39 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/presentation/dialog/NfcEnableDialog.kt
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard.presentation.dialog
+package com.tangem.tangemcard.android.presentation.dialog
 
 import android.app.Dialog
 import android.content.Intent
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/NfcManager.java b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java
similarity index 97%
rename from tangemcard/src/main/java/com/tangem/tangemcard/reader/NfcManager.java
rename to tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java
index bf53e18afa..0581c7f107 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/reader/NfcManager.java
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard.reader;
+package com.tangem.tangemcard.android.reader;
 
 import android.Manifest;
 import android.annotation.TargetApi;
@@ -16,7 +16,7 @@ import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.FragmentActivity;
 
-import com.tangem.tangemcard.presentation.dialog.NfcEnableDialog;
+import com.tangem.tangemcard.android.presentation.dialog.NfcEnableDialog;
 
 import java.io.IOException;
 
diff --git a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt
new file mode 100644
index 0000000000..a23b8619a7
--- /dev/null
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcReader.kt
@@ -0,0 +1,41 @@
+package com.tangem.tangemcard.android.reader
+
+import android.nfc.tech.IsoDep
+
+data class NfcReader(
+        val nfcManager: NfcManager,
+        val isoDep: IsoDep
+) : com.tangem.tangemcard.reader.NfcReader {
+    override fun getId(): ByteArray {
+        return isoDep.tag.id
+    }
+
+    override fun setTimeout(timeout: Int) {
+        isoDep.timeout = timeout
+    }
+
+    override fun getTimeout(): Int {
+        return isoDep.timeout
+    }
+
+    override fun transceive(data: ByteArray?): ByteArray {
+        return isoDep.transceive(data)
+    }
+
+    override fun ignoreTag() {
+        nfcManager.ignoreTag(isoDep.tag)
+    }
+
+    override fun notifyReadResult(success: Boolean) {
+        nfcManager.notifyReadResult(success)
+    }
+
+    override fun connect() {
+        val timeout = isoDep.timeout
+        isoDep.connect()
+        isoDep.close()
+        isoDep.connect()
+        isoDep.timeout = timeout
+    }
+
+}
\ No newline at end of file
diff --git a/tangemcard-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt b/tangemcard-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt
new file mode 100644
index 0000000000..8bbcd3198f
--- /dev/null
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt
@@ -0,0 +1,150 @@
+package com.tangem.tangemcard.data
+
+import android.os.Bundle
+import com.tangem.tangemcard.util.Log
+import java.util.*
+
+const val EXTRA_TANGEM_CARD = "Card"
+const val EXTRA_TANGEM_CARD_UID = "UID"
+
+fun TangemCard.loadFromBundle(B: Bundle) {
+    uid = B.getString("UID")
+    cid = B.getByteArray("CID")
+    pin = B.getString("PIN")
+    PIN2 = TangemCard.PIN2_Mode.valueOf(B.getString("PIN2")!!)
+    status = TangemCard.Status.valueOf(B.getString("Status")!!)
+    blockchainID = B.getString("Blockchain")
+    tokensDecimal = B.getInt("TokensDecimal", 18)
+    tokenSymbol = B.getString("TokenSymbol", "")
+    contractAddress = B.getString("ContractAddress", "")
+//        if (B.containsKey("BlockchainName"))
+//            blockchainName = B.getString("BlockchainName", "");
+    if (B.containsKey("dtPersonalization")) {
+        personalizationDateTime = Date(B.getLong("dtPersonalization"))
+    }
+    remainingSignatures = B.getInt("RemainingSignatures")
+    maxSignatures = B.getInt("MaxSignatures")
+    health = B.getInt("health")
+    if (B.containsKey("settingsMask")) settingsMask = B.getInt("settingsMask")
+    pauseBeforePIN2 = B.getInt("pauseBeforePIN2")
+    if (B.containsKey("signingMethod"))
+        setSigningMethod(TangemCard.SigningMethod.valueOf(B.getString("signingMethod")!!).ID)
+    if (B.containsKey("Manufacturer"))
+        setManufacturer(Manufacturer.valueOf(B.getString("Manufacturer")!!), B.getBoolean("ManufacturerConfirmed", false))
+    if (B.containsKey("EncryptionMode"))
+        encryptionMode = TangemCard.EncryptionMode.valueOf(B.getString("EncryptionMode")!!)
+    else
+        encryptionMode = null
+
+    if (B.containsKey("SignedHashes")) signedHashes = B.getInt("SignedHashes")
+
+    if (B.containsKey("Issuer")) setIssuer(B.getString("Issuer"), B.getByteArray("IssuerPublicDataKey"))
+
+    if (B.containsKey("FirmwareVersion")) firmwareVersion = B.getString("FirmwareVersion")
+    if (B.containsKey("Batch")) batch = B.getString("Batch")
+
+    isCardPublicKeyValid = B.getBoolean("CardPublicKeyValid")
+    if (B.containsKey("CardPublicKey")) cardPublicKey = B.getByteArray("CardPublicKey")
+
+    if (B.containsKey("OfflineBalance")) offlineBalance = B.getByteArray("OfflineBalance")
+    else clearOfflineBalance()
+
+    if (B.containsKey("Denomination") && B.containsKey("DenominationText")) {
+        setDenomination(B.getByteArray("Denomination"), B.getString("DenominationText"))
+    } else if (B.containsKey("Denomination")) {
+        setDenomination(B.getByteArray("Denomination"), "N/A")
+    } else clearDenomination()
+
+    if (B.containsKey("IssuerData") && B.containsKey("IssuerDataSignature"))
+        setIssuerData(B.getByteArray("IssuerData"), B.getByteArray("IssuerDataSignature"))
+    else setIssuerData(null, null)
+
+    if (B.containsKey("NeedWriteIssuerData"))
+        needWriteIssuerData = B.getBoolean("NeedWriteIssuerData")
+
+    isWalletPublicKeyValid = B.getBoolean("WalletPublicKeyValid")
+    if (B.containsKey("PublicKey")) {
+        walletPublicKey = B.getByteArray("PublicKey")
+    }
+    if (B.containsKey("PublicKeyRar")) {
+        walletPublicKeyRar = B.getByteArray("PublicKeyRar")
+    }
+
+    if (B.containsKey("codeConfirmed"))
+        isCodeConfirmed = B.getBoolean("codeConfirmed")
+
+    if (B.containsKey("onlineVerified"))
+        isOnlineVerified = B.getBoolean("onlineVerified")
+
+    if (B.containsKey("onlineValidated"))
+        isOnlineValidated = B.getBoolean("onlineValidated")
+
+}
+
+val TangemCard.asBundle: Bundle
+    get() {
+        val bundle = Bundle()
+        saveToBundle(bundle)
+        return bundle
+    }
+
+fun TangemCard.saveToBundle(B: Bundle) {
+    try {
+        B.putString("UID", uid)
+        B.putByteArray("CID", cid)
+        B.putString("PIN", pin)
+        B.putString("PIN2", PIN2.name)
+        B.putString("Status", status.name)
+        B.putString("Blockchain", blockchainID)
+        B.putInt("TokensDecimal", tokensDecimal)
+        B.putString("TokenSymbol", tokenSymbol)
+        B.putString("ContractAddress", contractAddress)
+        if (personalizationDateTime != null) B.putLong("dtPersonalization", personalizationDateTime.time)
+
+        B.putInt("RemainingSignatures", remainingSignatures)
+        B.putInt("MaxSignatures", maxSignatures)
+        B.putInt("Health", health)
+        if (settingsMask != null) B.putInt("settingsMask", settingsMask)
+        B.putInt("pauseBeforePIN2", pauseBeforePIN2)
+        if (signingMethod != null) B.putString("signingMethod", signingMethod.name)
+        if (manufacturer != null) B.putString("Manufacturer", manufacturer.name)
+        if (encryptionMode != null) B.putString("EncryptionMode", encryptionMode.name)
+        if (issuer != null) B.putString("Issuer", issuer.getID())
+        if (issuerPublicDataKey != null) B.putByteArray("IssuerPublicDataKey", issuerPublicDataKey)
+        if (firmwareVersion != null) B.putString("FirmwareVersion", firmwareVersion)
+        if (batch != null) B.putString("Batch", batch)
+        B.putBoolean("ManufacturerConfirmed", isManufacturerConfirmed)
+        B.putBoolean("CardPublicKeyValid", isCardPublicKeyValid)
+        B.putByteArray("CardPublicKey", cardPublicKey)
+
+        B.putInt("SignedHashes", signedHashes)
+        B.putBoolean("WalletPublicKeyValid", isWalletPublicKeyValid)
+        if (walletPublicKey != null)
+            B.putByteArray("PublicKey", walletPublicKey)
+        if (walletPublicKeyRar != null)
+            B.putByteArray("PublicKeyRar", walletPublicKeyRar)
+
+        if (offlineBalance != null) B.putByteArray("OfflineBalance", offlineBalance)
+
+        if (denomination != null) B.putByteArray("Denomination", denomination)
+        if (denominationText != null) B.putString("DenominationText", denominationText)
+
+        if (issuerData != null && issuerDataSignature != null) {
+            B.putByteArray("IssuerData", issuerData)
+            B.putByteArray("IssuerDataSignature", issuerDataSignature)
+            B.putBoolean("NeedWriteIssuerData", needWriteIssuerData)
+        }
+
+        if (isCodeConfirmed != null)
+            B.putBoolean("codeConfirmed", isCodeConfirmed)
+
+        if (isOnlineVerified != null)
+            B.putBoolean("onlineVerified", isOnlineVerified)
+
+        if (isOnlineValidated != null)
+            B.putBoolean("onlineValidated", isOnlineValidated)
+    } catch (e: Exception) {
+        Log.e("Can't save to bundle ", e.message)
+    }
+
+}
diff --git a/tangemcard/src/main/res/drawable/card_default.png b/tangemcard-android/src/main/res/drawable/card_default.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_default.png
rename to tangemcard-android/src/main/res/drawable/card_default.png
diff --git a/tangemcard/src/main/res/drawable/card_ru006.png b/tangemcard-android/src/main/res/drawable/card_ru006.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru006.png
rename to tangemcard-android/src/main/res/drawable/card_ru006.png
diff --git a/tangemcard/src/main/res/drawable/card_ru007.png b/tangemcard-android/src/main/res/drawable/card_ru007.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru007.png
rename to tangemcard-android/src/main/res/drawable/card_ru007.png
diff --git a/tangemcard/src/main/res/drawable/card_ru011.png b/tangemcard-android/src/main/res/drawable/card_ru011.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru011.png
rename to tangemcard-android/src/main/res/drawable/card_ru011.png
diff --git a/tangemcard/src/main/res/drawable/card_ru012.png b/tangemcard-android/src/main/res/drawable/card_ru012.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru012.png
rename to tangemcard-android/src/main/res/drawable/card_ru012.png
diff --git a/tangemcard/src/main/res/drawable/card_ru013.png b/tangemcard-android/src/main/res/drawable/card_ru013.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru013.png
rename to tangemcard-android/src/main/res/drawable/card_ru013.png
diff --git a/tangemcard/src/main/res/drawable/card_ru014.png b/tangemcard-android/src/main/res/drawable/card_ru014.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru014.png
rename to tangemcard-android/src/main/res/drawable/card_ru014.png
diff --git a/tangemcard/src/main/res/drawable/card_ru015.png b/tangemcard-android/src/main/res/drawable/card_ru015.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru015.png
rename to tangemcard-android/src/main/res/drawable/card_ru015.png
diff --git a/tangemcard/src/main/res/drawable/card_ru016.png b/tangemcard-android/src/main/res/drawable/card_ru016.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru016.png
rename to tangemcard-android/src/main/res/drawable/card_ru016.png
diff --git a/tangemcard/src/main/res/drawable/card_ru020.png b/tangemcard-android/src/main/res/drawable/card_ru020.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru020.png
rename to tangemcard-android/src/main/res/drawable/card_ru020.png
diff --git a/tangemcard/src/main/res/drawable/card_ru021.png b/tangemcard-android/src/main/res/drawable/card_ru021.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru021.png
rename to tangemcard-android/src/main/res/drawable/card_ru021.png
diff --git a/tangemcard/src/main/res/drawable/card_ru022.png b/tangemcard-android/src/main/res/drawable/card_ru022.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru022.png
rename to tangemcard-android/src/main/res/drawable/card_ru022.png
diff --git a/tangemcard/src/main/res/drawable/card_ru023.png b/tangemcard-android/src/main/res/drawable/card_ru023.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru023.png
rename to tangemcard-android/src/main/res/drawable/card_ru023.png
diff --git a/tangemcard/src/main/res/drawable/card_ru024.png b/tangemcard-android/src/main/res/drawable/card_ru024.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru024.png
rename to tangemcard-android/src/main/res/drawable/card_ru024.png
diff --git a/tangemcard/src/main/res/drawable/card_ru028.png b/tangemcard-android/src/main/res/drawable/card_ru028.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru028.png
rename to tangemcard-android/src/main/res/drawable/card_ru028.png
diff --git a/tangemcard/src/main/res/drawable/card_ru029.png b/tangemcard-android/src/main/res/drawable/card_ru029.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru029.png
rename to tangemcard-android/src/main/res/drawable/card_ru029.png
diff --git a/tangemcard/src/main/res/drawable/card_ru030.png b/tangemcard-android/src/main/res/drawable/card_ru030.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/card_ru030.png
rename to tangemcard-android/src/main/res/drawable/card_ru030.png
diff --git a/tangemcard/src/main/res/drawable/hand_card_horizontal.png b/tangemcard-android/src/main/res/drawable/hand_card_horizontal.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/hand_card_horizontal.png
rename to tangemcard-android/src/main/res/drawable/hand_card_horizontal.png
diff --git a/tangemcard/src/main/res/drawable/hand_card_vertical.png b/tangemcard-android/src/main/res/drawable/hand_card_vertical.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/hand_card_vertical.png
rename to tangemcard-android/src/main/res/drawable/hand_card_vertical.png
diff --git a/tangemcard/src/main/res/drawable/ic_action_nfc_gray.png b/tangemcard-android/src/main/res/drawable/ic_action_nfc_gray.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/ic_action_nfc_gray.png
rename to tangemcard-android/src/main/res/drawable/ic_action_nfc_gray.png
diff --git a/tangemcard/src/main/res/drawable/ic_logo_bat_token.png b/tangemcard-android/src/main/res/drawable/ic_logo_bat_token.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/ic_logo_bat_token.png
rename to tangemcard-android/src/main/res/drawable/ic_logo_bat_token.png
diff --git a/tangemcard/src/main/res/drawable/ic_logo_bitcoin.png b/tangemcard-android/src/main/res/drawable/ic_logo_bitcoin.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/ic_logo_bitcoin.png
rename to tangemcard-android/src/main/res/drawable/ic_logo_bitcoin.png
diff --git a/tangemcard/src/main/res/drawable/ic_logo_bitcoin_cash.png b/tangemcard-android/src/main/res/drawable/ic_logo_bitcoin_cash.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/ic_logo_bitcoin_cash.png
rename to tangemcard-android/src/main/res/drawable/ic_logo_bitcoin_cash.png
diff --git a/tangemcard/src/main/res/drawable/ic_logo_bitcoin_testnet.png b/tangemcard-android/src/main/res/drawable/ic_logo_bitcoin_testnet.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/ic_logo_bitcoin_testnet.png
rename to tangemcard-android/src/main/res/drawable/ic_logo_bitcoin_testnet.png
diff --git a/tangemcard/src/main/res/drawable/ic_logo_ethereum.png b/tangemcard-android/src/main/res/drawable/ic_logo_ethereum.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/ic_logo_ethereum.png
rename to tangemcard-android/src/main/res/drawable/ic_logo_ethereum.png
diff --git a/tangemcard/src/main/res/drawable/ic_logo_ethereum_testnet.png b/tangemcard-android/src/main/res/drawable/ic_logo_ethereum_testnet.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/ic_logo_ethereum_testnet.png
rename to tangemcard-android/src/main/res/drawable/ic_logo_ethereum_testnet.png
diff --git a/tangemcard/src/main/res/drawable/ic_logo_seed.png b/tangemcard-android/src/main/res/drawable/ic_logo_seed.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/ic_logo_seed.png
rename to tangemcard-android/src/main/res/drawable/ic_logo_seed.png
diff --git a/tangemcard/src/main/res/drawable/ic_logo_unknown.png b/tangemcard-android/src/main/res/drawable/ic_logo_unknown.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/ic_logo_unknown.png
rename to tangemcard-android/src/main/res/drawable/ic_logo_unknown.png
diff --git a/tangemcard/src/main/res/drawable/tangem2.png b/tangemcard-android/src/main/res/drawable/tangem2.png
similarity index 100%
rename from tangemcard/src/main/res/drawable/tangem2.png
rename to tangemcard-android/src/main/res/drawable/tangem2.png
diff --git a/tangemcard/src/main/res/values/strings.xml b/tangemcard-android/src/main/res/values/strings.xml
similarity index 100%
rename from tangemcard/src/main/res/values/strings.xml
rename to tangemcard-android/src/main/res/values/strings.xml
diff --git a/tangemcard-android/src/test/java/com/tangem/tangemcard/android/ExampleUnitTest.java b/tangemcard-android/src/test/java/com/tangem/tangemcard/android/ExampleUnitTest.java
new file mode 100644
index 0000000000..2727035d33
--- /dev/null
+++ b/tangemcard-android/src/test/java/com/tangem/tangemcard/android/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.tangem.tangemcard.android;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/tangemcard-common/.gitignore b/tangemcard-common/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/tangemcard-common/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/tangemcard-common/build.gradle b/tangemcard-common/build.gradle
new file mode 100644
index 0000000000..15d24ac6d8
--- /dev/null
+++ b/tangemcard-common/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'java-library'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'com.madgag.spongycastle:core:1.56.0.0'
+    implementation 'com.madgag.spongycastle:prov:1.56.0.0'
+
+}
+
+sourceCompatibility = "7"
+targetCompatibility = "7"
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/Issuer.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/Issuer.java
similarity index 72%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/Issuer.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/data/Issuer.java
index f2fd6c66a0..1a68d4799c 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/Issuer.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/Issuer.java
@@ -1,16 +1,8 @@
 package com.tangem.tangemcard.data;
 
-import android.content.Context;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
 import com.tangem.tangemcard.reader.CardCrypto;
 import com.tangem.tangemcard.util.Util;
 
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -27,7 +19,7 @@ public class Issuer {
 
         byte[] getPrivateKey() throws Exception {
             if (privateKey != null) {
-                return CardCrypto.GeneratePublicKey(Util.hexToBytes(privateKey));
+                return Util.hexToBytes(privateKey);
             } else {
                 throw new Exception("No private key!");
             }
@@ -47,8 +39,8 @@ public class Issuer {
 
     }
 
-    private String id;
-    private String officialName;
+    public String id;
+    public String officialName;
     private KeyPair dataKey;
     private KeyPair transactionKey;
 
@@ -58,27 +50,16 @@ public class Issuer {
 
     private static List<Issuer> instances = new ArrayList<>();
 
-    public static boolean needInit() {
-        return instances.size() == 0;
+    static {
+        Issuer unknown = new Issuer();
+        unknown.id = "UNKNOWN";
+        unknown.officialName = "UNKNOWN";
+        instances.add(unknown);
     }
 
-    public static void init(Context context) {
-        try {
-            Issuer unknown = new Issuer();
-            unknown.id = "UNKNOWN";
-            unknown.officialName = "UNKNOWN";
-
-            try (InputStream is = context.getAssets().open("issuers.json")) {
-                try (InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
-                    Type listType = new TypeToken<List<Issuer>>() {
-                    }.getType();
-                    instances = new Gson().fromJson(reader, listType);
-                }
-            }
-            instances.add(0, unknown);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+    public static void fillIssuers(List<Issuer> issuers)
+    {
+        instances.addAll(issuers);
     }
 
     public byte[] getPublicDataKey() throws Exception {
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/Manufacturer.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/Manufacturer.java
similarity index 100%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/Manufacturer.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/data/Manufacturer.java
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/TangemCard.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/TangemCard.java
similarity index 61%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/TangemCard.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/data/TangemCard.java
index 04b60aaeed..67514def23 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/TangemCard.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/TangemCard.java
@@ -1,10 +1,6 @@
 package com.tangem.tangemcard.data;
 
-import android.os.Bundle;
-import android.util.Log;
-
-import com.google.common.base.Strings;
-import com.tangem.tangemcard.data.local.PINStorage;
+import com.tangem.tangemcard.reader.CardProtocol;
 import com.tangem.tangemcard.reader.SettingsMask;
 import com.tangem.tangemcard.util.Util;
 
@@ -16,9 +12,6 @@ import java.util.Date;
 
 public class TangemCard {
 
-    public static final String EXTRA_CARD = "Card";
-    public static final String EXTRA_UID = "UID";
-
     private byte[] CID;
     private Status status;
     private String UID;
@@ -37,50 +30,10 @@ public class TangemCard {
         return blockchainID;
     }
 
-    public Blockchain getBlockchain() {
-        return Blockchain.fromId(blockchainID);
-    }
-
-    public void setBlockchain(Blockchain blockchain) {
-        blockchainID = blockchain.getID();
-    }
-
     public void setBlockchainID(String blockchainID) {
         this.blockchainID = blockchainID;
     }
 
-    public void addTokenToBlockchainName() {
-        String token = getTokenSymbol();
-        if (Strings.isNullOrEmpty(token))
-            return;
-        String oldName = getBlockchain().getOfficialName();
-        //String newName = String.format("%s - %s ERC20 token", token, oldName);
-        String newName = token + " <br><small><small> " + oldName + " ERC20 token</small></small>";
-        blockchainName = newName;
-
-    }
-
-    private String blockchainName = "";
-
-    public String getBlockchainName() {
-        if (Strings.isNullOrEmpty(blockchainName))
-            return getBlockchain().getOfficialName();
-        return blockchainName;
-    }
-
-    public void setBlockchainIDFromCard(String blockchainID) {
-
-        if (Blockchain.fromId(blockchainID) != Blockchain.Ethereum && Blockchain.fromId(blockchainID) != Blockchain.EthereumTestNet)
-            this.blockchainID = blockchainID;
-
-        if (isToken()) {
-            this.blockchainID = Blockchain.Token.getID();
-            addTokenToBlockchainName();
-        } else {
-            this.blockchainID = blockchainID;
-        }
-    }
-
     public void setWalletPublicKey(byte[] publicKey) {
         pbWalletKey = publicKey;
     }
@@ -189,10 +142,10 @@ public class TangemCard {
         this.PIN = PIN;
     }
 
-    public void switchToInitialBlockchain() {
-        if (tokenSymbol.length() > 1)
-            blockchainID = Blockchain.Token.getID(); // Reset blockchain to Token from ETH for token cards with zero token balance on it
-    }
+//    public void switchToInitialBlockchain() {
+//        if (tokenSymbol.length() > 1)
+//            blockchainID = Blockchain.Token.getID(); // Reset blockchain to Token from ETH for token cards with zero token balance on it
+//    }
 
     public Date getPersonalizationDateTime() {
         return dtPersonalization;
@@ -202,12 +155,12 @@ public class TangemCard {
         this.dtPersonalization = dtPersonalization;
     }
 
-    public String getPersonalizationDateTimeDescription() {
-        return Util.formatDate(dtPersonalization);
-    }
-
     private int health = 0;
 
+    public int getHealth() {
+        return health;
+    }
+
     public void setHealth(int health) {
         if (health > this.health) this.health = health;
     }
@@ -216,15 +169,19 @@ public class TangemCard {
         return health == 0;
     }
 
-    private Issuer issuer = Issuer.Unknown();
     private byte[] issuerPublicDataKey = null;
+    private String issuerID = null;
 
-//    public void setIssuer(Issuer issuer) {
-//        this.issuer = issuer;
-//    }
+
+    public byte[] getIssuerPublicDataKey() {
+        return issuerPublicDataKey;
+    }
+
+    private Issuer issuer = Issuer.Unknown();
 
     public void setIssuer(String issuerID, byte[] issuerPublicDataKey) {
         this.issuerPublicDataKey = issuerPublicDataKey;
+        this.issuerID = issuerID;
         this.issuer = Issuer.FindIssuer(issuerID, issuerPublicDataKey);
     }
 
@@ -232,14 +189,11 @@ public class TangemCard {
         return issuer;
     }
 
-    public byte[] getIssuerPublicDataKey() {
-        return issuerPublicDataKey;
-    }
-
     public String getIssuerDescription() {
         return issuer.getOfficialName();
     }
 
+
     String contractAddress = "";
 
     public void setContractAddress(String address) {
@@ -261,7 +215,7 @@ public class TangemCard {
     }
 
     public boolean isToken() {
-        return !Strings.isNullOrEmpty(tokenSymbol);
+        return !(tokenSymbol == null || tokenSymbol.isEmpty());
     }
 
     int tokensDecimal = 18;
@@ -317,6 +271,10 @@ public class TangemCard {
 
     private Integer settingsMask = null;
 
+    public Integer getSettingsMask() {
+        return settingsMask;
+    }
+
     public void setSettingsMask(int settingsMask) {
         this.settingsMask = settingsMask;
     }
@@ -341,15 +299,15 @@ public class TangemCard {
         return (settingsMask & SettingsMask.UseCVC) != 0;
     }
 
-    public Boolean useDefaultPIN1() {
-        return PINStorage.isDefaultPIN(getPIN());
-    }
-
     public Boolean useSmartSecurityDelay() {
         if (settingsMask == null) return null;
         return (settingsMask & SettingsMask.SmartSecurityDelay) != 0;
     }
 
+    public Boolean useDefaultPIN1() {
+        return CardProtocol.isDefaultPIN(getPIN());
+    }
+
     public enum PIN2_Mode {Unchecked, DefaultPIN2, CustomPIN2}
 
     public PIN2_Mode PIN2 = PIN2_Mode.Unchecked;
@@ -609,163 +567,163 @@ public class TangemCard {
         DenominationText = null;
     }
 
-    public Bundle getAsBundle() {
-        Bundle B = new Bundle();
-        saveToBundle(B);
-        return B;
-    }
-
-    public void saveToBundle(Bundle B) {
-        try {
-            B.putString("UID", UID);
-            B.putByteArray("CID", CID);
-            B.putString("PIN", PIN);
-            B.putString("PIN2", PIN2.name());
-            B.putString("Status", status.name());
-            B.putString("Blockchain", blockchainID);
-            B.putString("BlockchainName", blockchainName);
-            B.putInt("TokensDecimal", tokensDecimal);
-            B.putString("TokenSymbol", tokenSymbol);
-            B.putString("ContractAddress", contractAddress);
-            if (dtPersonalization != null) B.putLong("dtPersonalization", dtPersonalization.getTime());
-            B.putInt("RemainingSignatures", remainingSignatures);
-            B.putInt("MaxSignatures", maxSignatures);
-            B.putInt("Health", health);
-            if (settingsMask != null) B.putInt("settingsMask", settingsMask);
-            B.putInt("pauseBeforePIN2", pauseBeforePIN2);
-            if (signingMethod != null) B.putString("signingMethod", signingMethod.name());
-            if (manufacturer != null) B.putString("Manufacturer", manufacturer.name());
-            if (encryptionMode != null) B.putString("EncryptionMode", encryptionMode.name());
-            if (issuer != null) B.putString("Issuer", issuer.getID());
-            if (issuerPublicDataKey != null) B.putByteArray("IssuerPublicDataKey", issuerPublicDataKey);
-            if (firmwareVersion != null) B.putString("FirmwareVersion", firmwareVersion);
-            if (batch != null) B.putString("Batch", batch);
-            B.putBoolean("ManufacturerConfirmed", manufacturerConfirmed);
-            B.putBoolean("CardPublicKeyValid", isCardPublicKeyValid());
-            B.putByteArray("CardPublicKey", getCardPublicKey());
-
-            B.putInt("SignedHashes", getSignedHashes());
-            B.putBoolean("WalletPublicKeyValid", isWalletPublicKeyValid());
-            if (pbWalletKey != null)
-                B.putByteArray("PublicKey", pbWalletKey);
-            if (pbWalletKeyRar != null)
-                B.putByteArray("PublicKeyRar", pbWalletKeyRar);
-
-            if (getOfflineBalance() != null) B.putByteArray("OfflineBalance", getOfflineBalance());
-
-            if (getDenomination() != null) B.putByteArray("Denomination", getDenomination());
-            if (getDenominationText() != null) B.putString("DenominationText", getDenominationText());
-
-            if (getIssuerData() != null && getIssuerDataSignature() != null) {
-                B.putByteArray("IssuerData", getIssuerData());
-                B.putByteArray("IssuerDataSignature", getIssuerDataSignature());
-                B.putBoolean("NeedWriteIssuerData", getNeedWriteIssuerData());
-            }
-
-            if (codeConfirmed != null)
-                B.putBoolean("codeConfirmed", codeConfirmed);
-
-            if (codeConfirmed != null)
-                B.putBoolean("codeConfirmed", codeConfirmed);
-
-            if (onlineVerified != null)
-                B.putBoolean("onlineVerified", onlineVerified);
-
-            if (onlineValidated != null)
-                B.putBoolean("onlineValidated", onlineValidated);
-
-            if (codeConfirmed != null)
-                B.putBoolean("codeConfirmed", codeConfirmed);
-
-            if (codeConfirmed != null)
-                B.putBoolean("codeConfirmed", codeConfirmed);
-
-            if (onlineVerified != null)
-                B.putBoolean("onlineVerified", onlineVerified);
-
-            if (onlineValidated != null)
-                B.putBoolean("onlineValidated", onlineValidated);
-        } catch (Exception e) {
-            Log.e("Can't save to bundle ", e.getMessage());
-        }
-
-    }
-
-    public void loadFromBundle(Bundle B) {
-        UID = B.getString("UID");
-        CID = B.getByteArray("CID");
-        PIN = B.getString("PIN");
-        PIN2 = PIN2_Mode.valueOf(B.getString("PIN2"));
-        status = Status.valueOf(B.getString("Status"));
-        blockchainID = B.getString("Blockchain");
-        tokensDecimal = B.getInt("TokensDecimal", 18);
-        tokenSymbol = B.getString("TokenSymbol", "");
-        contractAddress = B.getString("ContractAddress", "");
-        if (B.containsKey("BlockchainName"))
-            blockchainName = B.getString("BlockchainName", "");
-        if (B.containsKey("dtPersonalization")) {
-            dtPersonalization = new Date(B.getLong("dtPersonalization"));
-        }
-        remainingSignatures = B.getInt("RemainingSignatures");
-        maxSignatures = B.getInt("MaxSignatures");
-        health = B.getInt("health");
-        if (B.containsKey("settingsMask")) settingsMask = B.getInt("settingsMask");
-        pauseBeforePIN2 = B.getInt("pauseBeforePIN2");
-        if (B.containsKey("signingMethod"))
-            signingMethod = SigningMethod.valueOf(B.getString("signingMethod"));
-        if (B.containsKey("Manufacturer"))
-            manufacturer = Manufacturer.valueOf(B.getString("Manufacturer"));
-        manufacturerConfirmed = B.getBoolean("ManufacturerConfirmed");
-        if (B.containsKey("EncryptionMode"))
-            encryptionMode = EncryptionMode.valueOf(B.getString("EncryptionMode"));
-        else
-            encryptionMode = null;
-
-        if (B.containsKey("SignedHashes")) setSignedHashes(B.getInt("SignedHashes"));
-
-        if (B.containsKey("Issuer")) issuer = Issuer.FindIssuer(B.getString("Issuer"));
-        if (B.containsKey("IssuerPublicDataKey"))
-            issuerPublicDataKey = B.getByteArray("IssuerPublicDataKey");
-
-        if (B.containsKey("FirmwareVersion")) firmwareVersion = B.getString("FirmwareVersion");
-        if (B.containsKey("Batch")) batch = B.getString("Batch");
-
-        cardPublicKeyValid = B.getBoolean("CardPublicKeyValid");
-        if (B.containsKey("CardPublicKey")) setCardPublicKey(B.getByteArray("CardPublicKey"));
-
-        if (B.containsKey("OfflineBalance")) setOfflineBalance(B.getByteArray("OfflineBalance"));
-        else clearOfflineBalance();
-
-        if (B.containsKey("Denomination") && B.containsKey("DenominationText")) {
-            setDenomination(B.getByteArray("Denomination"), B.getString("DenominationText"));
-        } else if (B.containsKey("Denomination")) {
-            setDenomination(B.getByteArray("Denomination"), "N/A");
-        } else clearDenomination();
-
-        if (B.containsKey("IssuerData") && B.containsKey("IssuerDataSignature"))
-            setIssuerData(B.getByteArray("IssuerData"), B.getByteArray("IssuerDataSignature"));
-        else setIssuerData(null, null);
-
-        if (B.containsKey("NeedWriteIssuerData"))
-            setNeedWriteIssuerData(B.getBoolean("NeedWriteIssuerData"));
-
-        walletPublicKeyValid = B.getBoolean("WalletPublicKeyValid");
-        if (B.containsKey("PublicKey")) {
-            pbWalletKey = B.getByteArray("PublicKey");
-        }
-        if (B.containsKey("PublicKeyRar")) {
-            pbWalletKeyRar = B.getByteArray("PublicKeyRar");
-        }
-
-        if (B.containsKey("codeConfirmed"))
-            codeConfirmed = B.getBoolean("codeConfirmed");
-
-        if (B.containsKey("onlineVerified"))
-            onlineVerified = B.getBoolean("onlineVerified");
-
-        if (B.containsKey("onlineValidated"))
-            onlineValidated = B.getBoolean("onlineValidated");
-    }
+//    public Bundle getAsBundle() {
+//        Bundle B = new Bundle();
+//        saveToBundle(B);
+//        return B;
+//    }
+//
+//    public void saveToBundle(Bundle B) {
+//        try {
+//            B.putString("UID", UID);
+//            B.putByteArray("CID", CID);
+//            B.putString("PIN", PIN);
+//            B.putString("PIN2", PIN2.name());
+//            B.putString("Status", status.name());
+//            B.putString("Blockchain", blockchainID);
+//            B.putString("BlockchainName", blockchainName);
+//            B.putInt("TokensDecimal", tokensDecimal);
+//            B.putString("TokenSymbol", tokenSymbol);
+//            B.putString("ContractAddress", contractAddress);
+//            if (dtPersonalization != null) B.putLong("dtPersonalization", dtPersonalization.getTime());
+//            B.putInt("RemainingSignatures", remainingSignatures);
+//            B.putInt("MaxSignatures", maxSignatures);
+//            B.putInt("Health", health);
+//            if (settingsMask != null) B.putInt("settingsMask", settingsMask);
+//            B.putInt("pauseBeforePIN2", pauseBeforePIN2);
+//            if (signingMethod != null) B.putString("signingMethod", signingMethod.name());
+//            if (manufacturer != null) B.putString("Manufacturer", manufacturer.name());
+//            if (encryptionMode != null) B.putString("EncryptionMode", encryptionMode.name());
+//            if (issuer != null) B.putString("Issuer", issuer.getID());
+//            if (issuerPublicDataKey != null) B.putByteArray("IssuerPublicDataKey", issuerPublicDataKey);
+//            if (firmwareVersion != null) B.putString("FirmwareVersion", firmwareVersion);
+//            if (batch != null) B.putString("Batch", batch);
+//            B.putBoolean("ManufacturerConfirmed", manufacturerConfirmed);
+//            B.putBoolean("CardPublicKeyValid", isCardPublicKeyValid());
+//            B.putByteArray("CardPublicKey", getCardPublicKey());
+//
+//            B.putInt("SignedHashes", getSignedHashes());
+//            B.putBoolean("WalletPublicKeyValid", isWalletPublicKeyValid());
+//            if (pbWalletKey != null)
+//                B.putByteArray("PublicKey", pbWalletKey);
+//            if (pbWalletKeyRar != null)
+//                B.putByteArray("PublicKeyRar", pbWalletKeyRar);
+//
+//            if (getOfflineBalance() != null) B.putByteArray("OfflineBalance", getOfflineBalance());
+//
+//            if (getDenomination() != null) B.putByteArray("Denomination", getDenomination());
+//            if (getDenominationText() != null) B.putString("DenominationText", getDenominationText());
+//
+//            if (getIssuerData() != null && getIssuerDataSignature() != null) {
+//                B.putByteArray("IssuerData", getIssuerData());
+//                B.putByteArray("IssuerDataSignature", getIssuerDataSignature());
+//                B.putBoolean("NeedWriteIssuerData", getNeedWriteIssuerData());
+//            }
+//
+//            if (codeConfirmed != null)
+//                B.putBoolean("codeConfirmed", codeConfirmed);
+//
+//            if (codeConfirmed != null)
+//                B.putBoolean("codeConfirmed", codeConfirmed);
+//
+//            if (onlineVerified != null)
+//                B.putBoolean("onlineVerified", onlineVerified);
+//
+//            if (onlineValidated != null)
+//                B.putBoolean("onlineValidated", onlineValidated);
+//
+//            if (codeConfirmed != null)
+//                B.putBoolean("codeConfirmed", codeConfirmed);
+//
+//            if (codeConfirmed != null)
+//                B.putBoolean("codeConfirmed", codeConfirmed);
+//
+//            if (onlineVerified != null)
+//                B.putBoolean("onlineVerified", onlineVerified);
+//
+//            if (onlineValidated != null)
+//                B.putBoolean("onlineValidated", onlineValidated);
+//        } catch (Exception e) {
+//            Log.e("Can't save to bundle ", e.getMessage());
+//        }
+//
+//    }
+//
+//    public void loadFromBundle(Bundle B) {
+//        UID = B.getString("UID");
+//        CID = B.getByteArray("CID");
+//        PIN = B.getString("PIN");
+//        PIN2 = PIN2_Mode.valueOf(B.getString("PIN2"));
+//        status = Status.valueOf(B.getString("Status"));
+//        blockchainID = B.getString("Blockchain");
+//        tokensDecimal = B.getInt("TokensDecimal", 18);
+//        tokenSymbol = B.getString("TokenSymbol", "");
+//        contractAddress = B.getString("ContractAddress", "");
+//        if (B.containsKey("BlockchainName"))
+//            blockchainName = B.getString("BlockchainName", "");
+//        if (B.containsKey("dtPersonalization")) {
+//            dtPersonalization = new Date(B.getLong("dtPersonalization"));
+//        }
+//        remainingSignatures = B.getInt("RemainingSignatures");
+//        maxSignatures = B.getInt("MaxSignatures");
+//        health = B.getInt("health");
+//        if (B.containsKey("settingsMask")) settingsMask = B.getInt("settingsMask");
+//        pauseBeforePIN2 = B.getInt("pauseBeforePIN2");
+//        if (B.containsKey("signingMethod"))
+//            signingMethod = SigningMethod.valueOf(B.getString("signingMethod"));
+//        if (B.containsKey("Manufacturer"))
+//            manufacturer = Manufacturer.valueOf(B.getString("Manufacturer"));
+//        manufacturerConfirmed = B.getBoolean("ManufacturerConfirmed");
+//        if (B.containsKey("EncryptionMode"))
+//            encryptionMode = EncryptionMode.valueOf(B.getString("EncryptionMode"));
+//        else
+//            encryptionMode = null;
+//
+//        if (B.containsKey("SignedHashes")) setSignedHashes(B.getInt("SignedHashes"));
+//
+//        if (B.containsKey("Issuer")) issuer = Issuer.FindIssuer(B.getString("Issuer"));
+//        if (B.containsKey("IssuerPublicDataKey"))
+//            issuerPublicDataKey = B.getByteArray("IssuerPublicDataKey");
+//
+//        if (B.containsKey("FirmwareVersion")) firmwareVersion = B.getString("FirmwareVersion");
+//        if (B.containsKey("Batch")) batch = B.getString("Batch");
+//
+//        cardPublicKeyValid = B.getBoolean("CardPublicKeyValid");
+//        if (B.containsKey("CardPublicKey")) setCardPublicKey(B.getByteArray("CardPublicKey"));
+//
+//        if (B.containsKey("OfflineBalance")) setOfflineBalance(B.getByteArray("OfflineBalance"));
+//        else clearOfflineBalance();
+//
+//        if (B.containsKey("Denomination") && B.containsKey("DenominationText")) {
+//            setDenomination(B.getByteArray("Denomination"), B.getString("DenominationText"));
+//        } else if (B.containsKey("Denomination")) {
+//            setDenomination(B.getByteArray("Denomination"), "N/A");
+//        } else clearDenomination();
+//
+//        if (B.containsKey("IssuerData") && B.containsKey("IssuerDataSignature"))
+//            setIssuerData(B.getByteArray("IssuerData"), B.getByteArray("IssuerDataSignature"));
+//        else setIssuerData(null, null);
+//
+//        if (B.containsKey("NeedWriteIssuerData"))
+//            setNeedWriteIssuerData(B.getBoolean("NeedWriteIssuerData"));
+//
+//        walletPublicKeyValid = B.getBoolean("WalletPublicKeyValid");
+//        if (B.containsKey("PublicKey")) {
+//            pbWalletKey = B.getByteArray("PublicKey");
+//        }
+//        if (B.containsKey("PublicKeyRar")) {
+//            pbWalletKeyRar = B.getByteArray("PublicKeyRar");
+//        }
+//
+//        if (B.containsKey("codeConfirmed"))
+//            codeConfirmed = B.getBoolean("codeConfirmed");
+//
+//        if (B.containsKey("onlineVerified"))
+//            onlineVerified = B.getBoolean("onlineVerified");
+//
+//        if (B.containsKey("onlineValidated"))
+//            onlineValidated = B.getBoolean("onlineValidated");
+//    }
 
     public enum EncryptionMode {
         None((byte) 0x0), Fast((byte) 0x1), Strong((byte) 0x2);
diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/CardDataSubstitutionProvider.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/CardDataSubstitutionProvider.java
new file mode 100644
index 0000000000..fd8c23e624
--- /dev/null
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/CardDataSubstitutionProvider.java
@@ -0,0 +1,7 @@
+package com.tangem.tangemcard.data.external;
+
+import com.tangem.tangemcard.data.TangemCard;
+
+public interface CardDataSubstitutionProvider {
+    void applySubstitution(TangemCard card);
+}
diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/FirmwaresDigestsProvider.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/FirmwaresDigestsProvider.java
new file mode 100644
index 0000000000..6ee6a58069
--- /dev/null
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/FirmwaresDigestsProvider.java
@@ -0,0 +1,14 @@
+package com.tangem.tangemcard.data.external;
+
+public interface FirmwaresDigestsProvider {
+    VerifyCodeRecord selectRandomVerifyCodeBlock(String firmwareVersion);
+
+    class VerifyCodeRecord {
+        public String hashAlg;
+        public int blockIndex;
+        public int blockCount;
+        public byte[] challenge;
+        public byte[] digest;
+    }
+
+}
diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/PINsProvider.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/PINsProvider.java
new file mode 100644
index 0000000000..0db22fbbfb
--- /dev/null
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/data/external/PINsProvider.java
@@ -0,0 +1,11 @@
+package com.tangem.tangemcard.data.external;
+
+import java.util.List;
+
+public interface PINsProvider {
+    String getPIN2();
+
+    void setLastUsedPIN(String pin);
+
+    List<String> getPINs();
+}
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/CardCrypto.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardCrypto.java
similarity index 99%
rename from tangemcard/src/main/java/com/tangem/tangemcard/reader/CardCrypto.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardCrypto.java
index 6cd69b6b3b..04bc55e590 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/reader/CardCrypto.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardCrypto.java
@@ -1,7 +1,6 @@
 package com.tangem.tangemcard.reader;
 
-import android.util.Log;
-
+import com.tangem.tangemcard.util.Log;
 import com.tangem.tangemcard.util.PBKDF2;
 import com.tangem.tangemcard.util.Util;
 
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/CardProtocol.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardProtocol.java
similarity index 97%
rename from tangemcard/src/main/java/com/tangem/tangemcard/reader/CardProtocol.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardProtocol.java
index a5e8cf1752..d1251f2451 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/reader/CardProtocol.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CardProtocol.java
@@ -1,14 +1,8 @@
 package com.tangem.tangemcard.reader;
 
-import android.content.Context;
-import android.nfc.Tag;
-import android.nfc.TagLostException;
-import android.nfc.tech.IsoDep;
-import android.util.Log;
-
 import com.tangem.tangemcard.data.TangemCard;
-import com.tangem.tangemcard.data.local.Firmwares;
 import com.tangem.tangemcard.data.Manufacturer;
+import com.tangem.tangemcard.util.Log;
 import com.tangem.tangemcard.util.Util;
 
 import org.spongycastle.jce.ECNamedCurveTable;
@@ -103,14 +97,8 @@ public class CardProtocol {
 
     private static final int SW_PIN_ERROR = SW.INVALID_PARAMS;
 
-    private IsoDep mIsoDep;
+    private NfcReader mIsoDep;
 
-    /**
-     * @return Android NFC tag object
-     */
-    public Tag getTag() {
-        return mIsoDep.getTag();
-    }
 
     public static final String DefaultPIN = "000000";
     public static final String DefaultPIN2 = "000";
@@ -124,9 +112,17 @@ public class CardProtocol {
         }
     }
 
+    public static boolean isDefaultPIN(String pin) {
+        return (DefaultPIN.equals(pin));
+    }
+
+    public static boolean isDefaultPIN2(String pin2) {
+        return (DefaultPIN2.equals(pin2));
+    }
+
+
     private TangemCard mCard;
     private Exception mError;
-    private Context mContext;
 
     /**
      * Set occurred error
@@ -148,15 +144,12 @@ public class CardProtocol {
 
     /**
      * Constructor
-     *
-     * @param context       - Android context
-     * @param isoDep        - Android NFC tag
+     * @param reader        - NFC Reader interface
      * @param card          - TangemCard object, stored data from previous reading or null for reading a card for the first time
      * @param notifications - UI notification callbacks
      */
-    public CardProtocol(Context context, IsoDep isoDep, TangemCard card, Notifications notifications) {
-        mContext = context;
-        mIsoDep = isoDep;
+    public CardProtocol(NfcReader reader, TangemCard card, Notifications notifications) {
+        mIsoDep = reader;
         mNotifications = notifications;
         if (card != null)
         {
@@ -164,7 +157,7 @@ public class CardProtocol {
             mCard = card;
         }else{
             mPIN = null;
-            mCard = new TangemCard(Util.byteArrayToHexString(mIsoDep.getTag().getId()));
+            mCard = new TangemCard(Util.byteArrayToHexString(mIsoDep.getId()));
         }
     }
 
@@ -177,6 +170,19 @@ public class CardProtocol {
         }
     }
 
+    /**
+     * Base exception class for exceptions on card reading
+     */
+    public static class TangemException_TagLost extends Exception {
+        public TangemException_TagLost() {
+            super("Tag lost");
+        }
+        public TangemException_TagLost(String message) {
+            super(message);
+        }
+    }
+
+
     /**
      * Thrown on failed attempt of reading with possible wrong PIN
      */
@@ -225,15 +231,15 @@ public class CardProtocol {
      * @return UID byte array
      */
     public byte[] GetUID() {
-        if (mIsoDep == null || mIsoDep.getTag() == null) return null;
-        return mIsoDep.getTag().getId();
+        if (mIsoDep == null ) return null;
+        return mIsoDep.getId();
     }
 
     /**
      * Return ISO 14443-3 tag reading timeout
      */
     public int getTimeout() {
-        if (mIsoDep == null || mIsoDep.getTag() == null) return 60000;
+        if (mIsoDep == null ) return 60000;
         return mIsoDep.getTimeout();
     }
 
@@ -299,7 +305,7 @@ public class CardProtocol {
 
                     try {
                         if (mIsoDep == null) {
-                            throw new TagLostException();
+                            throw new TangemException_TagLost();
                         }
                         byte[] cmdBytes = cmdApdu.toBytes();
                         String cmdStr = CommandApdu.toString(cmdBytes, cmdApdu.getLc());
@@ -353,7 +359,7 @@ public class CardProtocol {
 
                     try {
                         if (mIsoDep == null) {
-                            throw new TagLostException();
+                            throw new TangemException_TagLost();
                         }
                         //mIsoDep.setTimeout(msTimeout);
 
@@ -933,12 +939,12 @@ public class CardProtocol {
      * by Tangem. It may contains ~150.000 precalculated hashes of COS binary code segments.
      * VERIFY_CODE command internally reads a segment of COS binary code beginning at Code_Page_Address and having length of [64 x Code_Page_Count] bytes.
      * Then it appends Challenge to the code segment, calculates resulting hash and returns it in the response.
-     * The application needs to ensure that returned hash coincides with the one stored in the hash library (see {@link Firmwares}).
+     * The application needs to ensure that returned hash coincides with the one stored in the hash library (see {@see Firmwares}).
      * @param hashAlgID - ‘sha-256’, ‘sha-1’, ‘sha-224’, ‘sha-384’, ‘sha-512’, ‘crc-16’
-     * @param codePageAddress - Value from 0 to ~3000, take from {@link Firmwares}
-     * @param codePageCount - Number of 32-byte pages to read: from 1 to 5, take from {@link Firmwares}
-     * @param challenge - Additional challenge value from 1 to 10, take from {@link Firmwares}
-     * @return digest bytes to compare with one stored in {@link Firmwares}
+     * @param codePageAddress - Value from 0 to ~3000, take from {@see Firmwares}
+     * @param codePageCount - Number of 32-byte pages to read: from 1 to 5, take from {@see Firmwares}
+     * @param challenge - Additional challenge value from 1 to 10, take from {@see Firmwares}
+     * @return digest bytes to compare with one stored in {@see Firmwares}
      * @throws Exception - if something went wrong
      */
     public byte[] run_VerifyCode(String hashAlgID, int codePageAddress, int codePageCount, byte[] challenge) throws Exception {
@@ -1059,7 +1065,7 @@ public class CardProtocol {
                 bsDataToVerify.write(issuerDataCounter.Value);
             }
             try {
-                if (CardCrypto.VerifySignature(mCard.getIssuer().getPublicDataKey(), bsDataToVerify.toByteArray(), issuerDataSignature.Value)) {
+                if (CardCrypto.VerifySignature(mCard.getIssuerPublicDataKey(), bsDataToVerify.toByteArray(), issuerDataSignature.Value)) {
                     mCard.setIssuerData(issuerData.Value, issuerDataSignature.Value);
                     return TLVList.fromBytes(issuerData.Value);
                 } else {
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/CommandApdu.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CommandApdu.java
similarity index 100%
rename from tangemcard/src/main/java/com/tangem/tangemcard/reader/CommandApdu.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/reader/CommandApdu.java
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/INS.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/INS.java
similarity index 100%
rename from tangemcard/src/main/java/com/tangem/tangemcard/reader/INS.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/reader/INS.java
diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/NfcReader.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/NfcReader.java
new file mode 100644
index 0000000000..8317bdeac7
--- /dev/null
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/NfcReader.java
@@ -0,0 +1,20 @@
+package com.tangem.tangemcard.reader;
+
+import java.io.IOException;
+
+public interface NfcReader {
+    byte[] getId();
+
+    void setTimeout(int timeout)throws IOException;
+
+    int getTimeout();
+
+    byte[] transceive(byte[] data) throws IOException;
+
+    void ignoreTag() throws IOException;
+
+    void notifyReadResult(boolean success);
+
+    void connect();
+
+}
\ No newline at end of file
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/ResponseApdu.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/ResponseApdu.java
similarity index 100%
rename from tangemcard/src/main/java/com/tangem/tangemcard/reader/ResponseApdu.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/reader/ResponseApdu.java
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/SW.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SW.java
similarity index 100%
rename from tangemcard/src/main/java/com/tangem/tangemcard/reader/SW.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SW.java
diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java
new file mode 100644
index 0000000000..d6446b03ac
--- /dev/null
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java
@@ -0,0 +1,67 @@
+package com.tangem.tangemcard.reader;
+
+/**
+ * Created by dvol on 07.03.2018.
+ */
+
+public class SettingsMask {
+    public static final int IsReusable = 0x0001;
+    public static final int UseActivation = 0x0002;
+    public static final int ForbidPurgeWallet = 0x0004;
+    public static final int UseBlock = 0x0008;
+
+    public static final int AllowSwapPIN = 0x0010;
+    public static final int AllowSwapPIN2 = 0x0020;
+    public static final int UseCVC = 0x0040;
+    public static final int ForbidDefaultPIN = 0x0080;
+
+    public static final int UseOneCommandAtTime = 0x0100;
+    public static final int UseNDEF = 0x0200;
+    public static final int UseDynamicNDEF = 0x0400;
+    public static final int SmartSecurityDelay = 0x0800;
+
+    public static final int Protocol_AllowUnencrypted = 0x1000;
+    public static final int Protocol_AllowStaticEncryption = 0x2000;
+
+    public static final int ProtectIssuerDataAgainstReplay = 0x4000;
+
+    public static final int AllowSelectBlockchain = 0x8000;
+
+    public static final int DisablePrecomputedNDEF = 0x00010000;
+
+    public static String getDescription(int iValue) {
+        StringBuilder sb=new StringBuilder();
+        sb.append("[");
+        if ((iValue & SettingsMask.AllowSwapPIN) != 0) sb.append("AllowSwapPIN, ");
+        if ((iValue & SettingsMask.AllowSwapPIN2) != 0)
+            sb.append("AllowSwapPIN2, ");
+        if ((iValue & SettingsMask.ForbidDefaultPIN) != 0)
+            sb.append("ForbidDefaultPIN, ");
+        if ((iValue & SettingsMask.IsReusable) != 0) sb.append("IsReusable, ");
+        if ((iValue & SettingsMask.Protocol_AllowStaticEncryption) != 0)
+            sb.append("Protocol_AllowStaticEncryption, ");
+        if ((iValue & SettingsMask.Protocol_AllowUnencrypted) != 0)
+            sb.append("Protocol_AllowUnencrypted, ");
+        if ((iValue & SettingsMask.SmartSecurityDelay) != 0)
+            sb.append("SmartSecurityDelay, ");
+        if ((iValue & SettingsMask.UseActivation) != 0)
+            sb.append("UseActivation, ");
+        if ((iValue & SettingsMask.UseBlock) != 0) sb.append("UseBlock, ");
+        if ((iValue & SettingsMask.UseCVC) != 0) sb.append("UseCVC, ");
+        if ((iValue & SettingsMask.UseDynamicNDEF) != 0)
+            sb.append("UseDynamicNDEF, ");
+        if ((iValue & SettingsMask.UseNDEF) != 0) sb.append("UseNDEF, ");
+        if ((iValue & SettingsMask.UseOneCommandAtTime) != 0)
+            sb.append("UseOneCommandAtTime, ");
+        if ((iValue & SettingsMask.ProtectIssuerDataAgainstReplay) != 0)
+            sb.append("ProtectIssuerDataAgainstReplay, ");
+        if ((iValue & SettingsMask.ForbidPurgeWallet) != 0) sb.append("ForbidPurgeWallet, ");
+        if ((iValue & SettingsMask.AllowSelectBlockchain) != 0) sb.append("AllowSelectBlockchain, ");
+        if ((iValue & SettingsMask.DisablePrecomputedNDEF) != 0) sb.append("DisablePrecomputedNDEF, ");
+
+        if (sb.length() > 1) sb.delete(sb.length() - 2, sb.length());
+        sb.append("]");
+        return sb.toString();
+    }
+
+}
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/TLV.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLV.java
similarity index 78%
rename from tangemcard/src/main/java/com/tangem/tangemcard/reader/TLV.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLV.java
index 5fa1f3637d..58d32f4ddd 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/reader/TLV.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLV.java
@@ -215,34 +215,7 @@ public class TLV {
                 if( Value!=null ) {
                     try {
                         int iValue = Util.byteArrayToInt(Value);
-                        sb.append("[");
-                        if ((iValue & SettingsMask.AllowSwapPIN) != 0) sb.append("AllowSwapPIN, ");
-                        if ((iValue & SettingsMask.AllowSwapPIN2) != 0)
-                            sb.append("AllowSwapPIN2, ");
-                        if ((iValue & SettingsMask.ForbidDefaultPIN) != 0)
-                            sb.append("ForbidDefaultPIN, ");
-                        if ((iValue & SettingsMask.IsReusable) != 0) sb.append("IsReusable, ");
-                        if ((iValue & SettingsMask.Protocol_AllowStaticEncryption) != 0)
-                            sb.append("Protocol_AllowStaticEncryption, ");
-                        if ((iValue & SettingsMask.Protocol_AllowUnencrypted) != 0)
-                            sb.append("Protocol_AllowUnencrypted, ");
-                        if ((iValue & SettingsMask.SmartSecurityDelay) != 0)
-                            sb.append("SmartSecurityDelay, ");
-                        if ((iValue & SettingsMask.UseActivation) != 0)
-                            sb.append("UseActivation, ");
-                        if ((iValue & SettingsMask.UseBlock) != 0) sb.append("UseBlock, ");
-                        if ((iValue & SettingsMask.UseCVC) != 0) sb.append("UseCVC, ");
-                        if ((iValue & SettingsMask.UseDynamicNDEF) != 0)
-                            sb.append("UseDynamicNDEF, ");
-                        if ((iValue & SettingsMask.UseNDEF) != 0) sb.append("UseNDEF, ");
-                        if ((iValue & SettingsMask.UseOneCommandAtTime) != 0)
-                            sb.append("UseOneCommandAtTime, ");
-                        if ((iValue & SettingsMask.ProtectIssuerDataAgainstReplay) != 0)
-                            sb.append("ProtectIssuerDataAgainstReplay, ");
-
-                        if (sb.length() > 1) sb.delete(sb.length() - 2, sb.length());
-                        sb.append("]");
-                        return String.format("%s[%d]: %s (%s)", tag.name(), Value.length, Util.bytesToHex(Value), sb.toString());
+                        return String.format("%s[%d]: %s (%s)", tag.name(), Value.length, Util.bytesToHex(Value), SettingsMask.getDescription(iValue));
                     }
                     catch (Exception e)
                     {
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/TLVException.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVException.java
similarity index 100%
rename from tangemcard/src/main/java/com/tangem/tangemcard/reader/TLVException.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVException.java
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/TLVList.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVList.java
similarity index 94%
rename from tangemcard/src/main/java/com/tangem/tangemcard/reader/TLVList.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVList.java
index 965d453058..f26e9066dd 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/reader/TLVList.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/reader/TLVList.java
@@ -4,8 +4,6 @@ package com.tangem.tangemcard.reader;
  * Created by dvol on 23.06.2017.
  */
 
-import android.support.annotation.NonNull;
-
 import com.tangem.tangemcard.util.Util;
 
 import java.io.ByteArrayInputStream;
@@ -27,7 +25,7 @@ public class TLVList extends ArrayList<TLV> {
         super();
     }
 
-    public TLVList(@NonNull Collection<? extends TLV> c) {
+    public TLVList(Collection<? extends TLV> c) {
         super(c);
     }
 
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/CreateNewWalletTask.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CreateNewWalletTask.java
similarity index 57%
rename from tangemcard/src/main/java/com/tangem/tangemcard/tasks/CreateNewWalletTask.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CreateNewWalletTask.java
index d223027d0c..d1b0f9fbfb 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/CreateNewWalletTask.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CreateNewWalletTask.java
@@ -1,19 +1,18 @@
 package com.tangem.tangemcard.tasks;
 
-import android.content.Context;
-import android.nfc.tech.IsoDep;
-import android.util.Log;
 
+import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangemcard.data.external.PINsProvider;
 import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.reader.NfcManager;
-import com.tangem.tangemcard.data.local.PINStorage;
 import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.tangemcard.reader.NfcReader;
+import com.tangem.tangemcard.util.Log;
 
 public class CreateNewWalletTask extends CustomReadCardTask {
     public static final String TAG = CreateNewWalletTask.class.getSimpleName();
 
-    public CreateNewWalletTask(Context context, TangemCard card, NfcManager nfcManager, IsoDep isoDep, CardProtocol.Notifications notifications) {
-        super(context, card, nfcManager, isoDep, notifications);
+    public CreateNewWalletTask(TangemCard card, NfcReader reader, CardDataSubstitutionProvider cardDataSubstitutionProvider, PINsProvider pinsProvider, CardProtocol.Notifications notifications) {
+        super(card, reader, cardDataSubstitutionProvider, pinsProvider, notifications);
     }
 
     @Override
@@ -25,7 +24,7 @@ public class CreateNewWalletTask extends CustomReadCardTask {
 
         mNotifications.onReadProgress(protocol, 30);
         if (isCancelled) return;
-        protocol.run_CreateWallet(PINStorage.getPIN2());
+        protocol.run_CreateWallet(pinsProvider.getPIN2());
         mNotifications.onReadProgress(protocol, 60);
         if (isCancelled) return;
 
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/CustomReadCardTask.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CustomReadCardTask.java
similarity index 90%
rename from tangemcard/src/main/java/com/tangem/tangemcard/tasks/CustomReadCardTask.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CustomReadCardTask.java
index 34de48329b..e807ed2f74 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/CustomReadCardTask.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/CustomReadCardTask.java
@@ -1,19 +1,15 @@
 package com.tangem.tangemcard.tasks;
 
-import android.content.Context;
-import android.nfc.tech.IsoDep;
-import android.util.Log;
-
-import com.tangem.tangemcard.data.Issuer;
-import com.tangem.tangemcard.data.local.LocalStorage;
+import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider;
 import com.tangem.tangemcard.data.Manufacturer;
-import com.tangem.tangemcard.data.local.PINStorage;
+import com.tangem.tangemcard.data.external.PINsProvider;
 import com.tangem.tangemcard.data.TangemCard;
 import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.reader.NfcManager;
+import com.tangem.tangemcard.reader.NfcReader;
 import com.tangem.tangemcard.reader.TLV;
 import com.tangem.tangemcard.reader.TLVException;
 import com.tangem.tangemcard.reader.TLVList;
+import com.tangem.tangemcard.util.Log;
 import com.tangem.tangemcard.util.Util;
 
 import org.spongycastle.jce.ECNamedCurveTable;
@@ -30,12 +26,12 @@ import java.util.Calendar;
 public class CustomReadCardTask extends Thread {
     public static final String TAG = CustomReadCardTask.class.getSimpleName();
 
-    protected IsoDep mIsoDep;
+    protected NfcReader mIsoDep;
     protected CardProtocol.Notifications mNotifications;
     protected boolean isCancelled = false;
-    protected Context mContext;
-    protected NfcManager mNfcManager;
     protected TangemCard mCard ;
+    CardDataSubstitutionProvider localStorage;
+    PINsProvider pinsProvider;
     CardProtocol protocol;
 
     // this fields are static to optimize process when need enter pin and scan card again
@@ -49,11 +45,11 @@ public class CustomReadCardTask extends Thread {
         lastRead_UnsuccessfullPINs.clear();
     }
 
-    public CustomReadCardTask(Context context, TangemCard card, NfcManager nfcManager, IsoDep isoDep, CardProtocol.Notifications notifications) {
-        mContext = context;
-        mIsoDep = isoDep;
+    public CustomReadCardTask(TangemCard card, NfcReader reader, CardDataSubstitutionProvider cardDataSubstitutionProvider, PINsProvider pinsProvider, CardProtocol.Notifications notifications) {
+        mIsoDep = reader;
         mNotifications = notifications;
-        mNfcManager = nfcManager;
+        localStorage= cardDataSubstitutionProvider;
+        this.pinsProvider=pinsProvider;
         mCard=card;
     }
 
@@ -174,6 +170,7 @@ public class CustomReadCardTask extends Thread {
                 try {
                     if (mCard.getFirmwareVersion().compareTo("1.05") < 0) {
                         // In FW ver 1.05, the issuer has one key pair used as both DataKey and TransactionKey, see [1] 3.3.1 and [1] 3.3.2
+                        //mCard.setIssuer(tlvCardData.getTLV(TLV.Tag.TAG_Issuer_ID).getAsString(), protocol.getReadResult().getTLV(TLV.Tag.TAG_Issuer_Transaction_PublicKey).Value);
                         mCard.setIssuer(tlvCardData.getTLV(TLV.Tag.TAG_Issuer_ID).getAsString(), protocol.getReadResult().getTLV(TLV.Tag.TAG_Issuer_Transaction_PublicKey).Value);
                     } else {
                         // In newer FW versions, the issuer has two different key pairs - DataKey and TransactionKey, see [1] 3.3.1 and [1] 3.3.2
@@ -188,7 +185,7 @@ public class CustomReadCardTask extends Thread {
                     } catch (Exception ee) {
                         ee.printStackTrace();
                         Log.e(TAG, "Cannot get issuer");
-                        mCard.setIssuer(Issuer.Unknown().getID(), null);
+                        mCard.setIssuer("Unknown", null);
                     }
                 }
 
@@ -201,15 +198,15 @@ public class CustomReadCardTask extends Thread {
                     } else if (mCard.getBatch().equals("0019")) {
                         mCard.setContractAddress("0x0c056b0cda0763cc14b8b2d6c02465c91e33ec72");
                     } else {
-                        LocalStorage localStorage = new LocalStorage(mContext);
-                        localStorage.applySubstitution(mCard);
+                        //CardDataSubstitutionProvider localStorage = new CardDataSubstitutionProvider(mContext);
+                        if( localStorage!=null ) localStorage.applySubstitution(mCard);
                     }
                 } catch (Exception e) {
                     Log.e(TAG, "Can't apply card data substitution");
                     e.printStackTrace();
                 }
 
-                mCard.setBlockchainIDFromCard(tlvCardData.getTLV(TLV.Tag.TAG_Blockchain_ID).getAsString());
+                mCard.setBlockchainID(tlvCardData.getTLV(TLV.Tag.TAG_Blockchain_ID).getAsString());
 
                 try {
                     mCard.setSettingsMask(protocol.getReadResult().getTagAsInt(TLV.Tag.TAG_SettingsMask));
@@ -279,7 +276,7 @@ public class CustomReadCardTask extends Thread {
     public void run_FirstTimeRead() throws Exception {
 
 
-        byte[] UID = mIsoDep.getTag().getId();
+        byte[] UID = mIsoDep.getId();
         String sUID = Util.byteArrayToHexString(UID);
         if (!lastRead_UID.equals(sUID)) {
             resetLastReadInfo();
@@ -289,7 +286,7 @@ public class CustomReadCardTask extends Thread {
 
         if (isCancelled) return;
 
-        protocol.setPIN(PINStorage.getDefaultPIN());
+        protocol.setPIN(CardProtocol.DefaultPIN);
         protocol.clearReadResult();
 
         if (lastRead_Encryption == null) {
@@ -303,7 +300,7 @@ public class CustomReadCardTask extends Thread {
         if (protocol.haveReadResult()) {
             //already have read result (obtained while get supported encryption), only read issuer data and define offline balance
             parseReadResult();
-            PINStorage.setLastUsedPIN(protocol.getCard().getPIN());
+            pinsProvider.setLastUsedPIN(protocol.getCard().getPIN());
         } else {
             //don't have read result - may be don't get supported encryption on this try, need encryption or need another PIN
             if (lastRead_Encryption == null) {
@@ -311,12 +308,12 @@ public class CustomReadCardTask extends Thread {
                 lastRead_Encryption = protocol.getCard().encryptionMode;
                 if (protocol.getCard().encryptionMode == TangemCard.EncryptionMode.None) {
                     // default pin not accepted
-                    lastRead_UnsuccessfullPINs.add(PINStorage.getDefaultPIN());
+                    lastRead_UnsuccessfullPINs.add(CardProtocol.DefaultPIN);
                 }
             }
 
             boolean pinFound = false;
-            for (String PIN : PINStorage.getPINs()) {
+            for (String PIN : pinsProvider.getPINs()) {
                 Log.e(TAG, "PIN: " + PIN);
 
                 boolean skipPin = false;
@@ -341,7 +338,7 @@ public class CustomReadCardTask extends Thread {
                     // After first successful read, data will be parsed into TangemCard object
                     parseReadResult();
 
-                    PINStorage.setLastUsedPIN(PIN);
+                    pinsProvider.setLastUsedPIN(PIN);
                     pinFound = true;
                     protocol.getCard().setPIN(PIN);
                     break;
@@ -365,7 +362,7 @@ public class CustomReadCardTask extends Thread {
         String PIN = mCard.getPIN();
         protocol.setPIN(PIN);
         protocol.run_Read();
-        PINStorage.setLastUsedPIN(PIN);
+        pinsProvider.setLastUsedPIN(PIN);
         if (!Arrays.equals(mCard.getCID(),protocol.getReadResult().getTLV(TLV.Tag.TAG_CardID).Value)) {
             throw new CardProtocol.TangemException("Card must be the same. Reading attempt on different card!");
         }
@@ -388,13 +385,10 @@ public class CustomReadCardTask extends Thread {
             // for Samsung's bugs -
             // Workaround for the Samsung Galaxy S5 (since the
             // first connection always hangs on transceive).
-            int timeout = mIsoDep.getTimeout();
+
             mIsoDep.connect();
-            mIsoDep.close();
-            mIsoDep.connect();
-            mIsoDep.setTimeout(timeout);
             try {
-                protocol = new CardProtocol(mContext, mIsoDep, mCard, mNotifications);
+                protocol = new CardProtocol(mIsoDep, mCard, mNotifications);
                 mNotifications.onReadStart(protocol);
                 try {
                     Log.i(TAG, String.format("[-- Start task -- %s --]", getClass().getSimpleName()));
@@ -416,11 +410,11 @@ public class CustomReadCardTask extends Thread {
                     mNotifications.onReadFinish(protocol);
                 }
             } finally {
-                mNfcManager.ignoreTag(mIsoDep.getTag());
+                mIsoDep.ignoreTag();
             }
         } catch (Exception e) {
             e.printStackTrace();
-            mNfcManager.notifyReadResult(false);
+            mIsoDep.notifyReadResult(false);
         }
     }
 
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/PurgeTask.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/PurgeTask.java
similarity index 53%
rename from tangemcard/src/main/java/com/tangem/tangemcard/tasks/PurgeTask.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/PurgeTask.java
index 2b943f4271..b174bc3160 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/PurgeTask.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/PurgeTask.java
@@ -1,18 +1,16 @@
 package com.tangem.tangemcard.tasks;
 
-import android.content.Context;
-import android.nfc.tech.IsoDep;
-
+import com.tangem.tangemcard.data.external.PINsProvider;
+import com.tangem.tangemcard.reader.NfcReader;
 import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.reader.NfcManager;
-import com.tangem.tangemcard.data.local.PINStorage;
 import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider;
 
 public class PurgeTask extends CustomReadCardTask {
     public static final String TAG = PurgeTask.class.getSimpleName();
 
-    public PurgeTask(Context context, TangemCard card, NfcManager nfcManager, IsoDep isoDep, CardProtocol.Notifications notifications) {
-        super(context, card, nfcManager, isoDep, notifications);
+    public PurgeTask(TangemCard card, NfcReader reader, CardDataSubstitutionProvider cardDataSubstitutionProvider, PINsProvider pinsProvider, CardProtocol.Notifications notifications) {
+        super(card, reader, cardDataSubstitutionProvider, pinsProvider, notifications);
     }
 
     @Override
@@ -20,7 +18,7 @@ public class PurgeTask extends CustomReadCardTask {
         if (mCard.getPauseBeforePIN2() > 0) {
             mNotifications.onReadWait(mCard.getPauseBeforePIN2());
         }
-        protocol.run_PurgeWallet(PINStorage.getPIN2());
+        protocol.run_PurgeWallet(pinsProvider.getPIN2());
         mNotifications.onReadProgress(protocol, 50);
         protocol.run_Read();
         mNotifications.onReadProgress(protocol, 100);
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/ReadCardInfoTask.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/ReadCardInfoTask.java
similarity index 71%
rename from tangemcard/src/main/java/com/tangem/tangemcard/tasks/ReadCardInfoTask.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/ReadCardInfoTask.java
index bc2192b665..791b7b2a99 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/ReadCardInfoTask.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/ReadCardInfoTask.java
@@ -1,17 +1,16 @@
 package com.tangem.tangemcard.tasks;
 
-import android.content.Context;
-import android.nfc.tech.IsoDep;
-
-import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangemcard.data.external.PINsProvider;
+import com.tangem.tangemcard.reader.NfcReader;
 import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.reader.NfcManager;
+import com.tangem.tangemcard.data.TangemCard;
 
 public class ReadCardInfoTask extends CustomReadCardTask {
     public static final String TAG = ReadCardInfoTask.class.getSimpleName();
 
-    public ReadCardInfoTask(Context context, NfcManager nfcManager, IsoDep isoDep, CardProtocol.Notifications notifications) {
-        super(context, null, nfcManager, isoDep, notifications);
+    public ReadCardInfoTask(NfcReader reader, CardDataSubstitutionProvider cardDataSubstitutionProvider, PINsProvider pinsProvider, CardProtocol.Notifications notifications) {
+        super(null, reader, cardDataSubstitutionProvider, pinsProvider, notifications);
     }
 
     /**
@@ -21,11 +20,11 @@ public class ReadCardInfoTask extends CustomReadCardTask {
      *
      * @throws Exception - if something went wrong
      */
-    public void run_CheckPIN2isDefault() throws Exception {
+    private void run_CheckPIN2isDefault() throws Exception {
         // can obtain SetPIN(to default) answer without security delay - try check if PIN2 is default with card request
         if (mCard.isFirmwareNewer("1.19") || (mCard.isFirmwareNewer("1.12") && (mCard.getPauseBeforePIN2() == 0 || mCard.useSmartSecurityDelay()))) {
             try {
-                protocol.run_SetPIN(protocol.DefaultPIN2, mCard.getPIN(), protocol.DefaultPIN2, true);
+                protocol.run_SetPIN(CardProtocol.DefaultPIN2, mCard.getPIN(), CardProtocol.DefaultPIN2, true);
                 mCard.setUseDefaultPIN2(true);
             } catch (CardProtocol.TangemException_NeedPause e) {
                 mCard.setUseDefaultPIN2(null);
@@ -44,7 +43,6 @@ public class ReadCardInfoTask extends CustomReadCardTask {
         mNotifications.onReadProgress(protocol, 50);
         run_CheckPIN2isDefault();
         mNotifications.onReadProgress(protocol, 90);
-
     }
 
 }
\ No newline at end of file
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/SignTask.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SignTask.java
similarity index 71%
rename from tangemcard/src/main/java/com/tangem/tangemcard/tasks/SignTask.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SignTask.java
index 66e7721ee0..9e83d7fd99 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/SignTask.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SignTask.java
@@ -1,15 +1,13 @@
 package com.tangem.tangemcard.tasks;
 
-import android.content.Context;
-import android.nfc.tech.IsoDep;
-import android.util.Log;
-
-import com.tangem.tangemcard.data.local.PINStorage;
+import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider;
 import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.tangemcard.data.external.PINsProvider;
 import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.reader.NfcManager;
+import com.tangem.tangemcard.reader.NfcReader;
 import com.tangem.tangemcard.reader.TLV;
 import com.tangem.tangemcard.reader.TLVList;
+import com.tangem.tangemcard.util.Log;
 
 import java.io.ByteArrayOutputStream;
 
@@ -35,8 +33,8 @@ public class SignTask extends CustomReadCardTask {
 
     private PaymentToSign paymentToSign;
 
-    public SignTask(Context context, TangemCard card, NfcManager nfcManager, IsoDep isoDep, CardProtocol.Notifications notifications, PaymentToSign paymentToSign) {
-        super(context, card, nfcManager, isoDep, notifications);
+    public SignTask(TangemCard card, NfcReader reader, CardDataSubstitutionProvider cardDataSubstitutionProvider, PINsProvider pinsProvider, CardProtocol.Notifications notifications, PaymentToSign paymentToSign) {
+        super(card, reader, cardDataSubstitutionProvider, pinsProvider, notifications);
         this.paymentToSign = paymentToSign;
     }
 
@@ -60,7 +58,7 @@ public class SignTask extends CustomReadCardTask {
         TLVList signResult;
         switch (mCard.getSigningMethod()) {
             case Sign_Hash:
-                signResult = protocol.run_SignHashes(PINStorage.getPIN2(), paymentToSign.getHashesToSign(), null, null, null);
+                signResult = protocol.run_SignHashes(pinsProvider.getPIN2(), paymentToSign.getHashesToSign(), null, null, null);
                 break;
             case Sign_Hash_Validated_By_Issuer:
             case Sign_Hash_Validated_By_Issuer_And_WriteIssuerData:
@@ -72,15 +70,15 @@ public class SignTask extends CustomReadCardTask {
                         throw new CardProtocol.TangemException("Hashes length must be identical!");
                     bs.write(hashes[i]);
                 }
-                signResult = protocol.run_SignHashes(PINStorage.getPIN2(), hashes, paymentToSign.getIssuerTransactionSignature(bs.toByteArray()), null, null);
+                signResult = protocol.run_SignHashes(pinsProvider.getPIN2(), hashes, paymentToSign.getIssuerTransactionSignature(bs.toByteArray()), null, null);
                 break;
             case Sign_Raw:
-                signResult = protocol.run_SignRaw(PINStorage.getPIN2(), paymentToSign.getHashAlgToSign(), paymentToSign.getRawDataToSign(), null, null, null);
+                signResult = protocol.run_SignRaw(pinsProvider.getPIN2(), paymentToSign.getHashAlgToSign(), paymentToSign.getRawDataToSign(), null, null, null);
                 break;
             case Sign_Raw_Validated_By_Issuer:
             case Sign_Raw_Validated_By_Issuer_And_WriteIssuerData:
                 byte[] txOut = paymentToSign.getRawDataToSign();
-                signResult = protocol.run_SignRaw(PINStorage.getPIN2(), paymentToSign.getHashAlgToSign(), txOut, paymentToSign.getIssuerTransactionSignature(txOut), null, null);
+                signResult = protocol.run_SignRaw(pinsProvider.getPIN2(), paymentToSign.getHashAlgToSign(), txOut, paymentToSign.getIssuerTransactionSignature(txOut), null, null);
                 break;
             default:
                 throw new CardProtocol.TangemException("Signing method isn't supported!");
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/SwapPINTask.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SwapPINTask.java
similarity index 57%
rename from tangemcard/src/main/java/com/tangem/tangemcard/tasks/SwapPINTask.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SwapPINTask.java
index a5ba27b61e..342d67fb64 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/SwapPINTask.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/SwapPINTask.java
@@ -1,20 +1,19 @@
 package com.tangem.tangemcard.tasks;
 
-import android.content.Context;
-import android.nfc.tech.IsoDep;
 
+import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangemcard.data.external.PINsProvider;
 import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.reader.NfcManager;
-import com.tangem.tangemcard.data.local.PINStorage;
 import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.tangemcard.reader.NfcReader;
 
 public class SwapPINTask extends CustomReadCardTask {
     public static final String TAG = SwapPINTask.class.getSimpleName();
 
     private String newPIN, newPIN2;
 
-    public SwapPINTask(Context context, TangemCard card, NfcManager nfcManager, String newPIN, String newPIN2, IsoDep isoDep, CardProtocol.Notifications notifications) {
-        super(context, card, nfcManager, isoDep, notifications);
+    public SwapPINTask(TangemCard card, NfcReader reader, CardDataSubstitutionProvider cardDataSubstitutionProvider, PINsProvider pinsProvider, CardProtocol.Notifications notifications, String newPIN, String newPIN2) {
+        super(card, reader, cardDataSubstitutionProvider, pinsProvider, notifications);
         this.newPIN = newPIN;
         this.newPIN2 = newPIN2;
     }
@@ -26,7 +25,7 @@ public class SwapPINTask extends CustomReadCardTask {
             mNotifications.onReadWait(mCard.getPauseBeforePIN2());
         }
 
-        protocol.run_SetPIN(PINStorage.getPIN2(), newPIN, newPIN2, false);
+        protocol.run_SetPIN(pinsProvider.getPIN2(), newPIN, newPIN2, false);
         protocol.setPIN(newPIN);
         mCard.setPIN(newPIN);
 
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/VerifyCardTask.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/VerifyCardTask.java
similarity index 58%
rename from tangemcard/src/main/java/com/tangem/tangemcard/tasks/VerifyCardTask.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/VerifyCardTask.java
index 855851782b..11ba76c657 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/tasks/VerifyCardTask.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/tasks/VerifyCardTask.java
@@ -1,13 +1,12 @@
 package com.tangem.tangemcard.tasks;
 
-import android.content.Context;
-import android.nfc.tech.IsoDep;
-import android.util.Log;
-
-import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.data.local.Firmwares;
-import com.tangem.tangemcard.reader.NfcManager;
 import com.tangem.tangemcard.data.TangemCard;
+import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider;
+import com.tangem.tangemcard.data.external.FirmwaresDigestsProvider;
+import com.tangem.tangemcard.data.external.PINsProvider;
+import com.tangem.tangemcard.reader.CardProtocol;
+import com.tangem.tangemcard.reader.NfcReader;
+import com.tangem.tangemcard.util.Log;
 
 import java.util.Arrays;
 
@@ -18,8 +17,10 @@ import java.util.Arrays;
 public class VerifyCardTask extends CustomReadCardTask {
     public static final String TAG = VerifyCardTask.class.getSimpleName();
 
-    public VerifyCardTask(Context context, TangemCard card, NfcManager nfcManager, IsoDep isoDep, CardProtocol.Notifications notifications) {
-        super(context, card, nfcManager, isoDep, notifications);
+    private FirmwaresDigestsProvider firmwaresDigestsProvider;
+    public VerifyCardTask(TangemCard card, NfcReader reader, CardDataSubstitutionProvider cardDataSubstitutionProvider, PINsProvider pinsProvider, FirmwaresDigestsProvider firmwaresDigestsProvider, CardProtocol.Notifications notifications) {
+        super(card, reader, cardDataSubstitutionProvider, pinsProvider, notifications);
+        this.firmwaresDigestsProvider=firmwaresDigestsProvider;
     }
 
     @Override
@@ -35,12 +36,12 @@ public class VerifyCardTask extends CustomReadCardTask {
             mNotifications.onReadProgress(protocol, 80);
         }
         if (isCancelled) return;
-        Firmwares.VerifyCodeRecord record=Firmwares.selectRandomVerifyCodeBlock(mCard.getFirmwareVersion());
+        FirmwaresDigestsProvider.VerifyCodeRecord record = firmwaresDigestsProvider.selectRandomVerifyCodeBlock(mCard.getFirmwareVersion());
         if (isCancelled) return;
-        if( record!=null ) {
+        if (record != null) {
             byte[] returnedDigest = protocol.run_VerifyCode(record.hashAlg, record.blockIndex, record.blockCount, record.challenge);
             mCard.setCodeConfirmed(Arrays.equals(returnedDigest, record.digest));
-        }else{
+        } else {
             mCard.setCodeConfirmed(null);
         }
         mNotifications.onReadProgress(protocol, 90);
diff --git a/tangemcard-common/src/main/java/com/tangem/tangemcard/util/Log.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/util/Log.java
new file mode 100644
index 0000000000..c10ff8e768
--- /dev/null
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/util/Log.java
@@ -0,0 +1,13 @@
+package com.tangem.tangemcard.util;
+
+public class Log {
+    public static void i(String logTag, String message) {
+
+    }
+    public static void e(String logTag, String message) {
+
+    }
+    public static void v(String logTag, String message) {
+
+    }
+}
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/util/PBKDF2.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/util/PBKDF2.java
similarity index 100%
rename from tangemcard/src/main/java/com/tangem/tangemcard/util/PBKDF2.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/util/PBKDF2.java
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/util/Util.java b/tangemcard-common/src/main/java/com/tangem/tangemcard/util/Util.java
similarity index 97%
rename from tangemcard/src/main/java/com/tangem/tangemcard/util/Util.java
rename to tangemcard-common/src/main/java/com/tangem/tangemcard/util/Util.java
index 4b4823f4f1..4ce101d85b 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/util/Util.java
+++ b/tangemcard-common/src/main/java/com/tangem/tangemcard/util/Util.java
@@ -1,7 +1,5 @@
 package com.tangem.tangemcard.util;
 
-import android.text.format.DateUtils;
-
 import org.spongycastle.crypto.digests.RIPEMD160Digest;
 
 import java.io.BufferedWriter;
@@ -219,23 +217,24 @@ public class Util {
     }
     
 
-    public static String formatDate(Date date)
-    {
-        return DateUtils.formatDateTime(null, date.getTime(), DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_YEAR);
-//        return DateFormat.getDateInstance(DateFormat.SHORT).format(date);
-    }
-
-    public static String formatDateTime(Date date)
-    {
-        return formatDate(date)+" "+formatTime(date);
-    }
-
-    public static String formatTime(Date date)
-    {
-        return new SimpleDateFormat("HH:mm:ss").format(date);
-//        DateFormat.getTimeInstance(DateFormat.MEDIUM).format(date)
-//        return DateUtils.formatDateTime(null, date.getTime(), DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_24HOUR);//DateFormat.getTimeInstance(DateFormat.MEDIUM).format(date);
-    }
+//    public static String formatDate(Date date)
+//    {
+//        //return DateUtils.formatDateTime(null, date.getTime(), DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_YEAR);
+////        return DateFormat.getDateInstance(DateFormat.SHORT).format(date);
+//        return new SimpleDateFormat("yyyy_MM_dd__HH_mm_ss", Locale.US).format(date);
+//    }
+//
+//    public static String formatDateTime(Date date)
+//    {
+//        return formatDate(date)+" "+formatTime(date);
+//    }
+//
+//    public static String formatTime(Date date)
+//    {
+//        return new SimpleDateFormat("HH:mm:ss", Locale.US).format(date);
+////        DateFormat.getTimeInstance(DateFormat.MEDIUM).format(date)
+////        return DateUtils.formatDateTime(null, date.getTime(), DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_24HOUR);//DateFormat.getTimeInstance(DateFormat.MEDIUM).format(date);
+//    }
 
     public static byte[] getCurrentDateAsNumericEncodedByteArray(){
         SimpleDateFormat format = new SimpleDateFormat("yyMMdd", Locale.US);        
diff --git a/tangemcard/src/main/AndroidManifest.xml b/tangemcard/src/main/AndroidManifest.xml
deleted file mode 100644
index 2d29383987..0000000000
--- a/tangemcard/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tangem.tangemcard" >
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        >
-    <!--<provider-->
-        <!--android:name="com.tangem.data.LogFileProvider"-->
-        <!--android:authorities="@string/log_file_provider_authorities"-->
-        <!--android:enabled="true"-->
-        <!--android:exported="false"-->
-        <!--android:grantUriPermissions="true" />-->
-    </application>
-
-</manifest>
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java b/tangemcard/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java
deleted file mode 100644
index f12243a1b1..0000000000
--- a/tangemcard/src/main/java/com/tangem/tangemcard/reader/SettingsMask.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.tangem.tangemcard.reader;
-
-/**
- * Created by dvol on 07.03.2018.
- */
-
-public class SettingsMask {
-    public static final int IsReusable = 0x0001;
-    public static final int UseActivation = 0x0002;
-    public static final int UseBlock = 0x0008;
-
-    public static final int AllowSwapPIN = 0x0010;
-    public static final int AllowSwapPIN2 = 0x0020;
-    public static final int UseCVC = 0x0040;
-    public static final int ForbidDefaultPIN = 0x0080;
-
-    public static final int UseOneCommandAtTime = 0x0100;
-    public static final int UseNDEF = 0x0200;
-    public static final int UseDynamicNDEF = 0x0400;
-    public static final int SmartSecurityDelay = 0x0800;
-
-    public static final int Protocol_AllowUnencrypted = 0x1000;
-    public static final int Protocol_AllowStaticEncryption = 0x2000;
-
-    public static final int ProtectIssuerDataAgainstReplay = 0x4000;
-
-}
diff --git a/tangemserver-android/.gitignore b/tangemserver-android/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/tangemserver-android/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/tangemserver-android/build.gradle b/tangemserver-android/build.gradle
new file mode 100644
index 0000000000..a333b7819d
--- /dev/null
+++ b/tangemserver-android/build.gradle
@@ -0,0 +1,47 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    productFlavors {
+    }
+}
+
+dependencies {
+    implementation project(':tangemcard-common')
+    implementation project(':tangemcard-android')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    //    implementation 'com.madgag.spongycastle:core:1.56.0.0'
+    //    implementation 'com.madgag.spongycastle:prov:1.56.0.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
+    //    implementation 'com.google.dagger:dagger:2.16'
+    //    implementation 'org.bitcoinj:bitcoinj-parent:0.14.7'
+    //    implementation 'org.bitcoinj:bitcoinj-core:0.14.7'
+    //    annotationProcessor 'com.google.dagger:dagger-compiler:2.16'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
+}
diff --git a/tangemserver-android/proguard-rules.pro b/tangemserver-android/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/tangemserver-android/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/tangemserver-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java b/tangemserver-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java
new file mode 100644
index 0000000000..a165ce8bf1
--- /dev/null
+++ b/tangemserver-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.tangem.tangemserver;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.tangem.tangemserver.test", appContext.getPackageName());
+    }
+}
diff --git a/tangemserver-android/src/main/AndroidManifest.xml b/tangemserver-android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..25d98a0dca
--- /dev/null
+++ b/tangemserver-android/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tangem.tangemserver" >
+
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/Server.java b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/Server.java
similarity index 92%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/network/Server.java
rename to tangemserver-android/src/main/java/com/tangem/tangemserver/android/Server.java
index 9e618ea304..a6b5a678a8 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/Server.java
+++ b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/Server.java
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard.data.network;
+package com.tangem.tangemserver.android;
 
 public class Server {
     /**
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/ServerApiTangem.java b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/ServerApiTangem.java
similarity index 97%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/network/ServerApiTangem.java
rename to tangemserver-android/src/main/java/com/tangem/tangemserver/android/ServerApiTangem.java
index 4fecffb7c2..549791aa9f 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/ServerApiTangem.java
+++ b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/ServerApiTangem.java
@@ -1,10 +1,10 @@
-package com.tangem.tangemcard.data.network;
+package com.tangem.tangemserver.android;
 
 import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.tangem.tangemcard.data.TangemCard;
-import com.tangem.tangemcard.data.network.model.CardVerifyAndGetInfo;
+import com.tangem.tangemserver.android.model.CardVerifyAndGetInfo;
 import com.tangem.tangemcard.util.Util;
 
 import java.io.InputStream;
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/ServerURL.java b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/ServerURL.java
similarity index 66%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/network/ServerURL.java
rename to tangemserver-android/src/main/java/com/tangem/tangemserver/android/ServerURL.java
index 0eb32f08f9..80be96c06e 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/ServerURL.java
+++ b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/ServerURL.java
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard.data.network;
+package com.tangem.tangemserver.android;
 
 class ServerURL {
     static final String API_TANGEM = "https://verify.tangem.com/";
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/TangemApi.java b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/TangemApi.java
similarity index 84%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/network/TangemApi.java
rename to tangemserver-android/src/main/java/com/tangem/tangemserver/android/TangemApi.java
index 112c363362..96897eab67 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/TangemApi.java
+++ b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/TangemApi.java
@@ -1,6 +1,6 @@
-package com.tangem.tangemcard.data.network;
+package com.tangem.tangemserver.android;
 
-import com.tangem.tangemcard.data.network.model.CardVerifyAndGetInfo;
+import com.tangem.tangemserver.android.model.CardVerifyAndGetInfo;
 
 import okhttp3.ResponseBody;
 import retrofit2.Call;
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/local/LocalStorage.kt b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt
similarity index 97%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/local/LocalStorage.kt
rename to tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt
index 0320e870a6..009c26bb75 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/local/LocalStorage.kt
+++ b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt
@@ -1,7 +1,9 @@
-package com.tangem.tangemcard.data.local
+package com.tangem.tangemserver.android.data
+
+import android.content.Context
+import com.tangem.tangemcard.data.TangemCard
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.graphics.Bitmap
 import java.io.File
 import kotlin.collections.HashMap
@@ -10,9 +12,9 @@ import android.util.Log
 import com.google.gson.Gson
 import com.google.gson.annotations.SerializedName
 import com.google.gson.reflect.TypeToken
-import com.tangem.tangemcard.data.network.model.CardVerifyAndGetInfo
+import com.tangem.tangemserver.android.model.CardVerifyAndGetInfo
 import com.tangem.tangemcard.R
-import com.tangem.tangemcard.data.TangemCard
+import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider
 import com.tangem.tangemcard.reader.CardCrypto
 import com.tangem.tangemcard.util.Util
 import java.io.InputStream
@@ -20,9 +22,10 @@ import java.lang.Exception
 import java.nio.charset.StandardCharsets
 import java.util.*
 
-data class LocalStorage(
+class LocalStorage
+(
         val context: Context
-) {
+) : CardDataSubstitutionProvider {
     private lateinit var artworks: HashMap<String, ArtworkInfo>
     private lateinit var batches: HashMap<String, BatchInfo>
     private val artworksFile: File = File(context.filesDir, "artworks.json")
@@ -109,7 +112,7 @@ data class LocalStorage(
         var sData: String? = result.substitution?.data
         var sSignature: String? = result.substitution?.signature
         if (card.batch != result.batch) {
-            Log.e("LocalStorage", "Invalid batch received!")
+            Log.e("CardDataSubstitutionProvider", "Invalid batch received!")
             return false
         }
         if (!BatchInfo.CardDataSubstitution.verifySignature(card, sData, sSignature)) {
@@ -236,7 +239,7 @@ data class LocalStorage(
         return getArtworkBitmap(artworkId) ?: return getDefaultArtworkBitmap()
     }
 
-    fun applySubstitution(card: TangemCard) {
+    override fun applySubstitution(card: TangemCard) {
         val batchInfo = batches[card.batch] ?: return
         val substitution = batchInfo.getDataSubstitution(card) ?: return
         substitution.applyToCard(card)
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/model/CardVerify.java b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/model/CardVerify.java
similarity index 80%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/network/model/CardVerify.java
rename to tangemserver-android/src/main/java/com/tangem/tangemserver/android/model/CardVerify.java
index 13f39787be..9873dbd528 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/model/CardVerify.java
+++ b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/model/CardVerify.java
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard.data.network.model;
+package com.tangem.tangemserver.android.model;
 
 public class CardVerify {
     private String CID;
diff --git a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/model/CardVerifyAndGetInfo.kt b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/model/CardVerifyAndGetInfo.kt
similarity index 96%
rename from tangemcard/src/main/java/com/tangem/tangemcard/data/network/model/CardVerifyAndGetInfo.kt
rename to tangemserver-android/src/main/java/com/tangem/tangemserver/android/model/CardVerifyAndGetInfo.kt
index 017648fba3..2da73766b4 100644
--- a/tangemcard/src/main/java/com/tangem/tangemcard/data/network/model/CardVerifyAndGetInfo.kt
+++ b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/model/CardVerifyAndGetInfo.kt
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard.data.network.model
+package com.tangem.tangemserver.android.model
 
 import java.text.SimpleDateFormat
 import java.util.*
diff --git a/tangemserver-android/src/main/res/values/strings.xml b/tangemserver-android/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..7c2c6570f5
--- /dev/null
+++ b/tangemserver-android/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">TangemServer</string>
+</resources>
diff --git a/tangemcard/src/test/java/com/tangem/tangemcard/ExampleUnitTest.java b/tangemserver-android/src/test/java/com/tangem/tangemserver/ExampleUnitTest.java
similarity index 91%
rename from tangemcard/src/test/java/com/tangem/tangemcard/ExampleUnitTest.java
rename to tangemserver-android/src/test/java/com/tangem/tangemserver/ExampleUnitTest.java
index 053a2eef4f..6fd65d8f9b 100644
--- a/tangemcard/src/test/java/com/tangem/tangemcard/ExampleUnitTest.java
+++ b/tangemserver-android/src/test/java/com/tangem/tangemserver/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.tangem.tangemcard;
+package com.tangem.tangemserver;
 
 import org.junit.Test;