diff --git a/build.gradle b/build.gradle
index 40ec3d054d..8788f43922 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url 'https://jitpack.io' }
+//        maven { url 'https://jitpack.io' }
     }
 }
 
diff --git a/tangemcard-android/build.gradle b/tangemcard-android/build.gradle
index 2a0e2317bf..c597fda882 100644
--- a/tangemcard-android/build.gradle
+++ b/tangemcard-android/build.gradle
@@ -26,8 +26,9 @@ android {
 }
 
 dependencies {
-//    implementation project(':tangemcard-common')
-    implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0'
+    implementation project(':tangemcommon')
+//    implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0'
+
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.scottyab:rootbeer-lib:0.0.7'
diff --git a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt
index 189eeadef2..d235221eda 100644
--- a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.kt
@@ -16,7 +16,7 @@ import android.os.Bundle
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.FragmentActivity
 import com.tangem.tangemcard.android.presentation.dialog.NfcEnableDialog
-import com.tangem.tangemcard.util.Log
+import com.tangem.tangemcommon.util.Log
 import java.io.IOException
 
 class NfcManager(private val activity: FragmentActivity, private val readerCallback: NfcAdapter.ReaderCallback) {
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
index a23b8619a7..a1edbf0507 100644
--- 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
@@ -5,7 +5,7 @@ import android.nfc.tech.IsoDep
 data class NfcReader(
         val nfcManager: NfcManager,
         val isoDep: IsoDep
-) : com.tangem.tangemcard.reader.NfcReader {
+) : com.tangem.tangemcommon.reader.NfcReader {
     override fun getId(): ByteArray {
         return isoDep.tag.id
     }
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
index 8bbcd3198f..76223603fd 100644
--- a/tangemcard-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/data/TangemCardExtensions.kt
@@ -1,7 +1,8 @@
 package com.tangem.tangemcard.data
 
 import android.os.Bundle
-import com.tangem.tangemcard.util.Log
+import com.tangem.tangemcommon.data.Manufacturer
+import com.tangem.tangemcommon.data.TangemCard
 import java.util.*
 
 const val EXTRA_TANGEM_CARD = "Card"
diff --git a/tangemserver-android/build.gradle b/tangemserver-android/build.gradle
index a0ae8f2610..e5457ee081 100644
--- a/tangemserver-android/build.gradle
+++ b/tangemserver-android/build.gradle
@@ -26,8 +26,9 @@ android {
 }
 
 dependencies {
-//    implementation project(':tangemcard-common')
-    implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0'
+    implementation project(':tangemcommon')
+//    implementation 'com.github.TangemCash.tangemcard-common:tangemcard-android:0.1.0'
+
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
diff --git a/tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt
index 707e189b87..58119de753 100644
--- a/tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt
+++ b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt
@@ -1,7 +1,7 @@
 package com.tangem.tangemserver.android.data
 
 import android.content.Context
-import com.tangem.tangemcard.data.TangemCard
+import com.tangem.tangemcommon.data.TangemCard
 
 import android.annotation.SuppressLint
 import android.graphics.Bitmap
@@ -14,9 +14,9 @@ import com.google.gson.annotations.SerializedName
 import com.google.gson.reflect.TypeToken
 import com.tangem.tangemserver.android.model.CardVerifyAndGetInfo
 import com.tangem.tangemcard.R
-import com.tangem.tangemcard.data.external.CardDataSubstitutionProvider
-import com.tangem.tangemcard.reader.CardCrypto
-import com.tangem.tangemcard.util.Util
+import com.tangem.tangemcommon.data.external.CardDataSubstitutionProvider
+import com.tangem.tangemcommon.reader.CardCrypto
+import com.tangem.tangemcommon.util.Util
 import java.io.InputStream
 import java.lang.Exception
 import java.nio.charset.StandardCharsets