diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 54d04b46b3..8dd72c7718 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="false" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -11,9 +13,9 @@
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/server-android" />
             <option value="$PROJECT_DIR$/tangem-card" />
-            <option value="$PROJECT_DIR$/tangem-card-new" />
+            <option value="$PROJECT_DIR$/tangem-card-old" />
             <option value="$PROJECT_DIR$/tangem-sdk" />
-            <option value="$PROJECT_DIR$/tangem-sdk-new" />
+            <option value="$PROJECT_DIR$/tangem-sdk-old" />
             <option value="$PROJECT_DIR$/tangemtest" />
           </set>
         </option>
diff --git a/app/build.gradle b/app/build.gradle
index fb452b53ea..111968d4ae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,8 +88,8 @@ configurations {
 }
 
 dependencies {
-    implementation project(':tangem-card')
-    implementation project(':tangem-sdk')
+    implementation project(':tangem-card-old')
+    implementation project(':tangem-sdk-old')
     implementation project(':server-android')
 
     implementation 'androidx.navigation:navigation-fragment:2.1.0'
@@ -105,7 +105,7 @@ dependencies {
     implementation "androidx.preference:preference:1.1.0"
     implementation 'androidx.biometric:biometric:1.0.0-beta01'
     implementation 'androidx.core:core-ktx:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha10'
+    implementation 'com.google.android.material:material:1.1.0-beta01'
 
     implementation 'com.google.dagger:dagger:2.21'
     kapt 'com.google.dagger:dagger-compiler:2.21'
diff --git a/build.gradle b/build.gradle
index ac71b4c1d5..014b1bd8db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'io.fabric.tools:gradle:1.31.0'
diff --git a/server-android/build.gradle b/server-android/build.gradle
index 37632174bb..05ebb488ca 100644
--- a/server-android/build.gradle
+++ b/server-android/build.gradle
@@ -30,7 +30,7 @@ android {
 }
 
 dependencies {
-    implementation project(':tangem-card')
+    implementation project(':tangem-card-old')
 //    implementation 'com.github.TangemCash.card_android-common:card_android-android:0.1.0'
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
diff --git a/settings.gradle b/settings.gradle
index 16bb1148bb..ee422662a2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':tangem-sdk', ':server-android', ':tangem-card', ':tangem-card-new', ':tangem-sdk-new', ':tangemtest'
+include ':app', ':tangem-sdk-old', ':server-android', ':tangem-card-old', ':tangem-card', ':tangem-sdk', ':tangemtest'
diff --git a/tangem-card-new/build.gradle b/tangem-card-new/build.gradle
deleted file mode 100644
index 4ff0558797..0000000000
--- a/tangem-card-new/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-apply plugin: "kotlin"
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "com.madgag.spongycastle:core:1.56.0.0"
-    implementation "com.madgag.spongycastle:prov:1.56.0.0"
-    implementation 'net.i2p.crypto:eddsa:0.3.0'
-}
-
-sourceCompatibility = "8"
-targetCompatibility = "8"
-
-buildscript {
-    ext.kotlin_version = '1.3.50'
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-repositories {
-    mavenCentral()
-}
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
diff --git a/tangem-card-new/.gitignore b/tangem-card-old/.gitignore
similarity index 100%
rename from tangem-card-new/.gitignore
rename to tangem-card-old/.gitignore
diff --git a/tangem-card/.idea/caches/build_file_checksums.ser b/tangem-card-old/.idea/caches/build_file_checksums.ser
similarity index 100%
rename from tangem-card/.idea/caches/build_file_checksums.ser
rename to tangem-card-old/.idea/caches/build_file_checksums.ser
diff --git a/tangem-card/.idea/codeStyles/Project.xml b/tangem-card-old/.idea/codeStyles/Project.xml
similarity index 100%
rename from tangem-card/.idea/codeStyles/Project.xml
rename to tangem-card-old/.idea/codeStyles/Project.xml
diff --git a/tangem-card/.idea/gradle.xml b/tangem-card-old/.idea/gradle.xml
similarity index 100%
rename from tangem-card/.idea/gradle.xml
rename to tangem-card-old/.idea/gradle.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha02_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha02_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha02_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha02_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha01_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha01_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha01_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha01_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_biometric_biometric_1_0_0_alpha03_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_biometric_biometric_1_0_0_alpha03_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_biometric_biometric_1_0_0_alpha03_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_biometric_biometric_1_0_0_alpha03_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_alpha01_jar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_alpha01_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_alpha01_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_alpha01_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_core_core_1_1_0_alpha01_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_core_core_1_1_0_alpha01_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_core_core_1_1_0_alpha01_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_core_core_1_1_0_alpha01_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha02_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha02_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha02_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha02_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_alpha01_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_alpha01_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_alpha01_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_alpha01_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/tangem-card-old/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__co_nstant_in_cbor_0_8_jar.xml b/tangem-card-old/.idea/libraries/Gradle__co_nstant_in_cbor_0_8_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__co_nstant_in_cbor_0_8_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__co_nstant_in_cbor_0_8_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha02_aar.xml b/tangem-card-old/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha02_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha02_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha02_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_google_dagger_dagger_2_21_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_google_dagger_dagger_2_21_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_google_dagger_dagger_2_21_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_google_dagger_dagger_2_21_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7_aar.xml b/tangem-card-old/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_scottyab_rootbeer_lib_0_0_7_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1_aar.xml b/tangem-card-old/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_skyfishjy_ripplebackground_library_1_0_1_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__core_1_56_0_0.xml b/tangem-card-old/.idea/libraries/Gradle__core_1_56_0_0.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__core_1_56_0_0.xml
rename to tangem-card-old/.idea/libraries/Gradle__core_1_56_0_0.xml
diff --git a/tangem-card/.idea/libraries/Gradle__eddsa_0_3_0.xml b/tangem-card-old/.idea/libraries/Gradle__eddsa_0_3_0.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__eddsa_0_3_0.xml
rename to tangem-card-old/.idea/libraries/Gradle__eddsa_0_3_0.xml
diff --git a/tangem-card/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6_aar.xml b/tangem-card-old/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__info_hoang8f_android_segmented_1_0_6_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml b/tangem-card-old/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/tangem-card-old/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/tangem-card-old/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8_aar.xml b/tangem-card-old/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_8_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8_aar.xml b/tangem-card-old/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8_aar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8_aar.xml
rename to tangem-card-old/.idea/libraries/Gradle__me_dm7_barcodescanner_zxing_1_9_8_aar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_21_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_21_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_21_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_21_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_21_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_21_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_21_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_21_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml b/tangem-card-old/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
rename to tangem-card-old/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
diff --git a/tangem-card/.idea/libraries/Gradle__prov_1_56_0_0.xml b/tangem-card-old/.idea/libraries/Gradle__prov_1_56_0_0.xml
similarity index 100%
rename from tangem-card/.idea/libraries/Gradle__prov_1_56_0_0.xml
rename to tangem-card-old/.idea/libraries/Gradle__prov_1_56_0_0.xml
diff --git a/tangem-card/.idea/misc.xml b/tangem-card-old/.idea/misc.xml
similarity index 100%
rename from tangem-card/.idea/misc.xml
rename to tangem-card-old/.idea/misc.xml
diff --git a/tangem-card/.idea/modules.xml b/tangem-card-old/.idea/modules.xml
similarity index 100%
rename from tangem-card/.idea/modules.xml
rename to tangem-card-old/.idea/modules.xml
diff --git a/tangem-card/.idea/runConfigurations.xml b/tangem-card-old/.idea/runConfigurations.xml
similarity index 100%
rename from tangem-card/.idea/runConfigurations.xml
rename to tangem-card-old/.idea/runConfigurations.xml
diff --git a/tangem-card/.idea/vcs.xml b/tangem-card-old/.idea/vcs.xml
similarity index 100%
rename from tangem-card/.idea/vcs.xml
rename to tangem-card-old/.idea/vcs.xml
diff --git a/tangem-card/.idea/workspace.xml b/tangem-card-old/.idea/workspace.xml
similarity index 100%
rename from tangem-card/.idea/workspace.xml
rename to tangem-card-old/.idea/workspace.xml
diff --git a/tangem-card-old/build.gradle b/tangem-card-old/build.gradle
new file mode 100644
index 0000000000..f0d27f4bee
--- /dev/null
+++ b/tangem-card-old/build.gradle
@@ -0,0 +1,16 @@
+apply plugin: 'java-library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group='com.tangem'
+
+dependencies {
+    def spongycastle_version = "1.56.0.0"
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "com.madgag.spongycastle:core:$spongycastle_version"
+    implementation "com.madgag.spongycastle:prov:$spongycastle_version"
+    implementation 'net.i2p.crypto:eddsa:0.3.0'
+}
+
+sourceCompatibility = "7"
+targetCompatibility = "7"
\ No newline at end of file
diff --git a/tangem-card/gradle/wrapper/gradle-wrapper.jar b/tangem-card-old/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from tangem-card/gradle/wrapper/gradle-wrapper.jar
rename to tangem-card-old/gradle/wrapper/gradle-wrapper.jar
diff --git a/tangem-card/gradle/wrapper/gradle-wrapper.properties b/tangem-card-old/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from tangem-card/gradle/wrapper/gradle-wrapper.properties
rename to tangem-card-old/gradle/wrapper/gradle-wrapper.properties
diff --git a/tangem-card/gradlew b/tangem-card-old/gradlew
similarity index 100%
rename from tangem-card/gradlew
rename to tangem-card-old/gradlew
diff --git a/tangem-card/gradlew.bat b/tangem-card-old/gradlew.bat
similarity index 100%
rename from tangem-card/gradlew.bat
rename to tangem-card-old/gradlew.bat
diff --git a/tangem-card/local.properties b/tangem-card-old/local.properties
similarity index 100%
rename from tangem-card/local.properties
rename to tangem-card-old/local.properties
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/data/Issuer.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/data/Issuer.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/data/Issuer.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/data/Issuer.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/data/Manufacturer.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/data/Manufacturer.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/data/Manufacturer.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/data/Manufacturer.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/data/TangemCard.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/data/TangemCard.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/data/TangemCard.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/data/TangemCard.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/data/external/CardDataSubstitutionProvider.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/data/external/CardDataSubstitutionProvider.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/data/external/CardDataSubstitutionProvider.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/data/external/CardDataSubstitutionProvider.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/data/external/FirmwaresDigestsProvider.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/data/external/FirmwaresDigestsProvider.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/data/external/FirmwaresDigestsProvider.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/data/external/FirmwaresDigestsProvider.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/data/external/PINsProvider.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/data/external/PINsProvider.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/data/external/PINsProvider.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/data/external/PINsProvider.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/CardCrypto.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/CardCrypto.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/CardCrypto.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/CardCrypto.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/CardProtocol.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/CardProtocol.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/CardProtocol.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/CardProtocol.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/CommandApdu.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/CommandApdu.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/CommandApdu.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/CommandApdu.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/INS.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/INS.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/INS.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/INS.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/NfcReader.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/NfcReader.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/NfcReader.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/NfcReader.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/ResponseApdu.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/ResponseApdu.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/ResponseApdu.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/ResponseApdu.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/SW.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/SW.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/SW.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/SW.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/SettingsMask.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/SettingsMask.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/SettingsMask.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/SettingsMask.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/TLV.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/TLV.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/TLV.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/TLV.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/TLVException.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/TLVException.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/TLVException.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/TLVException.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/reader/TLVList.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/reader/TLVList.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/reader/TLVList.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/reader/TLVList.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/tasks/CreateNewWalletTask.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/CreateNewWalletTask.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/tasks/CreateNewWalletTask.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/CreateNewWalletTask.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/tasks/CustomReadCardTask.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/CustomReadCardTask.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/tasks/CustomReadCardTask.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/CustomReadCardTask.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/tasks/OneTouchSignTask.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/OneTouchSignTask.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/tasks/OneTouchSignTask.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/OneTouchSignTask.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/tasks/PurgeTask.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/PurgeTask.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/tasks/PurgeTask.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/PurgeTask.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/tasks/ReadCardInfoTask.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/ReadCardInfoTask.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/tasks/ReadCardInfoTask.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/ReadCardInfoTask.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/tasks/SignTask.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/SignTask.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/tasks/SignTask.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/SignTask.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/tasks/SwapPINTask.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/SwapPINTask.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/tasks/SwapPINTask.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/SwapPINTask.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/tasks/VerifyCardTask.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/VerifyCardTask.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/tasks/VerifyCardTask.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/tasks/VerifyCardTask.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/util/Log.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/util/Log.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/util/Log.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/util/Log.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/util/LoggerInterface.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/util/LoggerInterface.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/util/LoggerInterface.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/util/LoggerInterface.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/util/PBKDF2.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/util/PBKDF2.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/util/PBKDF2.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/util/PBKDF2.java
diff --git a/tangem-card/src/main/java/com/tangem/tangem_card/util/Util.java b/tangem-card-old/src/main/java/com/tangem/tangem_card/util/Util.java
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tangem_card/util/Util.java
rename to tangem-card-old/src/main/java/com/tangem/tangem_card/util/Util.java
diff --git a/tangem-card/build.gradle b/tangem-card/build.gradle
index f0d27f4bee..d75871fffa 100644
--- a/tangem-card/build.gradle
+++ b/tangem-card/build.gradle
@@ -1,16 +1,38 @@
-apply plugin: 'java-library'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: "kotlin"
 
-group='com.tangem'
+group = 'com.github.TangemCash'
+version '0.2.2'
 
 dependencies {
-    def spongycastle_version = "1.56.0.0"
-
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.madgag.spongycastle:core:$spongycastle_version"
-    implementation "com.madgag.spongycastle:prov:$spongycastle_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "com.madgag.spongycastle:core:1.56.0.0"
+    implementation "com.madgag.spongycastle:prov:1.56.0.0"
     implementation 'net.i2p.crypto:eddsa:0.3.0'
 }
 
-sourceCompatibility = "7"
-targetCompatibility = "7"
\ No newline at end of file
+sourceCompatibility = "8"
+targetCompatibility = "8"
+
+buildscript {
+    ext.kotlin_version = '1.3.50'
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+repositories {
+    mavenCentral()
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
diff --git a/tangem-card-new/src/main/java/com/tangem/CardEnvironment.kt b/tangem-card/src/main/java/com/tangem/CardEnvironment.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/CardEnvironment.kt
rename to tangem-card/src/main/java/com/tangem/CardEnvironment.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/CardManager.kt b/tangem-card/src/main/java/com/tangem/CardManager.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/CardManager.kt
rename to tangem-card/src/main/java/com/tangem/CardManager.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/CardManagerDelegate.kt b/tangem-card/src/main/java/com/tangem/CardManagerDelegate.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/CardManagerDelegate.kt
rename to tangem-card/src/main/java/com/tangem/CardManagerDelegate.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/CardReader.kt b/tangem-card/src/main/java/com/tangem/CardReader.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/CardReader.kt
rename to tangem-card/src/main/java/com/tangem/CardReader.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/DataStorage.kt b/tangem-card/src/main/java/com/tangem/DataStorage.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/DataStorage.kt
rename to tangem-card/src/main/java/com/tangem/DataStorage.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/Log.kt b/tangem-card/src/main/java/com/tangem/Log.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/Log.kt
rename to tangem-card/src/main/java/com/tangem/Log.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/Response.kt b/tangem-card/src/main/java/com/tangem/Response.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/Response.kt
rename to tangem-card/src/main/java/com/tangem/Response.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/commands/CheckWalletCommand.kt b/tangem-card/src/main/java/com/tangem/commands/CheckWalletCommand.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/commands/CheckWalletCommand.kt
rename to tangem-card/src/main/java/com/tangem/commands/CheckWalletCommand.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/commands/CommandSerializer.kt b/tangem-card/src/main/java/com/tangem/commands/CommandSerializer.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/commands/CommandSerializer.kt
rename to tangem-card/src/main/java/com/tangem/commands/CommandSerializer.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/commands/ReadCardCommand.kt b/tangem-card/src/main/java/com/tangem/commands/ReadCardCommand.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/commands/ReadCardCommand.kt
rename to tangem-card/src/main/java/com/tangem/commands/ReadCardCommand.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/commands/SignCommand.kt b/tangem-card/src/main/java/com/tangem/commands/SignCommand.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/commands/SignCommand.kt
rename to tangem-card/src/main/java/com/tangem/commands/SignCommand.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/common/CompletionResult.kt b/tangem-card/src/main/java/com/tangem/common/CompletionResult.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/common/CompletionResult.kt
rename to tangem-card/src/main/java/com/tangem/common/CompletionResult.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/common/apdu/CommandApdu.kt b/tangem-card/src/main/java/com/tangem/common/apdu/CommandApdu.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/common/apdu/CommandApdu.kt
rename to tangem-card/src/main/java/com/tangem/common/apdu/CommandApdu.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/common/apdu/ResponseApdu.kt b/tangem-card/src/main/java/com/tangem/common/apdu/ResponseApdu.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/common/apdu/ResponseApdu.kt
rename to tangem-card/src/main/java/com/tangem/common/apdu/ResponseApdu.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/common/extentions/ByteArray.kt b/tangem-card/src/main/java/com/tangem/common/extentions/ByteArray.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/common/extentions/ByteArray.kt
rename to tangem-card/src/main/java/com/tangem/common/extentions/ByteArray.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/common/extentions/String.kt b/tangem-card/src/main/java/com/tangem/common/extentions/String.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/common/extentions/String.kt
rename to tangem-card/src/main/java/com/tangem/common/extentions/String.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/common/tlv/Tlv.kt b/tangem-card/src/main/java/com/tangem/common/tlv/Tlv.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/common/tlv/Tlv.kt
rename to tangem-card/src/main/java/com/tangem/common/tlv/Tlv.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/common/tlv/TlvMapper.kt b/tangem-card/src/main/java/com/tangem/common/tlv/TlvMapper.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/common/tlv/TlvMapper.kt
rename to tangem-card/src/main/java/com/tangem/common/tlv/TlvMapper.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/common/tlv/TlvTag.kt b/tangem-card/src/main/java/com/tangem/common/tlv/TlvTag.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/common/tlv/TlvTag.kt
rename to tangem-card/src/main/java/com/tangem/common/tlv/TlvTag.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/common/tlv/TlvValueType.kt b/tangem-card/src/main/java/com/tangem/common/tlv/TlvValueType.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/common/tlv/TlvValueType.kt
rename to tangem-card/src/main/java/com/tangem/common/tlv/TlvValueType.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/crypto/CryptoUtils.kt b/tangem-card/src/main/java/com/tangem/crypto/CryptoUtils.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/crypto/CryptoUtils.kt
rename to tangem-card/src/main/java/com/tangem/crypto/CryptoUtils.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/crypto/Ed25519.kt b/tangem-card/src/main/java/com/tangem/crypto/Ed25519.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/crypto/Ed25519.kt
rename to tangem-card/src/main/java/com/tangem/crypto/Ed25519.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/crypto/Sepc256k1.kt b/tangem-card/src/main/java/com/tangem/crypto/Sepc256k1.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/crypto/Sepc256k1.kt
rename to tangem-card/src/main/java/com/tangem/crypto/Sepc256k1.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/data/SettingsMask.kt b/tangem-card/src/main/java/com/tangem/data/SettingsMask.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/data/SettingsMask.kt
rename to tangem-card/src/main/java/com/tangem/data/SettingsMask.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/enums/Instruction.kt b/tangem-card/src/main/java/com/tangem/enums/Instruction.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/enums/Instruction.kt
rename to tangem-card/src/main/java/com/tangem/enums/Instruction.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/enums/StatusWord.kt b/tangem-card/src/main/java/com/tangem/enums/StatusWord.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/enums/StatusWord.kt
rename to tangem-card/src/main/java/com/tangem/enums/StatusWord.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/tasks/ScanTask.kt b/tangem-card/src/main/java/com/tangem/tasks/ScanTask.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/tasks/ScanTask.kt
rename to tangem-card/src/main/java/com/tangem/tasks/ScanTask.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/tasks/SingleCommandTask.kt b/tangem-card/src/main/java/com/tangem/tasks/SingleCommandTask.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/tasks/SingleCommandTask.kt
rename to tangem-card/src/main/java/com/tangem/tasks/SingleCommandTask.kt
diff --git a/tangem-card-new/src/main/java/com/tangem/tasks/Task.kt b/tangem-card/src/main/java/com/tangem/tasks/Task.kt
similarity index 100%
rename from tangem-card-new/src/main/java/com/tangem/tasks/Task.kt
rename to tangem-card/src/main/java/com/tangem/tasks/Task.kt
diff --git a/tangem-sdk-new/src/main/res/values/strings.xml b/tangem-sdk-new/src/main/res/values/strings.xml
deleted file mode 100644
index f9ab1c5567..0000000000
--- a/tangem-sdk-new/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<resources>
-    <string name="app_name">Tangem Sdk</string>
-    <string name="general_ok">OK</string>
-    <string name="dialog_nfc_enable_title">Enable NFC?</string>
-    <string name="dialog_nfc_enable_text">This app is useless when NFC is disabled. Reader mode depends on it. Hit OK to go to Settings, where you can enable NFC.</string>
-    <string name="dialog_security_delay">Security delay</string>
-    <string name="dialog_security_delay_description">This banknote has enforced security delay. Please hold the banknote firmly until the operation is completed…</string>
-    <string name="dialog_error">Error</string>
-
-</resources>
diff --git a/tangem-sdk-new/.gitignore b/tangem-sdk-old/.gitignore
similarity index 100%
rename from tangem-sdk-new/.gitignore
rename to tangem-sdk-old/.gitignore
diff --git a/tangem-sdk/.idea/caches/build_file_checksums.ser b/tangem-sdk-old/.idea/caches/build_file_checksums.ser
similarity index 100%
rename from tangem-sdk/.idea/caches/build_file_checksums.ser
rename to tangem-sdk-old/.idea/caches/build_file_checksums.ser
diff --git a/tangem-sdk/.idea/codeStyles/Project.xml b/tangem-sdk-old/.idea/codeStyles/Project.xml
similarity index 100%
rename from tangem-sdk/.idea/codeStyles/Project.xml
rename to tangem-sdk-old/.idea/codeStyles/Project.xml
diff --git a/tangem-sdk/.idea/gradle.xml b/tangem-sdk-old/.idea/gradle.xml
similarity index 100%
rename from tangem-sdk/.idea/gradle.xml
rename to tangem-sdk-old/.idea/gradle.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_google_guava_guava_18_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_google_protobuf_protobuf_java_2_6_1_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_google_zxing_core_3_3_3_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_lambdaworks_scrypt_1_4_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_madgag_spongycastle_core_1_56_0_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_madgag_spongycastle_prov_1_56_0_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_11_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_12_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_2_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_squareup_okio_okio_1_15_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_5_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_5_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__core_1_56_0_0.xml b/tangem-sdk-old/.idea/libraries/Gradle__core_1_56_0_0.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__core_1_56_0_0.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__core_1_56_0_0.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__net_jcip_jcip_annotations_1_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__org_bitcoinj_bitcoinj_core_0_14_7_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__org_bitcoinj_orchid_1_2_1_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml b/tangem-sdk-old/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_20_jar.xml
diff --git a/tangem-sdk/.idea/libraries/Gradle__prov_1_56_0_0.xml b/tangem-sdk-old/.idea/libraries/Gradle__prov_1_56_0_0.xml
similarity index 100%
rename from tangem-sdk/.idea/libraries/Gradle__prov_1_56_0_0.xml
rename to tangem-sdk-old/.idea/libraries/Gradle__prov_1_56_0_0.xml
diff --git a/tangem-sdk/.idea/misc.xml b/tangem-sdk-old/.idea/misc.xml
similarity index 100%
rename from tangem-sdk/.idea/misc.xml
rename to tangem-sdk-old/.idea/misc.xml
diff --git a/tangem-sdk/.idea/modules.xml b/tangem-sdk-old/.idea/modules.xml
similarity index 100%
rename from tangem-sdk/.idea/modules.xml
rename to tangem-sdk-old/.idea/modules.xml
diff --git a/tangem-sdk/.idea/runConfigurations.xml b/tangem-sdk-old/.idea/runConfigurations.xml
similarity index 100%
rename from tangem-sdk/.idea/runConfigurations.xml
rename to tangem-sdk-old/.idea/runConfigurations.xml
diff --git a/tangem-sdk/.idea/workspace.xml b/tangem-sdk-old/.idea/workspace.xml
similarity index 100%
rename from tangem-sdk/.idea/workspace.xml
rename to tangem-sdk-old/.idea/workspace.xml
diff --git a/tangem-sdk-new/build.gradle b/tangem-sdk-old/build.gradle
similarity index 61%
rename from tangem-sdk-new/build.gradle
rename to tangem-sdk-old/build.gradle
index 401ee8064e..9ca113d488 100644
--- a/tangem-sdk-new/build.gradle
+++ b/tangem-sdk-old/build.gradle
@@ -1,27 +1,31 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.0"
+apply plugin: 'com.github.dcendents.android-maven'
 
+group='com.tangem'
+
+android {
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        debug_beta {
+            initWith debug
+            versionNameSuffix "-beta"
         }
     }
+    buildToolsVersion '28.0.3'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -29,23 +33,27 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
 }
 
 dependencies {
-    implementation project(':tangem-card-new')
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0-beta01'
-    implementation 'com.skyfishjy.ripplebackground:library:1.0.1'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation project(':tangem-card-old')
+//    implementation 'com.github.TangemCash.card_android-common:card_android-android:0.1.0'
 
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
     implementation "androidx.lifecycle:lifecycle-runtime:2.1.0"
     implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.scottyab:rootbeer-lib:0.0.7'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.50"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+}
+repositories {
+    mavenCentral()
 }
diff --git a/tangem-sdk/git b/tangem-sdk-old/git
similarity index 100%
rename from tangem-sdk/git
rename to tangem-sdk-old/git
diff --git a/tangem-sdk/gradle/wrapper/gradle-wrapper.jar b/tangem-sdk-old/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from tangem-sdk/gradle/wrapper/gradle-wrapper.jar
rename to tangem-sdk-old/gradle/wrapper/gradle-wrapper.jar
diff --git a/tangem-sdk/gradle/wrapper/gradle-wrapper.properties b/tangem-sdk-old/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from tangem-sdk/gradle/wrapper/gradle-wrapper.properties
rename to tangem-sdk-old/gradle/wrapper/gradle-wrapper.properties
diff --git a/tangem-sdk/gradlew b/tangem-sdk-old/gradlew
similarity index 100%
rename from tangem-sdk/gradlew
rename to tangem-sdk-old/gradlew
diff --git a/tangem-sdk/gradlew.bat b/tangem-sdk-old/gradlew.bat
similarity index 100%
rename from tangem-sdk/gradlew.bat
rename to tangem-sdk-old/gradlew.bat
diff --git a/tangem-sdk/local.properties b/tangem-sdk-old/local.properties
similarity index 100%
rename from tangem-sdk/local.properties
rename to tangem-sdk-old/local.properties
diff --git a/tangem-sdk-new/proguard-rules.pro b/tangem-sdk-old/proguard-rules.pro
similarity index 100%
rename from tangem-sdk-new/proguard-rules.pro
rename to tangem-sdk-old/proguard-rules.pro
diff --git a/tangem-sdk/src/androidTest/java/com/tangem/tangem_sdk/ExampleInstrumentedTest.java b/tangem-sdk-old/src/androidTest/java/com/tangem/tangem_sdk/ExampleInstrumentedTest.java
similarity index 93%
rename from tangem-sdk/src/androidTest/java/com/tangem/tangem_sdk/ExampleInstrumentedTest.java
rename to tangem-sdk-old/src/androidTest/java/com/tangem/tangem_sdk/ExampleInstrumentedTest.java
index 41b93ed28b..14e3fdcec3 100644
--- a/tangem-sdk/src/androidTest/java/com/tangem/tangem_sdk/ExampleInstrumentedTest.java
+++ b/tangem-sdk-old/src/androidTest/java/com/tangem/tangem_sdk/ExampleInstrumentedTest.java
@@ -8,7 +8,7 @@ import androidx.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/tangem-sdk-new/src/main/AndroidManifest.xml b/tangem-sdk-old/src/main/AndroidManifest.xml
similarity index 51%
rename from tangem-sdk-new/src/main/AndroidManifest.xml
rename to tangem-sdk-old/src/main/AndroidManifest.xml
index 79863d299a..06bf470bd3 100644
--- a/tangem-sdk-new/src/main/AndroidManifest.xml
+++ b/tangem-sdk-old/src/main/AndroidManifest.xml
@@ -1,5 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tangem.tangem_sdk_new" >
+    package="com.tangem.tangem_sdk" >
+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="true" />
 
     <uses-permission android:name="android.permission.NFC" />
 </manifest>
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/data/Firmwares.java b/tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/data/Firmwares.java
similarity index 100%
rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/data/Firmwares.java
rename to tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/data/Firmwares.java
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/data/PINStorage.java b/tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/data/PINStorage.java
similarity index 100%
rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/data/PINStorage.java
rename to tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/data/PINStorage.java
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcDeviceAntennaLocation.kt b/tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcDeviceAntennaLocation.kt
similarity index 100%
rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcDeviceAntennaLocation.kt
rename to tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcDeviceAntennaLocation.kt
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLifecycleObserver.kt b/tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLifecycleObserver.kt
similarity index 100%
rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLifecycleObserver.kt
rename to tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLifecycleObserver.kt
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLocation.kt b/tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLocation.kt
similarity index 100%
rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLocation.kt
rename to tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/nfc/NfcLocation.kt
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/reader/NfcManager.kt b/tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/reader/NfcManager.kt
similarity index 100%
rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/reader/NfcManager.kt
rename to tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/reader/NfcManager.kt
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/reader/NfcReader.kt b/tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/reader/NfcReader.kt
similarity index 100%
rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/reader/NfcReader.kt
rename to tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/reader/NfcReader.kt
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/ui/NfcEnableDialog.kt b/tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/ui/NfcEnableDialog.kt
similarity index 100%
rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk/android/ui/NfcEnableDialog.kt
rename to tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/android/ui/NfcEnableDialog.kt
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk/data/TangemCardExtensions.kt b/tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/data/TangemCardExtensions.kt
similarity index 100%
rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk/data/TangemCardExtensions.kt
rename to tangem-sdk-old/src/main/java/com/tangem/tangem_sdk/data/TangemCardExtensions.kt
diff --git a/tangem-sdk/src/main/res/drawable/card_default.png b/tangem-sdk-old/src/main/res/drawable/card_default.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/card_default.png
rename to tangem-sdk-old/src/main/res/drawable/card_default.png
diff --git a/tangem-sdk-new/src/main/res/drawable/hand_card_horizontal.png b/tangem-sdk-old/src/main/res/drawable/hand_card_horizontal.png
similarity index 100%
rename from tangem-sdk-new/src/main/res/drawable/hand_card_horizontal.png
rename to tangem-sdk-old/src/main/res/drawable/hand_card_horizontal.png
diff --git a/tangem-sdk-new/src/main/res/drawable/hand_card_vertical.png b/tangem-sdk-old/src/main/res/drawable/hand_card_vertical.png
similarity index 100%
rename from tangem-sdk-new/src/main/res/drawable/hand_card_vertical.png
rename to tangem-sdk-old/src/main/res/drawable/hand_card_vertical.png
diff --git a/tangem-sdk-new/src/main/res/drawable/ic_action_nfc_gray.png b/tangem-sdk-old/src/main/res/drawable/ic_action_nfc_gray.png
similarity index 100%
rename from tangem-sdk-new/src/main/res/drawable/ic_action_nfc_gray.png
rename to tangem-sdk-old/src/main/res/drawable/ic_action_nfc_gray.png
diff --git a/tangem-sdk/src/main/res/drawable/ic_logo_bat_token.png b/tangem-sdk-old/src/main/res/drawable/ic_logo_bat_token.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/ic_logo_bat_token.png
rename to tangem-sdk-old/src/main/res/drawable/ic_logo_bat_token.png
diff --git a/tangem-sdk/src/main/res/drawable/ic_logo_bitcoin.png b/tangem-sdk-old/src/main/res/drawable/ic_logo_bitcoin.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/ic_logo_bitcoin.png
rename to tangem-sdk-old/src/main/res/drawable/ic_logo_bitcoin.png
diff --git a/tangem-sdk/src/main/res/drawable/ic_logo_bitcoin_cash.png b/tangem-sdk-old/src/main/res/drawable/ic_logo_bitcoin_cash.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/ic_logo_bitcoin_cash.png
rename to tangem-sdk-old/src/main/res/drawable/ic_logo_bitcoin_cash.png
diff --git a/tangem-sdk/src/main/res/drawable/ic_logo_bitcoin_testnet.png b/tangem-sdk-old/src/main/res/drawable/ic_logo_bitcoin_testnet.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/ic_logo_bitcoin_testnet.png
rename to tangem-sdk-old/src/main/res/drawable/ic_logo_bitcoin_testnet.png
diff --git a/tangem-sdk/src/main/res/drawable/ic_logo_ethereum.png b/tangem-sdk-old/src/main/res/drawable/ic_logo_ethereum.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/ic_logo_ethereum.png
rename to tangem-sdk-old/src/main/res/drawable/ic_logo_ethereum.png
diff --git a/tangem-sdk/src/main/res/drawable/ic_logo_ethereum_testnet.png b/tangem-sdk-old/src/main/res/drawable/ic_logo_ethereum_testnet.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/ic_logo_ethereum_testnet.png
rename to tangem-sdk-old/src/main/res/drawable/ic_logo_ethereum_testnet.png
diff --git a/tangem-sdk/src/main/res/drawable/ic_logo_seed.png b/tangem-sdk-old/src/main/res/drawable/ic_logo_seed.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/ic_logo_seed.png
rename to tangem-sdk-old/src/main/res/drawable/ic_logo_seed.png
diff --git a/tangem-sdk/src/main/res/drawable/ic_logo_stellar.png b/tangem-sdk-old/src/main/res/drawable/ic_logo_stellar.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/ic_logo_stellar.png
rename to tangem-sdk-old/src/main/res/drawable/ic_logo_stellar.png
diff --git a/tangem-sdk/src/main/res/drawable/ic_logo_unknown.png b/tangem-sdk-old/src/main/res/drawable/ic_logo_unknown.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/ic_logo_unknown.png
rename to tangem-sdk-old/src/main/res/drawable/ic_logo_unknown.png
diff --git a/tangem-sdk/src/main/res/drawable/tangem2.png b/tangem-sdk-old/src/main/res/drawable/tangem2.png
similarity index 100%
rename from tangem-sdk/src/main/res/drawable/tangem2.png
rename to tangem-sdk-old/src/main/res/drawable/tangem2.png
diff --git a/tangem-sdk/src/main/res/values-fr/strings.xml b/tangem-sdk-old/src/main/res/values-fr/strings.xml
similarity index 100%
rename from tangem-sdk/src/main/res/values-fr/strings.xml
rename to tangem-sdk-old/src/main/res/values-fr/strings.xml
diff --git a/tangem-sdk-old/src/main/res/values/strings.xml b/tangem-sdk-old/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..067b995daf
--- /dev/null
+++ b/tangem-sdk-old/src/main/res/values/strings.xml
@@ -0,0 +1,9 @@
+<resources>
+
+    <string name="app_name" translatable="false">tangemcard</string>
+    <string name="general_ok">OK</string>
+    <string name="dialog_quit">Quit</string>
+    <string name="dialog_nfc_enable_title">Enable NFC?</string>
+    <string name="dialog_nfc_enable_text">This app is useless when NFC is disabled. Reader mode depends on it. Hit OK to go to Settings, where you can enable NFC.</string>
+
+</resources>
diff --git a/tangem-sdk/src/test/java/com/tangem/tangem_sdk/ExampleUnitTest.java b/tangem-sdk-old/src/test/java/com/tangem/tangem_sdk/ExampleUnitTest.java
similarity index 100%
rename from tangem-sdk/src/test/java/com/tangem/tangem_sdk/ExampleUnitTest.java
rename to tangem-sdk-old/src/test/java/com/tangem/tangem_sdk/ExampleUnitTest.java
diff --git a/tangem-sdk/build.gradle b/tangem-sdk/build.gradle
index 5471f31c0c..859ce84389 100644
--- a/tangem-sdk/build.gradle
+++ b/tangem-sdk/build.gradle
@@ -1,31 +1,31 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'kotlin-android-extensions'
 
-group='com.tangem'
+group = 'com.github.TangemCash'
+version '0.2.2'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
+    buildToolsVersion "29.0.0"
+
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-        debug_beta {
-            initWith debug
-            versionNameSuffix "-beta"
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    buildToolsVersion '28.0.3'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -33,27 +33,23 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-
 }
 
 dependencies {
     implementation project(':tangem-card')
-//    implementation 'com.github.TangemCash.card_android-common:card_android-android:0.1.0'
-
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
+    implementation 'com.google.android.material:material:1.1.0-beta01'
+    implementation 'com.skyfishjy.ripplebackground:library:1.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
+    implementation 'androidx.core:core-ktx:1.1.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
     implementation "androidx.lifecycle:lifecycle-runtime:2.1.0"
     implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.scottyab:rootbeer-lib:0.0.7'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-}
-repositories {
-    mavenCentral()
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.50"
 }
diff --git a/tangem-sdk-new/consumer-rules.pro b/tangem-sdk/consumer-rules.pro
similarity index 100%
rename from tangem-sdk-new/consumer-rules.pro
rename to tangem-sdk/consumer-rules.pro
diff --git a/tangem-sdk/src/main/AndroidManifest.xml b/tangem-sdk/src/main/AndroidManifest.xml
index 06bf470bd3..79863d299a 100644
--- a/tangem-sdk/src/main/AndroidManifest.xml
+++ b/tangem-sdk/src/main/AndroidManifest.xml
@@ -1,8 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tangem.tangem_sdk" >
-    <uses-feature
-        android:name="android.hardware.nfc"
-        android:required="true" />
+    package="com.tangem.tangem_sdk_new" >
 
     <uses-permission android:name="android.permission.NFC" />
 </manifest>
diff --git a/tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/DefaultCardManagerDelegate.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/DefaultCardManagerDelegate.kt
similarity index 100%
rename from tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/DefaultCardManagerDelegate.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/DefaultCardManagerDelegate.kt
diff --git a/tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/NfcLifecycleObserver.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/NfcLifecycleObserver.kt
similarity index 100%
rename from tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/NfcLifecycleObserver.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/NfcLifecycleObserver.kt
diff --git a/tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/Utils.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/Utils.kt
similarity index 100%
rename from tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/Utils.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/Utils.kt
diff --git a/tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcManager.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcManager.kt
similarity index 100%
rename from tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcManager.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcManager.kt
diff --git a/tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcReader.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcReader.kt
similarity index 100%
rename from tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcReader.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcReader.kt
diff --git a/tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/ui/NfcEnableDialog.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/ui/NfcEnableDialog.kt
similarity index 100%
rename from tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/ui/NfcEnableDialog.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/ui/NfcEnableDialog.kt
diff --git a/tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/ui/NfcLocation.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/ui/NfcLocation.kt
similarity index 100%
rename from tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/ui/NfcLocation.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/ui/NfcLocation.kt
diff --git a/tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/ui/TouchCardAnimation.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/ui/TouchCardAnimation.kt
similarity index 100%
rename from tangem-sdk-new/src/main/java/com/tangem/tangem_sdk_new/ui/TouchCardAnimation.kt
rename to tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/ui/TouchCardAnimation.kt
diff --git a/tangem-sdk-new/src/main/res/drawable/ic_done_135dp.xml b/tangem-sdk/src/main/res/drawable/ic_done_135dp.xml
similarity index 100%
rename from tangem-sdk-new/src/main/res/drawable/ic_done_135dp.xml
rename to tangem-sdk/src/main/res/drawable/ic_done_135dp.xml
diff --git a/tangem-sdk-new/src/main/res/drawable/ic_error_outline_135dp.xml b/tangem-sdk/src/main/res/drawable/ic_error_outline_135dp.xml
similarity index 100%
rename from tangem-sdk-new/src/main/res/drawable/ic_error_outline_135dp.xml
rename to tangem-sdk/src/main/res/drawable/ic_error_outline_135dp.xml
diff --git a/tangem-sdk-new/src/main/res/drawable/smartphone.png b/tangem-sdk/src/main/res/drawable/smartphone.png
similarity index 100%
rename from tangem-sdk-new/src/main/res/drawable/smartphone.png
rename to tangem-sdk/src/main/res/drawable/smartphone.png
diff --git a/tangem-sdk-new/src/main/res/layout/layout_touch_card.xml b/tangem-sdk/src/main/res/layout/layout_touch_card.xml
similarity index 100%
rename from tangem-sdk-new/src/main/res/layout/layout_touch_card.xml
rename to tangem-sdk/src/main/res/layout/layout_touch_card.xml
diff --git a/tangem-sdk-new/src/main/res/layout/nfc_bottom_sheet.xml b/tangem-sdk/src/main/res/layout/nfc_bottom_sheet.xml
similarity index 100%
rename from tangem-sdk-new/src/main/res/layout/nfc_bottom_sheet.xml
rename to tangem-sdk/src/main/res/layout/nfc_bottom_sheet.xml
diff --git a/tangem-sdk-new/src/main/res/values/colors.xml b/tangem-sdk/src/main/res/values/colors.xml
similarity index 100%
rename from tangem-sdk-new/src/main/res/values/colors.xml
rename to tangem-sdk/src/main/res/values/colors.xml
diff --git a/tangem-sdk-new/src/main/res/values/dimens.xml b/tangem-sdk/src/main/res/values/dimens.xml
similarity index 100%
rename from tangem-sdk-new/src/main/res/values/dimens.xml
rename to tangem-sdk/src/main/res/values/dimens.xml
diff --git a/tangem-sdk/src/main/res/values/strings.xml b/tangem-sdk/src/main/res/values/strings.xml
index 067b995daf..f9ab1c5567 100644
--- a/tangem-sdk/src/main/res/values/strings.xml
+++ b/tangem-sdk/src/main/res/values/strings.xml
@@ -1,9 +1,10 @@
 <resources>
-
-    <string name="app_name" translatable="false">tangemcard</string>
+    <string name="app_name">Tangem Sdk</string>
     <string name="general_ok">OK</string>
-    <string name="dialog_quit">Quit</string>
     <string name="dialog_nfc_enable_title">Enable NFC?</string>
     <string name="dialog_nfc_enable_text">This app is useless when NFC is disabled. Reader mode depends on it. Hit OK to go to Settings, where you can enable NFC.</string>
+    <string name="dialog_security_delay">Security delay</string>
+    <string name="dialog_security_delay_description">This banknote has enforced security delay. Please hold the banknote firmly until the operation is completed…</string>
+    <string name="dialog_error">Error</string>
 
 </resources>
diff --git a/tangemtest/build.gradle b/tangemtest/build.gradle
index e3849d649e..b815e777ea 100644
--- a/tangemtest/build.gradle
+++ b/tangemtest/build.gradle
@@ -32,8 +32,8 @@ android {
 }
 
 dependencies {
-    implementation project(':tangem-card-new')
-    implementation project(':tangem-sdk-new')
+    implementation project(':tangem-card')
+    implementation project(':tangem-sdk')
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"