diff --git a/.gitignore b/.gitignore
index c8175b0..83230fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /.idea
 /private.properties
 
+sdk/.cxx
diff --git a/build.gradle b/build.gradle
index d55937a..18e9b74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,44 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        //classpath 'com.android.tools.build:gradle:3.3.0-alpha04'
-        classpath 'com.android.tools.build:gradle:3.1.4'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
+plugins {
+    id 'com.android.application' version '8.0.0' apply false
 }
 
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
+ext {
+    // Sdk and tools
+    minSdkVersion = 21
+    targetSdkVersion = 33
+    compileSdkVersion = 33
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-ext {
-    // Sdk and tools
-    minSdkVersion = 16
-    targetSdkVersion = 28
-    compileSdkVersion = 28
-
-    // App dependencies
-    supportLibVersion = '27.1.1'
-    yearclassVersion = "2.1.0"
-
-    // App test dependencies
-    junitVersion = '4.12'
-    espressoVersion = '3.0.2'
-    robolectricVersion = "3.8"
-    mockitoVersion = "2.21.0"
-}
diff --git a/demo/build.gradle b/demo/build.gradle
index 6e8d3df..5a226ca 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -1,6 +1,7 @@
-apply plugin: 'com.android.application'
-
-uploadArchives.enabled = false
+plugins {
+    id 'com.android.application'
+}
+//uploadArchives.enabled = false
 
 ext.private = new Properties()
 if (rootProject.file('private.properties').exists()) {
@@ -16,8 +17,8 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode Integer.parseInt(DEMO_APP_VERSION_CODE)
         versionName DEMO_APP_VERSION_NAME
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        resConfigs "en"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        resourceConfigurations += ['en']
     }
     signingConfigs {
         release
@@ -39,9 +40,17 @@ android {
         }
     }
     packagingOptions {
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
+        resources {
+            excludes += ['META-INF/LICENSE.txt', 'META-INF/NOTICE.txt']
+        }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    namespace 'cards.pay.sample.demo'
 }
 
 dependencies {
@@ -49,11 +58,11 @@ dependencies {
     implementation project(path: ":sdk")
     //debugCompile project(path: ":sdk", configuration: 'release')
     //releaseCompile project(path: ":sdk", configuration: 'release')
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibVersion"
-    implementation "com.android.support:gridlayout-v7:$rootProject.ext.supportLibVersion"
-    implementation "com.android.support:design:$rootProject.ext.supportLibVersion"
-    testImplementation "junit:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
+    implementation "androidx.appcompat:appcompat:1.6.1"
+    implementation "androidx.gridlayout:gridlayout:1.0.0"
+    implementation "com.google.android.material:material:1.9.0"
+    testImplementation "junit:junit:4.13.2"
 }
 
 if (ext.private.getProperty("release.StoreFile") != null) {
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index e411a4f..90ead65 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="cards.pay.sample.demo">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="false"
@@ -10,7 +9,8 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".IntroActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/demo/src/main/java/cards/pay/sample/demo/CardDetailsActivity.java b/demo/src/main/java/cards/pay/sample/demo/CardDetailsActivity.java
index 7570850..fe7d7e8 100644
--- a/demo/src/main/java/cards/pay/sample/demo/CardDetailsActivity.java
+++ b/demo/src/main/java/cards/pay/sample/demo/CardDetailsActivity.java
@@ -5,11 +5,11 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.ResultReceiver;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
@@ -18,6 +18,7 @@
 
 import java.lang.reflect.Method;
 
+import cards.pay.paycardsrecognizer.sdk.BuildConfig;
 import cards.pay.paycardsrecognizer.sdk.Card;
 import cards.pay.paycardsrecognizer.sdk.ScanCardIntent;
 import cards.pay.paycardsrecognizer.sdk.ScanCardIntent.CancelReason;
diff --git a/demo/src/main/java/cards/pay/sample/demo/FinalActivity.java b/demo/src/main/java/cards/pay/sample/demo/FinalActivity.java
index afd7ad6..f3f75d0 100644
--- a/demo/src/main/java/cards/pay/sample/demo/FinalActivity.java
+++ b/demo/src/main/java/cards/pay/sample/demo/FinalActivity.java
@@ -3,9 +3,9 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 
diff --git a/demo/src/main/java/cards/pay/sample/demo/IntroActivity.java b/demo/src/main/java/cards/pay/sample/demo/IntroActivity.java
index a3e662a..4bc7727 100644
--- a/demo/src/main/java/cards/pay/sample/demo/IntroActivity.java
+++ b/demo/src/main/java/cards/pay/sample/demo/IntroActivity.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 public class IntroActivity extends AppCompatActivity {
diff --git a/demo/src/main/java/cards/pay/sample/demo/validation/FieldValidationResult.java b/demo/src/main/java/cards/pay/sample/demo/validation/FieldValidationResult.java
index 88f0cf5..1cb85d5 100644
--- a/demo/src/main/java/cards/pay/sample/demo/validation/FieldValidationResult.java
+++ b/demo/src/main/java/cards/pay/sample/demo/validation/FieldValidationResult.java
@@ -1,8 +1,8 @@
 package cards.pay.sample.demo.validation;
 
 import android.content.res.Resources;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 
 public class FieldValidationResult {
 
diff --git a/demo/src/main/java/cards/pay/sample/demo/validation/ValidationResult.java b/demo/src/main/java/cards/pay/sample/demo/validation/ValidationResult.java
index 810f35e..c6c208e 100644
--- a/demo/src/main/java/cards/pay/sample/demo/validation/ValidationResult.java
+++ b/demo/src/main/java/cards/pay/sample/demo/validation/ValidationResult.java
@@ -1,7 +1,7 @@
 package cards.pay.sample.demo.validation;
 
 import android.content.res.Resources;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.SparseArray;
 
 public class ValidationResult extends SparseArray<FieldValidationResult> {
diff --git a/demo/src/main/java/cards/pay/sample/demo/widget/CardDateEditText.java b/demo/src/main/java/cards/pay/sample/demo/widget/CardDateEditText.java
index 113613c..6de1039 100644
--- a/demo/src/main/java/cards/pay/sample/demo/widget/CardDateEditText.java
+++ b/demo/src/main/java/cards/pay/sample/demo/widget/CardDateEditText.java
@@ -1,7 +1,7 @@
 package cards.pay.sample.demo.widget;
 
 import android.content.Context;
-import android.support.design.widget.TextInputEditText;
+import com.google.android.material.textfield.TextInputEditText;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.InputType;
diff --git a/demo/src/main/java/cards/pay/sample/demo/widget/CardNumberEditText.java b/demo/src/main/java/cards/pay/sample/demo/widget/CardNumberEditText.java
index b3d0d2f..212d1b9 100644
--- a/demo/src/main/java/cards/pay/sample/demo/widget/CardNumberEditText.java
+++ b/demo/src/main/java/cards/pay/sample/demo/widget/CardNumberEditText.java
@@ -1,7 +1,7 @@
 package cards.pay.sample.demo.widget;
 
 import android.content.Context;
-import android.support.design.widget.TextInputEditText;
+import com.google.android.material.textfield.TextInputEditText;
 import android.text.InputFilter;
 import android.text.InputType;
 import android.text.method.DigitsKeyListener;
diff --git a/demo/src/main/res/layout-h480dp/activity_final.xml b/demo/src/main/res/layout-h480dp/activity_final.xml
index e358675..af5727d 100644
--- a/demo/src/main/res/layout-h480dp/activity_final.xml
+++ b/demo/src/main/res/layout-h480dp/activity_final.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/demo/src/main/res/layout-h480dp/activity_intro.xml b/demo/src/main/res/layout-h480dp/activity_intro.xml
index 9a5af9a..c917bee 100644
--- a/demo/src/main/res/layout-h480dp/activity_intro.xml
+++ b/demo/src/main/res/layout-h480dp/activity_intro.xml
@@ -6,12 +6,12 @@
     android:fitsSystemWindows="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?actionBarSize">
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_next"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:background="?selectableItemBackground"
@@ -21,7 +21,7 @@
             android:layout_margin="0dp"
             android:text="@string/all_button_next" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/demo/src/main/res/layout/activity_card_details.xml b/demo/src/main/res/layout/activity_card_details.xml
index 16e399f..596d73c 100644
--- a/demo/src/main/res/layout/activity_card_details.xml
+++ b/demo/src/main/res/layout/activity_card_details.xml
@@ -6,12 +6,12 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?actionBarSize">
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_next"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:background="?selectableItemBackground"
@@ -21,7 +21,7 @@
             android:layout_margin="0dp"
             android:text="@string/all_button_next" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <ScrollView
         android:layout_width="match_parent"
@@ -55,7 +55,7 @@
                 android:layout_marginBottom="4dp"
                 android:text="@string/carddetails_subhead" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/card_number_field"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -68,15 +68,15 @@
                     android:hint="@string/carddetails_card_number_field_label"
                     tools:text="1234 5678 9012 3456" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/cardholder_field"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/cardholder_field_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -85,9 +85,9 @@
                     android:inputType="textVisiblePassword|textCapCharacters"
                     tools:text="CARDHOLDER NAME" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/expiry_date_field"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -101,7 +101,7 @@
                     android:imeOptions="actionDone|flagNoExtractUi"
                     tools:text="01/21" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <Button
                 android:id="@+id/scan_button"
diff --git a/demo/src/main/res/layout/activity_final.xml b/demo/src/main/res/layout/activity_final.xml
index 09ba233..de54899 100644
--- a/demo/src/main/res/layout/activity_final.xml
+++ b/demo/src/main/res/layout/activity_final.xml
@@ -7,7 +7,7 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/demo/src/main/res/layout/activity_intro.xml b/demo/src/main/res/layout/activity_intro.xml
index c4eac01..b809580 100644
--- a/demo/src/main/res/layout/activity_intro.xml
+++ b/demo/src/main/res/layout/activity_intro.xml
@@ -6,13 +6,13 @@
     android:fitsSystemWindows="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?actionBarSize"
         android:minHeight="?actionBarSize">
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_next"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:background="?selectableItemBackground"
@@ -22,7 +22,7 @@
             android:layout_margin="0dp"
             android:text="@string/all_button_next" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/gradle.properties b/gradle.properties
index 29507d2..9006b20 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,3 +33,8 @@ POM_LICENCE_URL=https://opensource.org/licenses/MIT
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=faceterteam
 POM_DEVELOPER_NAME=Mobile Money Solutions Oy
+android.useAndroidX=true
+android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7dc503f..fe336ff 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed May 31 22:47:17 EEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sdk/build.gradle b/sdk/build.gradle
index 74e33de..7110884 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -1,18 +1,17 @@
 apply plugin: 'com.android.library'
-apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     testBuildType "profiling"
-
+    ndkVersion "25.2.9519653"
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode Integer.parseInt(VERSION_CODE)
         versionName VERSION_NAME
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         externalNativeBuild {
             cmake {
@@ -35,7 +34,6 @@ android {
         }
         debug {
             jniDebuggable true
-            debuggable true
         }
         profiling {
             initWith debug
@@ -48,29 +46,37 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     resourcePrefix "wocr_"
+    namespace 'cards.pay.paycardsrecognizer.sdk'
 }
 
 dependencies {
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibVersion"
-    implementation "com.facebook.device.yearclass:yearclass:$rootProject.ext.yearclassVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
+    implementation "androidx.appcompat:appcompat:1.6.1"
+    implementation "com.facebook.device.yearclass:yearclass:2.1.0"
+    implementation "androidx.camera:camera-camera2:1.2.3"
+    // If you want to additionally use the CameraX Lifecycle library
+    implementation "androidx.camera:camera-lifecycle:1.2.3"
+    // If you want to additionally use the CameraX View class
+    implementation "androidx.camera:camera-view:1.2.3"
+
+//    implementation "androidx.window:window:1.2.0-alpha01"
 
-    testImplementation "junit:junit:$rootProject.ext.junitVersion"
+    testImplementation "junit:junit:4.13.2"
 }
 
-afterEvaluate { project ->
-    android.libraryVariants.all { variant ->
-        tasks.androidJavadocs.doFirst {
-            include '**/cards/pay/paycardsrecognizer/sdk/*.java'
-            options.encoding = "utf-8"
-            options.charSet = "utf-8"
-            options.showFromPublic()
-            failOnError false
-        }
-    }
-}
\ No newline at end of file
+//afterEvaluate { project ->
+//    android.libraryVariants.all { variant ->
+//        tasks.androidJavadocs.doFirst {
+//            include '**/cards/pay/paycardsrecognizer/sdk/*.java'
+//            options.encoding = "utf-8"
+//            options.charSet = "utf-8"
+//            options.showFromPublic()
+//            failOnError false
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/sdk/src/main/AndroidManifest.xml b/sdk/src/main/AndroidManifest.xml
index 6e0fe58..e896b12 100644
--- a/sdk/src/main/AndroidManifest.xml
+++ b/sdk/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cards.pay.paycardsrecognizer.sdk">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
@@ -17,7 +16,7 @@
     <application>
         <activity
             android:name="cards.pay.paycardsrecognizer.sdk.ui.ScanCardActivity"
-            android:theme="@style/wocr_RecognizerTheme" />
+            android:theme="@style/wocr_RecognizerTheme"/>
     </application>
 
 
diff --git a/sdk/src/main/cpp/crossplatform/CrossPlatform/Recognizer/NameRecognizer.h b/sdk/src/main/cpp/crossplatform/CrossPlatform/Recognizer/NameRecognizer.h
index 23ccdfd..b2137ea 100644
--- a/sdk/src/main/cpp/crossplatform/CrossPlatform/Recognizer/NameRecognizer.h
+++ b/sdk/src/main/cpp/crossplatform/CrossPlatform/Recognizer/NameRecognizer.h
@@ -11,6 +11,7 @@
 
 #include "INameRecognizer.h"
 #include <fstream>
+#include <sstream>
 
 class INeuralNetworkResultList;
 class IServiceContainer;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/Card.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/Card.java
index 31f2ccc..2d49db4 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/Card.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/Card.java
@@ -3,7 +3,9 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.io.Serializable;
 
@@ -73,6 +75,7 @@ public int hashCode() {
         return result;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "Card{" +
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ScanCardIntent.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ScanCardIntent.java
index 665f38c..bc9177b 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ScanCardIntent.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ScanCardIntent.java
@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.IntDef;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.IntDef;
+import androidx.annotation.RestrictTo;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/AutoFocusManager.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/AutoFocusManager.java
deleted file mode 100644
index f68bf8f..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/AutoFocusManager.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import android.annotation.TargetApi;
-import android.hardware.Camera;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.util.Log;
-
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-import static android.hardware.Camera.AutoFocusCallback;
-import static android.hardware.Camera.AutoFocusMoveCallback;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class AutoFocusManager {
-
-    private static final boolean DBG = Constants.DEBUG;
-    private static final String TAG = "AutoFocusManager";
-
-    private final Camera mCamera;
-
-    @Nullable
-    private final FocusMoveCallback mCallback;
-
-    @Nullable
-    private FocusManager mFocusManager;
-
-    private Handler mHandler;
-
-    public interface FocusMoveCallback {
-        void onAutoFocusMoving(boolean start, Camera camera);
-        void onAutoFocusComplete(boolean success, Camera camera);
-    }
-
-    public AutoFocusManager(Camera camera, @Nullable FocusMoveCallback callback) {
-        mCamera = camera;
-        mCallback = callback;
-        mHandler = new Handler(Looper.myLooper());
-    }
-
-    public void start() {
-        if (mFocusManager != null) {
-            mFocusManager.stop();
-            mFocusManager = null;
-        }
-        if (isCameraFocusContinuous()) {
-            mFocusManager = new AutoFocusManagerImpl(mCamera, mCallback, mHandler);
-            mFocusManager.start();
-            if (DBG) Log.d(TAG, "start(): camera continuous focus");
-        } else if (isCameraFocusManual()) {
-            mFocusManager = new ManualFocusManagerImpl(mCamera, mCallback, mHandler);
-            mFocusManager.start();
-            if (DBG) Log.d(TAG, "start(): focus with manual reset");
-        } else {
-            // Focus is fixed. Ignore
-        }
-    }
-
-    public void stop() {
-        if (mFocusManager != null) {
-            mFocusManager.stop();
-            mFocusManager = null;
-        }
-    }
-
-    public boolean isStarted() {
-        return mFocusManager !=  null;
-    }
-
-    public void requestFocus() {
-        if (mFocusManager != null) {
-            mFocusManager.requestFocus();
-        }
-    }
-
-    private boolean isCameraFocusContinuous() {
-        String focusMode = mCamera.getParameters().getFocusMode();
-        return Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.equals(focusMode)
-                || Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO.equals(focusMode)
-                || Camera.Parameters.FOCUS_MODE_EDOF .equals(focusMode);
-    }
-
-    private boolean isCameraFocusFixed() {
-        String focusMode = mCamera.getParameters().getFocusMode();
-        return Camera.Parameters.FOCUS_MODE_INFINITY.equals(focusMode)
-                || Camera.Parameters. FOCUS_MODE_FIXED.equals(focusMode);
-    }
-
-    private boolean isCameraFocusManual() {
-        String focusMode = mCamera.getParameters().getFocusMode();
-        return Camera.Parameters.FOCUS_MODE_AUTO.equals(focusMode)
-                || Camera.Parameters. FOCUS_MODE_MACRO.equals(focusMode);
-    }
-
-    private interface FocusManager {
-        void start();
-        void stop();
-        void requestFocus();
-    }
-
-
-    private static class ManualFocusManagerImpl implements FocusManager {
-
-        private static final int FOCUS_DELAY_FAST = 500;
-
-        private static final int FOCUS_DELAY_SLOW = 3000;
-
-        private final Camera mCamera;
-
-        @Nullable
-        private final FocusMoveCallback mCallback;
-
-        private final Handler mHandler;
-
-        private boolean mIsFocusMoving;
-
-        private static boolean sFocusCompleteWorking;
-
-        @TargetApi(16)
-        public ManualFocusManagerImpl(Camera camera, @Nullable FocusMoveCallback callback, Handler handler) {
-            this.mCamera = camera;
-            this.mCallback = callback;
-            this.mHandler = handler;
-            if (Build.VERSION.SDK_INT >= 16 && this.mCallback != null) {
-                mCamera.setAutoFocusMoveCallback(new AutoFocusMoveCallback() {
-                    @Override
-                    public void onAutoFocusMoving(boolean start, Camera camera) {
-                        mCallback.onAutoFocusMoving(start, camera);
-                    }
-                });
-            }
-        }
-
-        @Override
-        public void start() {
-            cancelAutoFocusSafe();
-            restartCounter(FOCUS_DELAY_FAST);
-        }
-
-        @Override
-        public void stop() {
-            mHandler.removeCallbacks(mRequestFocusRunnable);
-            cancelAutoFocusSafe();
-        }
-
-        @Override
-        public void requestFocus() {
-            if (!mIsFocusMoving || !sFocusCompleteWorking) {
-                cancelAutoFocusSafe();
-                restartCounter(0);
-            }
-        }
-
-        private void restartCounter(int delay) {
-            mHandler.removeCallbacks(mRequestFocusRunnable);
-            if (delay == 0) {
-                mHandler.post(mRequestFocusRunnable);
-            } else {
-                mHandler.postDelayed(mRequestFocusRunnable, delay);
-            }
-        }
-
-        private final Runnable mRequestFocusRunnable = new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mCamera.autoFocus(mAutoFocusCallback);
-                    mIsFocusMoving = true;
-                    if (mCallback != null) mCallback.onAutoFocusMoving(true, mCamera);
-                } catch (final Exception ignored) {
-                    mIsFocusMoving = false;
-                    if (mCallback != null) mCallback.onAutoFocusMoving(false, mCamera);
-                }
-            }
-        };
-
-        private final AutoFocusCallback mAutoFocusCallback = new AutoFocusCallback() {
-            @Override
-            public void onAutoFocus(final boolean success, final Camera camera) {
-                if (mCallback != null) mCallback.onAutoFocusComplete(success, camera);
-
-                mIsFocusMoving = false;
-
-                if (!sFocusCompleteWorking) {
-                    sFocusCompleteWorking = true;
-                    if (DBG) Log.d(TAG, "onAutoFocus() onAutoFocus callback looks like working");
-                }
-
-                restartCounter(success ? FOCUS_DELAY_SLOW : FOCUS_DELAY_FAST);
-            }
-        };
-
-        private void cancelAutoFocusSafe() {
-            try {
-                mCamera.cancelAutoFocus();
-            } catch (RuntimeException e) {
-                // IGNORE
-            }
-        }
-    }
-
-
-    /**
-     * {@link Camera.Parameters#FOCUS_MODE_CONTINUOUS_PICTURE} and {@link Camera.Parameters#FOCUS_MODE_CONTINUOUS_VIDEO}
-     * focus mode
-     */
-    private static class AutoFocusManagerImpl implements FocusManager {
-
-        private static final int FOCUS_RESET_DELAY = 1000;
-
-        private final Camera mCamera;
-
-        @Nullable
-        private final FocusMoveCallback mCallback;
-
-        private final Handler mHandler;
-
-        private boolean mCameraMoving;
-
-        @TargetApi(16)
-        public AutoFocusManagerImpl(Camera camera, @Nullable FocusMoveCallback callback, Handler handler) {
-            this.mCamera = camera;
-            this.mCallback = callback;
-            this.mHandler = handler;
-            if (Build.VERSION.SDK_INT >= 16 && this.mCallback != null) {
-                mCamera.setAutoFocusMoveCallback(new AutoFocusMoveCallback() {
-                    @Override
-                    public void onAutoFocusMoving(boolean start, Camera camera) {
-                        mCallback.onAutoFocusMoving(start, camera);
-                        mCameraMoving = start;
-                    }
-                });
-            }
-        }
-
-        @Override
-        public void start() {
-            resumeAutoFocus();
-            restartCounter(FOCUS_RESET_DELAY);
-        }
-
-        @Override
-        public void stop() {
-            mHandler.removeCallbacks(mResetFocusRunnable);
-        }
-
-        @Override
-        public void requestFocus() {
-            if (!mCameraMoving) {
-                cancelAutoFocusSafe();
-                restartCounter(FOCUS_RESET_DELAY);
-            } else {
-                if (DBG) Log.d(TAG, "requestFocus(): ignore since camera is moving");
-            }
-        }
-
-        private void resumeAutoFocus() {
-            //if (DBG) Log.d(TAG, "resumeAutoFocus()");
-            cancelAutoFocusSafe();
-        }
-
-        private void restartCounter(int delay) {
-            mHandler.removeCallbacks(mResetFocusRunnable);
-            if (delay == 0) {
-                mHandler.post(mResetFocusRunnable);
-            } else {
-                mHandler.postDelayed(mResetFocusRunnable, delay);
-            }
-        }
-
-        private final Runnable mResetFocusRunnable = new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    resumeAutoFocus();
-                    restartCounter(FOCUS_RESET_DELAY);
-                } catch (final Exception ignored) {
-                    // ignore
-                }
-            }
-        };
-
-        private void cancelAutoFocusSafe() {
-            try {
-                mCamera.cancelAutoFocus();
-            } catch (RuntimeException e) {
-                // IGNORE
-            }
-        }
-    }
-
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/BlockingOperationException.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/BlockingOperationException.java
deleted file mode 100644
index 272fb35..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/BlockingOperationException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import android.support.annotation.RestrictTo;
-
-import java.io.IOException;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class BlockingOperationException extends IOException {
-    public BlockingOperationException() {
-    }
-
-    public BlockingOperationException(Throwable cause) {
-        super(cause);
-    }
-
-    public BlockingOperationException(String detailMessage) {
-        super(detailMessage);
-    }
-
-    public BlockingOperationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraConfigurationUtils.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraConfigurationUtils.java
deleted file mode 100644
index f333d7e..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraConfigurationUtils.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import android.graphics.Rect;
-import android.hardware.Camera;
-import android.support.annotation.RestrictTo;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-import static android.hardware.Camera.Area;
-import static android.hardware.Camera.CameraInfo;
-import static android.hardware.Camera.getCameraInfo;
-import static android.hardware.Camera.getNumberOfCameras;
-import static android.hardware.Camera.open;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class CameraConfigurationUtils {
-
-    private static final float MAX_EXPOSURE_COMPENSATION = 1.5f;
-    private static final float MIN_EXPOSURE_COMPENSATION = 0.0f;
-
-    private static final boolean DBG = Constants.DEBUG;
-    private static final String TAG = "CameraConfig";
-
-    private static final boolean ENABLE_EXPOSURE = false;
-    private static final boolean ENABLE_METERING = false;
-
-
-    private CameraConfigurationUtils() {}
-
-    static Camera createCamera() {
-        final int numberOfCameras = getNumberOfCameras();
-        final CameraInfo cameraInfo = new CameraInfo();
-        for (int i = 0; i < numberOfCameras; i++) {
-            getCameraInfo(i, cameraInfo);
-            if (CameraInfo.CAMERA_FACING_BACK == cameraInfo.facing) {
-                return open(i);
-            }
-        }
-        if (0 < numberOfCameras) {
-            return open(0);
-        }
-        return null;
-    }
-
-    static boolean isFlashSupported(final Camera camera) {
-        final Camera.Parameters params = camera.getParameters();
-        return params.getSupportedFlashModes() != null;
-    }
-
-    static boolean setFlashLight(final Camera camera, final boolean enableFlash) {
-        final Camera.Parameters params = camera.getParameters();
-        final List<String> flashes = params.getSupportedFlashModes();
-        if (null != flashes) {
-            if (enableFlash) {
-                if (flashes.contains(Camera.Parameters.FLASH_MODE_TORCH)) {
-                    params.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);
-                } else if (flashes.contains(Camera.Parameters.FLASH_MODE_ON)) {
-                    params.setFlashMode(Camera.Parameters.FLASH_MODE_ON);
-                } else {
-                    return false;
-                }
-            } else {
-                params.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
-            }
-        }
-        setBestExposure(params, enableFlash);
-        camera.setParameters(params);
-        return enableFlash;
-    }
-
-    private static final List<String> FOCUS_LIST = Arrays.asList(
-            Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE,
-            Camera.Parameters.FOCUS_MODE_AUTO,
-            Camera.Parameters.FOCUS_MODE_MACRO,
-            Camera.Parameters.FOCUS_MODE_EDOF
-    );
-
-    public static void initAutoFocus(final Camera.Parameters cameraParameters) {
-        initAutoFocus(cameraParameters, true);
-    }
-
-    public static void initAutoFocus(final Camera.Parameters cameraParameters, boolean enableContinuousFocus) {
-        /*
-        // FLASH_MODE_TORCH does not work with SCENE_MODE_BARCODE
-        final List<String> supportedSceneModes = cameraParameters.getSupportedSceneModes();
-        if (null != supportedSceneModes) {
-            String resultSceneMode = null;
-            if (supportedSceneModes.contains(Camera.Parameters.SCENE_MODE_BARCODE)) {
-                resultSceneMode = Camera.Parameters.SCENE_MODE_BARCODE;
-            }
-            if (null != resultSceneMode) {
-                cameraParameters.setSceneMode(resultSceneMode);
-                return true;
-            }
-        } */
-
-        final List<String> supportedFocusModes = cameraParameters.getSupportedFocusModes();
-        if (null == supportedFocusModes) {
-            return;
-        }
-
-        List<String> focusList = new ArrayList<>(FOCUS_LIST);
-        if (!enableContinuousFocus) {
-            focusList.remove(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
-            focusList.add(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
-        }
-
-        for (String focusMode : focusList) {
-            if (supportedFocusModes.contains(focusMode)) {
-                cameraParameters.setFocusMode(focusMode);
-                break;
-            }
-        }
-    }
-
-    public static void initWhiteBalance(Camera.Parameters parameters) {
-        final List<String> whiteBalance = parameters.getSupportedWhiteBalance();
-        if (whiteBalance != null && whiteBalance.contains(Camera.Parameters.WHITE_BALANCE_AUTO)) {
-            parameters.setWhiteBalance(Camera.Parameters.WHITE_BALANCE_AUTO);
-        }
-    }
-
-
-    public static void setBestExposure(Camera.Parameters parameters, final boolean lightOn) {
-        if (!ENABLE_EXPOSURE) return;
-
-        int minExposure = parameters.getMinExposureCompensation();
-        int maxExposure = parameters.getMaxExposureCompensation();
-        float step = parameters.getExposureCompensationStep();
-        if ((minExposure != 0 || maxExposure != 0) && step > 0.0f) {
-            // Set low when light is on
-            float targetCompensation = lightOn ? MIN_EXPOSURE_COMPENSATION : MAX_EXPOSURE_COMPENSATION;
-            int compensationSteps = Math.round(targetCompensation / step);
-            float actualCompensation = step * compensationSteps;
-            // Clamp value:
-            compensationSteps = Math.max(Math.min(compensationSteps, maxExposure), minExposure);
-            if (parameters.getExposureCompensation() == compensationSteps) {
-                if (DBG) Log.i("CameraConfig", "Exposure compensation already set to " + compensationSteps + " / " + actualCompensation);
-            } else {
-                if (DBG) Log.i("CameraConfig", "Setting exposure compensation to " + compensationSteps + " / " + actualCompensation);
-                parameters.setExposureCompensation(compensationSteps);
-            }
-        } else {
-            if (DBG) Log.i("CameraConfig", "Camera does not support exposure compensation");
-        }
-    }
-
-    public static void setMetering(Camera.Parameters parameters) {
-        if (!ENABLE_METERING) return;
-        if (parameters.isVideoStabilizationSupported()) {
-            parameters.setVideoStabilization(false);
-        }
-
-        setFocusArea(parameters);
-        setMeteringArea(parameters);
-    }
-
-    public static void setFocusArea(Camera.Parameters parameters) {
-        if (parameters.getMaxNumFocusAreas() > 0) {
-            Log.i(TAG, "Old focus areas: " + toString(parameters.getFocusAreas()));
-            List<Camera.Area> cardArea = buildCardArea();
-            Log.i(TAG, "Setting focus area to : " + toString(cardArea));
-            parameters.setFocusAreas(cardArea);
-        } else {
-            Log.i(TAG, "Device does not support focus areas");
-        }
-    }
-
-    public static void setMeteringArea(Camera.Parameters parameters) {
-        if (parameters.getMaxNumMeteringAreas() > 0) {
-            Log.i(TAG, "Old metering areas: " + parameters.getMeteringAreas());
-            List<Camera.Area> cardArea = buildCardArea();
-            Log.i(TAG, "Setting metering area to : " + toString(cardArea));
-            parameters.setMeteringAreas(cardArea);
-        } else {
-            Log.i(TAG, "Device does not support metering areas");
-        }
-    }
-
-    private static List<Camera.Area> buildCardArea() {
-        //Rect rect = new Rect(-917, 32, 917, 325);
-        Rect rect = new Rect(-10, -10, 10, 10);
-        return Collections.singletonList(new Area(rect, 1));
-    }
-
-    private static String toString(Iterable<Camera.Area> areas) {
-        if (areas == null) {
-            return null;
-        }
-        StringBuilder result = new StringBuilder();
-        for (Area area : areas) {
-            result.append(area.rect).append(':').append(area.weight).append(' ');
-        }
-        return result.toString();
-    }
-
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraManager.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraManager.java
deleted file mode 100644
index 72d11ea..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraManager.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import android.content.Context;
-import android.graphics.ImageFormat;
-import android.graphics.SurfaceTexture;
-import android.hardware.Camera;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.Display;
-import android.view.WindowManager;
-
-import java.io.IOException;
-import java.util.List;
-
-import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionCore;
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-class CameraManager {
-
-    private static final boolean DBG = Constants.DEBUG;
-    private static final String TAG = "RenderNCamThreadCamera";
-
-    private final Context mAppContext;
-
-    private final RecognitionCore mRecognitionCore;
-
-    @Nullable
-    private Camera mCamera;
-
-    private AutoFocusManager mAutoFocusManager;
-
-    private TorchManager mTorchManager;
-
-    private volatile ProcessFrameThread mProcessThread;
-
-    private AutoFocusManager.FocusMoveCallback mFocusCallbacks;
-
-    private ProcessFrameThread.Callbacks mProcessFrameCallbacks;
-
-    private volatile Camera.PreviewCallback mSnapNextFrameCallback;
-
-    private boolean mIsResumed;
-
-    private boolean mIsProcessFramesActive;
-
-    public CameraManager(Context context) {
-        mAppContext = context.getApplicationContext();
-        mRecognitionCore = RecognitionCore.getInstance(mAppContext);
-        mIsResumed = true;
-        mIsProcessFramesActive = true;
-    }
-
-    @Nullable
-    public Camera getCamera() {
-        return mCamera;
-    }
-
-    public synchronized boolean isOpen() {
-        return mCamera != null;
-    }
-
-    public Camera.Size getCurrentPreviewSize() {
-        if (mCamera == null) return null;
-        Camera.Parameters parameters = mCamera.getParameters();
-        return parameters.getPreviewSize();
-    }
-
-    public int getSensorOrientation() {
-        return CameraUtils.getBackCameraSensorOrientation();
-    }
-
-    public int calculateDataRotation() {
-        Display display = ((WindowManager)mAppContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-        return CameraUtils.getBackCameraDataRotation(display);
-    }
-
-    public synchronized void openCamera() throws Exception {
-        if (mCamera != null) releaseCamera();
-        openCameraInternal();
-
-        mAutoFocusManager = new AutoFocusManager(mCamera, mFocusCallbacks);
-        syncAutofocusManager();
-
-        mTorchManager = new TorchManager(mRecognitionCore, mCamera);
-        syncTorchManager();
-
-        syncProcessThread(true);
-    }
-
-    public synchronized void releaseCamera() {
-        if (DBG) Log.d(TAG, "releaseCamera()");
-
-        stopProcessThread();
-
-        if (mAutoFocusManager != null) {
-            mAutoFocusManager.stop();
-            mAutoFocusManager = null;
-        }
-        if (mTorchManager != null) {
-            mTorchManager.destroy();
-            mTorchManager = null;
-        }
-        if (mCamera != null) {
-            // release the camera for other applications
-            mCamera.setPreviewCallbackWithBuffer(null);
-            mCamera.stopPreview();
-            mCamera.release();
-            mCamera = null;
-        }
-    }
-
-    public void setAutoFocusCallbacks(AutoFocusManager.FocusMoveCallback callback) {
-        mFocusCallbacks = callback;
-    }
-
-    public void setProcessFrameCallbacks(ProcessFrameThread.Callbacks callbacks) {
-        mProcessFrameCallbacks = callbacks;
-    }
-
-    public void toggleFlash() {
-        if (DBG) Log.d(TAG, "toggleFlash()");
-        if (mTorchManager == null) return;
-        mTorchManager.toggleTorch();
-    }
-
-    public void requestFocus() {
-        if (DBG) Log.d(TAG, "requestFocus()");
-        if (mAutoFocusManager != null) mAutoFocusManager.requestFocus();
-    }
-
-    public synchronized void pause() {
-        if (DBG) Log.d(TAG, "pause()");
-        if (!mIsResumed) return;
-        mIsResumed = false;
-        syncAutofocusManager();
-        syncTorchManager();
-        syncProcessThread(false);
-    }
-
-    public synchronized void resume() {
-        if (DBG) Log.d(TAG, "resume(); is resumed already: " + mIsResumed);
-        if (mIsResumed) return;
-        mIsResumed = true;
-        syncAutofocusManager();
-        syncTorchManager();
-        syncProcessThread(false);
-    }
-
-    public synchronized void resumeProcessFrames() {
-        if (DBG) Log.d(TAG, "resumeProcessFrames(); frames processed already: " + mIsProcessFramesActive);
-        if (mIsProcessFramesActive) return;
-        mIsProcessFramesActive = true;
-        syncAutofocusManager();
-        syncTorchManager();
-        syncProcessThread(false);
-    }
-
-    public synchronized void pauseProcessFrames() {
-        if (!mIsProcessFramesActive) return;
-        mIsProcessFramesActive = false;
-        syncAutofocusManager();
-        syncTorchManager();
-        syncProcessThread(false);
-    }
-
-    void startPreview(SurfaceTexture texture) throws IOException, RuntimeException {
-        if (DBG) Log.d(TAG, "startPreview() called with: " +  "texture = [" + texture + "]");
-        try {
-            if (mCamera != null) {
-                mCamera.setPreviewTexture(texture);
-                mCamera.startPreview();
-            } else {
-                if (DBG) Log.e(TAG, "Camera is not opened. Skip startPreview()");
-            }
-        } catch (IOException | RuntimeException e) {
-            releaseCamera();
-            throw e;
-        }
-    }
-
-
-    private void openCameraInternal() throws Exception {
-        if (mCamera != null) releaseCamera();
-
-        try {
-            mCamera = Camera.open();
-
-            CameraUtils.NativeSupportedSize supportedSize;
-
-            Camera.Parameters parameters = mCamera.getParameters();
-            List<Camera.Size> supportedPreviewSizes = parameters.getSupportedPreviewSizes();
-            supportedSize = CameraUtils.findBestCameraSupportedSize(supportedPreviewSizes);
-            if (supportedSize == CameraUtils.NativeSupportedSize.RESOLUTION_NO_CAMERA) {
-                throw new RecognitionUnavailableException(RecognitionUnavailableException.ERROR_CAMERA_NOT_SUPPORTED);
-            }
-
-            parameters.setPreviewSize(supportedSize.size.width, supportedSize.size.height);
-            parameters.setPreviewFormat(ImageFormat.YV12);
-            CameraConfigurationUtils.setBestExposure(parameters, false);
-
-            CameraConfigurationUtils.initWhiteBalance(parameters);
-            CameraConfigurationUtils.initAutoFocus(parameters);
-
-            // parameters.setRecordingHint(true);
-            CameraConfigurationUtils.setMetering(parameters);
-
-            mCamera.setParameters(parameters);
-
-            // if (DBG) Log.v(TAG, "Camera parameters: " + mCamera.getParameters().flatten().replace(";", "; "));
-        } catch (Exception e) {
-            // Something bad happened
-            if (DBG) Log.e(TAG, "startCamera() error: ", e);
-            releaseCamera();
-            throw e;
-        }
-    }
-
-    private synchronized boolean isTorchManagerShouldBeActive() {
-        return (mCamera != null) && mIsResumed && mIsProcessFramesActive;
-    }
-
-    private boolean isAutofocusShouldBeActive() {
-        return (mCamera != null) && mIsResumed;
-    }
-
-    private synchronized void syncTorchManager() {
-        if (mTorchManager != null) {
-            if (isTorchManagerShouldBeActive()) {
-                mTorchManager.resume();
-            } else {
-                mTorchManager.pause();
-            }
-        }
-    }
-
-    private synchronized void syncAutofocusManager() {
-        if (mAutoFocusManager != null) {
-            if (isAutofocusShouldBeActive()) {
-                mAutoFocusManager.start();
-            } else {
-                mAutoFocusManager.stop();
-            }
-        }
-    }
-
-    private synchronized void syncProcessThread(boolean forceRestart) {
-        if (mIsResumed && mIsProcessFramesActive && (mCamera != null)) {
-            if (forceRestart || (mProcessThread == null)) startProcessThread();
-        } else {
-            if (mProcessThread != null) stopProcessThread();
-        }
-    }
-
-    private synchronized void startProcessThread() {
-        if (mCamera == null) {
-            if (DBG) Log.e(TAG, "Camera is not opened. Skip startProcessThread()");
-            return;
-        }
-        stopProcessThread();
-        mProcessThread = new ProcessFrameThread(mAppContext, mCamera, new ProcessFrameThread.Callbacks() {
-            @Override
-            public void onFrameProcessed(int newBorders) {
-                if (mProcessFrameCallbacks != null) mProcessFrameCallbacks.onFrameProcessed(newBorders);
-
-            }
-
-            @Override
-            public void onFpsReport(String report) {
-                //if (DBG) Log.v(TAG, report);
-                if (mProcessFrameCallbacks != null) mProcessFrameCallbacks.onFpsReport(report);
-
-            }
-        });
-        mProcessThread.start();
-
-        final ProcessFrameThread thread = mProcessThread;
-        mCamera.setPreviewCallbackWithBuffer(new Camera.PreviewCallback() {
-            Camera.PreviewCallback singleFrameCallback;
-            @Override
-            public void onPreviewFrame(byte[] data, Camera camera) {
-                if (mCamera == null) return;
-                if (DBG) {
-                    singleFrameCallback = mSnapNextFrameCallback;
-                    mSnapNextFrameCallback = null;
-                    if (singleFrameCallback != null) singleFrameCallback.onPreviewFrame(data, camera);
-                }
-                thread.processFrame(data);
-            }
-        });
-        Camera.Size size = mCamera.getParameters().getPreviewSize();
-        for (int i = 0; i < 3; ++i) {
-            mCamera.addCallbackBuffer(new byte[size.width * size.height * 3 / 2]);
-        }
-    }
-
-    private synchronized void stopProcessThread() {
-        if (DBG) Log.d(TAG, "stopProcessThread()");
-        if (mProcessThread != null) {
-            mProcessThread.setActive(false);
-            mProcessThread = null;
-            if (mCamera != null) mCamera.setPreviewCallbackWithBuffer(null);
-        }
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraUtils.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraUtils.java
index bc0c500..83c8b32 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraUtils.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/CameraUtils.java
@@ -1,14 +1,9 @@
 package cards.pay.paycardsrecognizer.sdk.camera;
 
-import android.hardware.Camera;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.text.TextUtils;
-import android.view.Display;
+import android.content.Context;
+import android.content.pm.PackageManager;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
+import androidx.annotation.RestrictTo;
 
 import cards.pay.paycardsrecognizer.sdk.utils.Size;
 
@@ -17,135 +12,9 @@ public final class CameraUtils {
 
     public static final NativeSupportedSize CAMERA_RESOLUTION = NativeSupportedSize.RESOLUTION_1280_X_720;
 
-    private static NativeSupportedSize sBestCameraPreviewSize;
-
-    public static boolean isCameraSupported() throws BlockingOperationException {
-        if (sBestCameraPreviewSize != null) {
-            return sBestCameraPreviewSize != NativeSupportedSize.RESOLUTION_NO_CAMERA;
-        }
-        throw new BlockingOperationException();
-    }
-
-    public static boolean isCameraSupportedBlocking() {
-        try {
-            return isCameraSupported();
-        } catch (BlockingOperationException ignore) {
-        }
-
-        // XXX slooow
-        generateBestCameraPreviewSize();
-
-        return sBestCameraPreviewSize != null && sBestCameraPreviewSize != NativeSupportedSize.RESOLUTION_NO_CAMERA;
-    }
-
-    @Nullable
-    public static NativeSupportedSize findBestCameraSupportedSize(final Iterable<Camera.Size> previewSizes) {
-        NativeSupportedSize best = NativeSupportedSize.RESOLUTION_NO_CAMERA;
-
-        if (null == previewSizes) {
-            return NativeSupportedSize.RESOLUTION_NO_CAMERA;
-        }
-
-        for (final Camera.Size previewSize : previewSizes) {
-            for (final NativeSupportedSize supportedSize : NativeSupportedSize.values()) {
-                if (previewSize.width == supportedSize.size.width && previewSize.height == supportedSize.size.height) {
-                    if (supportedSize.compareTo(best) < 0) {
-                        best = supportedSize;
-                    }
-                    break;
-                }
-            }
-        }
-
-        return best;
-    }
-
-    public static void generateBestCameraPreviewSize() {
-        if (null == sBestCameraPreviewSize) {
-            try {
-                final Camera camera = Camera.open();
-                if(null != camera) {
-                    generateBestCameraPreviewSize(camera, camera.getParameters().getSupportedPreviewSizes());
-                    camera.release();
-                }
-            }
-            catch (final Exception ignored) {
-                // pass
-            }
-        }
-    }
-
-    static void generateBestCameraPreviewSize(final Camera camera, final Iterable<Camera.Size> previewSizes) {
-        if (null == previewSizes) {
-            sBestCameraPreviewSize = NativeSupportedSize.RESOLUTION_NO_CAMERA;
-            return;
-        }
-
-        sBestCameraPreviewSize = findBestCameraSupportedSize(previewSizes);
-
-        if (sBestCameraPreviewSize == NativeSupportedSize.RESOLUTION_NO_CAMERA) {
-            //trying to set all items...
-            for (final NativeSupportedSize nativeSupportedSize : NativeSupportedSize.values()) {
-                if (tryToSetCameraSize(camera, nativeSupportedSize)) {
-                    sBestCameraPreviewSize = nativeSupportedSize;
-                    return;
-                }
-            }
-            sBestCameraPreviewSize = NativeSupportedSize.RESOLUTION_NO_CAMERA;
-        }
-    }
-
-    private static boolean tryToSetCameraSize(final Camera camera, final NativeSupportedSize nativeSupportedSize) {
-        if (null == camera) {
-            return false;
-        }
-        final Camera.Parameters params = camera.getParameters();
-
-        params.setPreviewSize(nativeSupportedSize.size.width, nativeSupportedSize.size.height);
-
-        try {
-            camera.setParameters(params);
-            final Camera.Size previewSize = camera.getParameters().getPreviewSize();
-            return !(previewSize.width != nativeSupportedSize.size.width && previewSize.height != nativeSupportedSize.size.height);
-        }
-        catch (final Exception ignored) {
-            return false;
-        }
-    }
-
-    public static String getSupportedSizesDescription(List<Camera.Size> sizes) {
-        List<String> text = new ArrayList<>(sizes.size());
-        for (Camera.Size size: sizes) text.add(String.format(Locale.US, "[%dx%d]", size.width, size.height));
-        return TextUtils.join(", ", text);
-    }
-
-    @Nullable
-    public static Camera.CameraInfo getBackCameraInfo() {
-        int numberOfCameras = Camera.getNumberOfCameras();
-        Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
-        for (int i = 0; i < numberOfCameras; i++) {
-            Camera.getCameraInfo(i, cameraInfo);
-            if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
-                return cameraInfo;
-            }
-        }
-        return null;
-    }
-
-    public static int getBackCameraSensorOrientation() {
-        Camera.CameraInfo cameraInfo = getBackCameraInfo();
-        return cameraInfo == null ? 0 : cameraInfo.orientation;
-    }
-
-    public static int getBackCameraDataRotation(Display display) {
-        return getCameraDataRotation(display, getBackCameraInfo());
-    }
-
-    // http://www.wordsaretoys.com/2013/10/25/roll-that-camera-zombie-rotation-and-coversion-from-yv12-to-yuv420planar/
-    private static int getCameraDataRotation(Display display, @Nullable Camera.CameraInfo cameraInfo) {
-        int rotation = OrientationHelper.getDisplayRotationDegrees(display);
-        if (cameraInfo == null) return 0;
-        return OrientationHelper.getCameraRotationToNatural(rotation, cameraInfo.orientation, cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT);
+    public static boolean isCameraSupported(Context context) {
+        PackageManager pm = context.getPackageManager();
+        return pm.hasSystemFeature(PackageManager.FEATURE_CAMERA);
     }
 
     @SuppressWarnings("MagicNumber")
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/FpsCounter.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/FpsCounter.java
deleted file mode 100644
index 9be75a9..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/FpsCounter.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2011 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import java.util.concurrent.TimeUnit;
-
-final class FpsCounter {
-
-    private int fpsUpdateFramesInterval;
-    private long fpsStartTime, fpsLastUpdateTime, fpsLastPeriod, fpsTotalDuration;
-    private int  fpsTotalFrames;
-    private float fpsLast, fpsTotal;
-    private float fpsLastTickTime;
-
-    /** Creates a disabled instance */
-    public FpsCounter() {
-        setUpdateFPSFrames(0);
-    }
-
-    /**
-     * Increases total frame count and updates values if feature is enabled and
-     * update interval is reached.<br>
-     *
-     *
-     */
-    public final synchronized void tickFPS() {
-        final long now = TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
-        if (fpsUpdateFramesInterval == 0) return;
-
-        fpsTotalFrames++;
-
-        if(fpsTotalFrames%fpsUpdateFramesInterval == 0) {
-            fpsLastPeriod = now - fpsLastUpdateTime;
-            fpsLastPeriod = Math.max(fpsLastPeriod, 1); // div 0
-            fpsLast = ( fpsUpdateFramesInterval * 1000f ) / ( fpsLastPeriod ) ;
-
-            fpsTotalDuration = now - fpsStartTime;
-            fpsTotalDuration = Math.max(fpsTotalDuration, 1); // div 0
-            fpsTotal= ( fpsTotalFrames * 1000f ) / ( fpsTotalDuration ) ;
-
-            fpsLastUpdateTime = now;
-        }
-
-        fpsLastTickTime = now;
-    }
-
-    public synchronized void update() {
-        final long now = TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
-        if (now - fpsLastTickTime > 1000) {
-            fpsLast = 0;
-            fpsLastPeriod = 0;
-            fpsTotalDuration = now - fpsStartTime;
-            fpsTotalDuration = Math.max(fpsTotalDuration, 1); // div 0
-            fpsLastUpdateTime = now;
-        }
-    }
-
-    public StringBuilder toString(StringBuilder sb) {
-        if(null==sb) {
-            sb = new StringBuilder();
-        }
-        String fpsLastS = String.valueOf(fpsLast);
-        fpsLastS = fpsLastS.substring(0, fpsLastS.indexOf('.') + 2);
-        String fpsTotalS = String.valueOf(fpsTotal);
-        fpsTotalS = fpsTotalS.substring(0, fpsTotalS.indexOf('.') + 2);
-        sb.append(fpsTotalDuration/1000 +" s: "+ fpsUpdateFramesInterval+" f / "+ fpsLastPeriod+" ms, " + fpsLastS+" fps, "+ fpsLastPeriod/fpsUpdateFramesInterval+" ms/f; "
-                /* + "total: "+ fpsTotalFrames+" f, "+ fpsTotalS+ " fps, "+ fpsTotalDuration/fpsTotalFrames+" ms/f" */);
-        return sb;
-    }
-
-    @Override
-    public String toString() {
-        return toString(null).toString();
-    }
-
-    public final synchronized void setUpdateFPSFrames(final int frames) {
-        fpsUpdateFramesInterval = frames;
-        resetFPSCounter();
-    }
-
-    public final synchronized void resetFPSCounter() {
-        fpsStartTime = TimeUnit.NANOSECONDS.toMillis(System.nanoTime()); // overwrite startTime to real init one
-        fpsLastUpdateTime   = fpsStartTime;
-        fpsLastPeriod = 0;
-        fpsTotalFrames = 0;
-        fpsLast = 0f; fpsTotal = 0f;
-        fpsLastPeriod = 0; fpsTotalDuration=0;
-    }
-
-    public final synchronized int getUpdateFPSFrames() {
-        return fpsUpdateFramesInterval;
-    }
-
-    public final synchronized long getFPSStartTime()   {
-        return fpsStartTime;
-    }
-
-    public final synchronized long getLastFPSUpdateTime() {
-        return fpsLastUpdateTime;
-    }
-
-    public final synchronized long getLastFPSPeriod() {
-        return fpsLastPeriod;
-    }
-
-    public final synchronized float getLastFPS() {
-        return fpsLast;
-    }
-
-    public final synchronized int getTotalFPSFrames() {
-        return fpsTotalFrames;
-    }
-
-    public final synchronized long getTotalFPSDuration() {
-        return fpsTotalDuration;
-    }
-
-    public final synchronized float getTotalFPS() {
-        return fpsTotal;
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ImageAnalyzer.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ImageAnalyzer.java
new file mode 100644
index 0000000..cacd1f1
--- /dev/null
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ImageAnalyzer.java
@@ -0,0 +1,206 @@
+package cards.pay.paycardsrecognizer.sdk.camera;
+
+import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_DATE;
+import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_GRAB_CARD_IMAGE;
+import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_NAME;
+import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_NUMBER;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.ImageFormat;
+import android.graphics.Rect;
+import android.util.Log;
+import android.view.Display;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.camera.core.ExperimentalGetImage;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.ImageProxy;
+
+import java.nio.ByteBuffer;
+import java.util.Locale;
+
+import cards.pay.paycardsrecognizer.sdk.camera.widget.CameraPreviewLayout;
+import cards.pay.paycardsrecognizer.sdk.camera.widget.CardDetectionStateView;
+import cards.pay.paycardsrecognizer.sdk.ndk.DisplayConfigurationImpl;
+import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants;
+import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionCore;
+import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionResult;
+import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionStatusListener;
+import cards.pay.paycardsrecognizer.sdk.utils.Constants;
+
+public class ImageAnalyzer implements ImageAnalysis.Analyzer {
+
+    public interface Callbacks {
+        void onRecognitionComplete(RecognitionResult result);
+
+        void onCardImageReceived(Bitmap bitmap);
+    }
+
+    private static final int DEFAULT_RECOGNITION_MODE = RECOGNIZER_MODE_NUMBER | RECOGNIZER_MODE_DATE
+            | RECOGNIZER_MODE_NAME | RECOGNIZER_MODE_GRAB_CARD_IMAGE;
+
+    private static final boolean DBG = Constants.DEBUG;
+
+    private static final String TAG = "ImageAnalyzer";
+
+    private final @RecognitionConstants.RecognitionMode int mRecognitionMode;
+    private final Context mAppContext;
+
+    private final Callbacks mCallbacks;
+    private final RecognitionCore mRecognitionCore;
+    private final CameraPreviewLayout mPreviewLayout;
+    private final DisplayConfigurationImpl mDisplayConfiguration;
+
+    public ImageAnalyzer(int recognitionMode, Context context, CameraPreviewLayout previewLayout, Callbacks callbacks) throws RuntimeException {
+
+        if (recognitionMode == 0) recognitionMode = DEFAULT_RECOGNITION_MODE;
+        mRecognitionMode = recognitionMode;
+        mAppContext = context.getApplicationContext();
+        mCallbacks = callbacks;
+        mPreviewLayout = previewLayout;
+        mRecognitionCore = RecognitionCore.getInstance(mAppContext);
+
+        mDisplayConfiguration = new DisplayConfigurationImpl();
+        mDisplayConfiguration.setDisplayParameters(getDisplay());
+        mRecognitionCore.setDisplayConfiguration(mDisplayConfiguration);
+    }
+
+    @Override
+    @ExperimentalGetImage
+    public void analyze(@NonNull ImageProxy imageProxy) {
+
+        if ((imageProxy.getFormat() == ImageFormat.YUV_420_888 ) && imageProxy.getPlanes().length == 3) {
+            var yv12Data = convertYUV420888toYV12(imageProxy);
+
+            int newBorders = mRecognitionCore.processFrameYV12(CameraUtils.CAMERA_RESOLUTION.size.width, CameraUtils.CAMERA_RESOLUTION.size.height, yv12Data);
+            mPreviewLayout.getDetectionStateOverlay().setDetectionState(newBorders);
+        }
+
+        imageProxy.close();
+    }
+
+    // Constants for YV12 plane order
+    public byte[] convertYUV420888toYV12(ImageProxy image) {
+        var planes = image.getPlanes();
+        ByteBuffer yBuffer = planes[0].getBuffer();
+        ByteBuffer uBuffer = planes[1].getBuffer();
+        ByteBuffer vBuffer = planes[2].getBuffer();
+
+        int ySize = yBuffer.remaining();
+        int uSize = uBuffer.remaining();
+        int vSize = vBuffer.remaining();
+
+        byte[] yData = new byte[ySize];
+        byte[] uData = new byte[uSize];
+        byte[] vData = new byte[vSize];
+
+        yBuffer.get(yData);
+        uBuffer.get(uData);
+        vBuffer.get(vData);
+
+        byte[] yv12Data = new byte[ySize + uSize + vSize];
+
+        // Copy Y plane
+        System.arraycopy(yData, 0, yv12Data, 0, ySize);
+
+        // Copy V plane
+        System.arraycopy(vData, 0, yv12Data, ySize, vSize);
+
+        // Copy U plane
+        System.arraycopy(uData, 0, yv12Data, ySize + vSize, uSize);
+
+        return yv12Data;
+    }
+
+    public void onResume() {
+        if (DBG) Log.d(TAG, "onResume()");
+
+        final Display display = getDisplay();
+        mDisplayConfiguration.setDisplayParameters(display);
+        mRecognitionCore.setDisplayConfiguration(mDisplayConfiguration);
+
+        mRecognitionCore.setRecognitionMode(mRecognitionMode);
+        mRecognitionCore.setStatusListener(mRecognitionStatusListener);
+        mRecognitionCore.resetResult();
+
+        mPreviewLayout.setOnWindowFocusChangedListener((view, hasWindowFocus) -> setRecognitionCoreIdle(!hasWindowFocus));
+
+        getCardDetectionStateView().setRecognitionResult(RecognitionResult.empty());
+        setRecognitionCoreIdle(false);
+    }
+
+    public void onPause() {
+        if (DBG) Log.d(TAG, "onPause()");
+        setRecognitionCoreIdle(true);
+        mPreviewLayout.setOnWindowFocusChangedListener(null);
+        mRecognitionCore.setStatusListener(null);
+    }
+
+    public void setSensorRotation(int rotation)
+    {
+        mDisplayConfiguration.setCameraParameters(rotation);
+    }
+
+    public void setRecognitionCoreIdle(boolean idle) {
+        if (DBG) Log.d(TAG, "setRecognitionCoreIdle() called with: " + "idle = [" + idle + "]");
+        mRecognitionCore.setIdle(idle);
+    }
+
+    public void setupCardDetectionCameraParameters(int previewSizeWidth, int previewSizeHeight, int sensorRotation) {
+        /* Card on 720x1280 preview frame */
+        Rect cardNdkRect = mRecognitionCore.getCardFrameRect();
+
+        /* Card on 1280x720 preview frame */
+        @SuppressWarnings("SuspiciousNameCombination")
+        Rect cardCameraRect = OrientationHelper.rotateRect(cardNdkRect,
+                CameraUtils.CAMERA_RESOLUTION.size.height,
+                CameraUtils.CAMERA_RESOLUTION.size.width,
+                90, null);
+
+        mPreviewLayout.setCameraParameters(previewSizeWidth, previewSizeHeight,
+                OrientationHelper.getCameraRotationToNatural(OrientationHelper.getDisplayRotationDegrees(getDisplay()), sensorRotation, false),
+                cardCameraRect);
+    }
+
+    private CardDetectionStateView getCardDetectionStateView() {
+        return mPreviewLayout.getDetectionStateOverlay();
+    }
+
+    private Display getDisplay() {
+        return ((WindowManager) mAppContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+    }
+
+    private final RecognitionStatusListener mRecognitionStatusListener = new RecognitionStatusListener() {
+        private long mRecognitionCompleteTs;
+
+        @Override
+        public void onRecognitionComplete(RecognitionResult result) {
+            getCardDetectionStateView().setRecognitionResult(result);
+            if (result.isFirst()) {
+                getCardDetectionStateView().setDetectionState(RecognitionConstants.DETECTED_BORDER_TOP
+                        | RecognitionConstants.DETECTED_BORDER_LEFT
+                        | RecognitionConstants.DETECTED_BORDER_RIGHT
+                        | RecognitionConstants.DETECTED_BORDER_BOTTOM
+                );
+                if (DBG) mRecognitionCompleteTs = System.nanoTime();
+            }
+            if (result.isFinal()) {
+                long newTs = System.nanoTime();
+                if (DBG)
+                    Log.v(TAG, String.format(Locale.US, "Final result received after %.3f ms", (newTs - mRecognitionCompleteTs) / 1_000_000f));
+            }
+            mCallbacks.onRecognitionComplete(result);
+        }
+
+        @Override
+        public void onCardImageReceived(Bitmap bitmap) {
+            if (DBG) {
+                long newTs = System.nanoTime();
+                Log.v(TAG, String.format(Locale.US, "Card image received after %.3f ms", (newTs - mRecognitionCompleteTs) / 1_000_000f));
+            }
+            mCallbacks.onCardImageReceived(bitmap);
+        }
+    };
+}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/OrientationHelper.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/OrientationHelper.java
index 3870c79..0a0bce3 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/OrientationHelper.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/OrientationHelper.java
@@ -1,8 +1,11 @@
 package cards.pay.paycardsrecognizer.sdk.camera;
 
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
 import android.view.Surface;
@@ -15,20 +18,23 @@ public final class OrientationHelper {
     private static final boolean DBG = BuildConfig.DEBUG;
     private static final String TAG = "OrientationHelper";
 
-    private OrientationHelper() {}
+    private OrientationHelper() {
+    }
 
     /**
      * Returns the rotation of the screen with the rotation of the camera from its "natural" orientation.
-     * @param displayRotation {@link Display#getRotation()} in degrees
+     *
+     * @param displayRotation   {@link Display#getRotation()} in degrees
      * @param cameraOrientation {@link android.hardware.Camera.CameraInfo#orientation} in degrees
      */
     // http://developer.android.com/intl/ru/reference/android/hardware/Camera.html#setDisplayOrientation%28int%29
     public static int getCameraRotationToNatural(int displayRotation, int cameraOrientation, boolean compensateMirror) {
-        if (DBG) Log.d(TAG, "getCameraRotationToNatural() called with: " +  "displayRotation = [" + displayRotation + "], cameraOrientation = [" + cameraOrientation + "], compensateMirror = [" + compensateMirror + "]");
+        if (DBG)
+            Log.d(TAG, "getCameraRotationToNatural() called with: " + "displayRotation = [" + displayRotation + "], cameraOrientation = [" + cameraOrientation + "], compensateMirror = [" + compensateMirror + "]");
         int result = 0;
         if (compensateMirror) {
             result = (cameraOrientation + displayRotation) % 360;
-            result = (360 - result) % 360;	// compensate the mirror
+            result = (360 - result) % 360;    // compensate the mirror
         } else {
             result = (cameraOrientation - displayRotation + 360) % 360;
         }
@@ -41,15 +47,36 @@ public static int getDisplayRotationDegrees(Display display) {
 
     public static int getDisplayRotationDegrees(int surfaceRotationVal) {
         switch (surfaceRotationVal) {
-            case Surface.ROTATION_0: return 0;
-            case Surface.ROTATION_90: return 90;
-            case Surface.ROTATION_180: return 180;
-            case Surface.ROTATION_270: return 270;
-            default: throw new IllegalArgumentException();
+            case Surface.ROTATION_0:
+                return 0;
+            case Surface.ROTATION_90:
+                return 90;
+            case Surface.ROTATION_180:
+                return 180;
+            case Surface.ROTATION_270:
+                return 270;
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    public static boolean naturalOrientationIsLandscape(Display display) {
+        int rotation = display.getRotation();
+
+        DisplayMetrics dm = new DisplayMetrics();
+        display.getMetrics(dm);
+
+        switch (rotation) {
+            case Surface.ROTATION_0:
+            case Surface.ROTATION_180:
+                return dm.widthPixels > dm.heightPixels;
+            case Surface.ROTATION_270:
+            case Surface.ROTATION_90:
+            default:
+                return dm.heightPixels > dm.widthPixels;
         }
     }
 
-    @SuppressWarnings("SuspiciousNameCombination")
     public static Rect rotateRect(Rect src, int width, int height, int degrees, @Nullable Rect dst) {
         if (dst == null) dst = new Rect();
         int rotation = (degrees >= 0 ? degrees : (360 - degrees));
@@ -69,7 +96,8 @@ public static Rect rotateRect(Rect src, int width, int height, int degrees, @Nul
             dst.set(offset4, offset1, offset4 + src.height(), offset1 + src.width());
         }
 
-        if (DBG) Log.v(TAG, "rotateRect() degrees: " + degrees + "src: " + src.toString() + "; res: " + dst.toString());
+        if (DBG)
+            Log.v(TAG, "rotateRect() degrees: " + degrees + "src: " + src.toString() + "; res: " + dst.toString());
         return dst;
     }
 }
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ProcessFrameThread.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ProcessFrameThread.java
deleted file mode 100644
index fa02968..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ProcessFrameThread.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import android.content.Context;
-import android.hardware.Camera;
-import android.util.Log;
-
-import java.util.Locale;
-
-import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionCore;
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-// https://github.com/googlesamples/android-vision/blob/master/visionSamples/barcode-reader/app/src/main/java/com/google/android/gms/samples/vision/barcodereader/ui/camera/CameraSource.java
-class ProcessFrameThread extends Thread {
-
-    private static final boolean DBG = Constants.DEBUG;
-    private static final String TAG = "ProcessFrameThread";
-
-    private final RecognitionCore mRecognitionCore;
-
-    private final Camera mCamera;
-
-    private final Callbacks mCallbacks;
-
-    private final FpsCounter mFpsCounter;
-
-    private final FpsCounter mDropFpsCounter;
-
-    private final Object mLock = new Object();
-
-    private boolean mActive = true;
-
-    private volatile byte mPendingFrameData[];
-
-    private int mFpsNo;
-
-    int mPredBorders = 0;
-
-    public interface Callbacks {
-        void onFrameProcessed(int newBorders);
-        void onFpsReport(String report);
-    }
-
-    /**
-     * Marks the runnable as active/not active.  Signals any blocked threads to continue.
-     */
-    void setActive(boolean active) {
-        synchronized (mLock) {
-            if (active != mActive) {
-                mActive = active;
-                if (!mActive) {
-                    mLock.notifyAll();
-                } else {
-                    if (mPendingFrameData != null) mLock.notifyAll();
-                }
-            }
-        }
-    }
-
-    public void processFrame(byte[] data) {
-        if (data == null) {
-            throw new IllegalStateException();
-        }
-        synchronized (mLock) {
-            if (mPendingFrameData != null) {
-                mCamera.addCallbackBuffer(mPendingFrameData);
-                mPendingFrameData = null;
-                if (DBG) tickDropFps();
-            }
-
-            mPendingFrameData = data;
-
-            // Notify the processor thread if it is waiting on the next frame (see below).
-            mLock.notifyAll();
-        }
-    }
-
-    public ProcessFrameThread(Context appContext, Camera camera, Callbacks callbacks) {
-        super("ProcessFrameThread");
-        mRecognitionCore = RecognitionCore.getInstance(appContext);
-        mCamera = camera;
-        mCallbacks = callbacks;
-        if (DBG) {
-            mFpsCounter = new FpsCounter();
-            mDropFpsCounter = new FpsCounter();
-        } else {
-            mFpsCounter = null;
-            mDropFpsCounter = null;
-        }
-    }
-
-    /**
-     * As long as the processing thread is active, this executes detection on frames
-     * continuously.  The next pending frame is either immediately available or hasn't been
-     * received yet.  Once it is available, we transfer the frame info to local variables and
-     * run detection on that frame.  It immediately loops back for the next frame without
-     * pausing.
-     * <p>
-     * If detection takes longer than the time in between new frames from the camera, this will
-     * mean that this loop will run without ever waiting on a frame, avoiding any context
-     * switching or frame acquisition time latency.
-     * <p>
-     * If you find that this is using more CPU than you'd like, you should probably decrease the
-     * FPS setting above to allow for some idle time in between frames.
-     */
-    @Override
-    public void run() {
-        byte data[];
-
-        if (DBG) Log.d(TAG, "Thread started. TID: " + Thread.currentThread().getId());
-
-        WHILETRUE: while (true) {
-            synchronized (mLock) {
-                if (mPendingFrameData == null) {
-                    try {
-                        // Wait for the next frame to be received from the camera, since we
-                        // don't have it yet.
-                        mLock.wait();
-                    } catch (InterruptedException e) {
-                        if (DBG) Log.d(TAG, "Frame processing loop terminated.", e);
-                        break WHILETRUE;
-                    }
-                }
-
-                if (!mActive) {
-                    // Exit the loop once this camera source is stopped or released.  We check
-                    // this here, immediately after the wait() above, to handle the case where
-                    // setActive(false) had been called, triggering the termination of this
-                    // loop.
-                    break WHILETRUE;
-                }
-
-                // Hold onto the frame data locally, so that we can use this for detection
-                // below.  We need to clear mPendingFrameData to ensure that this buffer isn't
-                // recycled back to the camera before we are done using that data.
-                data = mPendingFrameData;
-                mPendingFrameData = null;
-            }
-
-            if (DBG) tickFps(data);
-
-            if (data == null) {
-                if (DBG) Log.e(TAG, "data is null");
-                throw new NullPointerException();
-            }
-
-            // The code below needs to run outside of synchronization, because this will allow
-            // the camera to add pending frame(s) while we are running detection on the current
-            // frame.
-            int borders = mRecognitionCore.processFrameYV12(1280, 720, data);
-            if (borders != mPredBorders) {
-                mPredBorders = borders;
-            }
-
-            if (!mActive) {
-                break WHILETRUE;
-            }
-
-            mCamera.addCallbackBuffer(data);
-            mCallbacks.onFrameProcessed(borders);
-        }
-
-        if (DBG) Log.d(TAG, "Thread finished. TID: " + Thread.currentThread().getId());
-    }
-
-    private void tickFps(byte data[]) {
-        mFpsCounter.tickFPS();
-        mDropFpsCounter.update();
-        nextFps();
-        if (mFpsNo == 1) {
-            if (DBG) Log.d(TAG, "onPreviewFrame() called with: " + "data.length: " + data.length
-                    + "; thread: " + Thread.currentThread() + "; ");
-        }
-    }
-
-    private void tickDropFps() {
-        mDropFpsCounter.tickFPS();
-        nextFps();
-    }
-
-    private void nextFps() {
-        mFpsNo += 1;
-        if (mFpsNo == 1) {
-            mFpsCounter.setUpdateFPSFrames(50);
-            mDropFpsCounter.setUpdateFPSFrames(50);
-        } else {
-            if (DBG && (mFpsNo % 20 == 0)) {
-                mCallbacks.onFpsReport(String.format(Locale.US, "%s dropped: %.1f fps", mFpsCounter.toString(),
-                        mDropFpsCounter.getLastFPS()));
-            }
-        }
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionAvailabilityChecker.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionAvailabilityChecker.java
index f6d328c..555c883 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionAvailabilityChecker.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionAvailabilityChecker.java
@@ -3,8 +3,11 @@
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.support.annotation.RestrictTo;
-import android.support.v4.content.ContextCompat;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.core.content.ContextCompat;
+
 import android.util.Log;
 
 import com.facebook.device.yearclass.YearClass;
@@ -29,37 +32,14 @@ public static Result doCheck(Context context) {
         return doCheckInternal(context).build();
     }
 
-    public static Result doCheckBlocking(Context context) {
-        RecognitionCheckResultBuilder builder = doCheckInternal(context);
-        Result result = builder.build();
-        if (!builder.build().isAdditionalCheckRequired()) {
-            return result;
-        }
-
-        builder.isBlockingCheck(true);
-        builder.recognitionCoreSupported(RecognitionCore.getInstance(context).isDeviceSupported());
-        if (builder.recognitionCoreSupported == Result.STATUS_FAILED) {
-            return builder.build();
-        }
-
-        builder.isCameraSupported(CameraUtils.isCameraSupportedBlocking());
-
-        return builder.build();
-    }
-
     private static RecognitionCheckResultBuilder doCheckInternal(Context context) {
         RecognitionCheckResultBuilder builder = new RecognitionCheckResultBuilder()
                 .isBlockingCheck(false)
                 .isDeviceNewEnough(isDeviceNewEnough(context))
-                .hasCamera(isDeviceHasCamera(context))
-                .hasCameraPermission(ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED)
-                ;
+                .hasCamera(CameraUtils.isCameraSupported(context))
+                .hasCameraPermission(ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED);
 
-        try {
-            builder.isCameraSupported(CameraUtils.isCameraSupported());
-        } catch (BlockingOperationException e) {
-            // IGNORE
-        }
+        builder.isCameraSupported(CameraUtils.isCameraSupported(context));
 
         if (RecognitionCore.isInitialized()) {
             builder.recognitionCoreSupported(RecognitionCore.getInstance(context).isDeviceSupported());
@@ -74,13 +54,6 @@ public static boolean isDeviceNewEnough(Context context) {
         return year >= 2011;
     }
 
-    public static boolean isDeviceHasCamera(Context context) {
-        PackageManager pm = context.getPackageManager();
-        boolean hasCameraFeature = pm.hasSystemFeature(PackageManager.FEATURE_CAMERA);
-        boolean hasAutofocus = pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_AUTOFOCUS);
-        return hasCameraFeature/* && hasAutofocus*/;
-    }
-
     public static class Result {
 
         public static final int STATUS_NOT_CHECKED = 0;
@@ -155,15 +128,20 @@ public boolean isFailedOnCameraPermission() {
 
         private String statusToString(int status) {
             switch (status) {
-                case STATUS_PASSED: return "yes";
-                case STATUS_FAILED: return "no";
-                case STATUS_NOT_CHECKED: return "not checked";
-                default: throw new IllegalArgumentException();
+                case STATUS_PASSED:
+                    return "yes";
+                case STATUS_FAILED:
+                    return "no";
+                case STATUS_NOT_CHECKED:
+                    return "not checked";
+                default:
+                    throw new IllegalArgumentException();
             }
         }
 
         public String getMessage() {
-            if (isDeviceNewEnough == STATUS_FAILED) return "Device is considered being too old for smooth camera experience, so camera will not be used.";
+            if (isDeviceNewEnough == STATUS_FAILED)
+                return "Device is considered being too old for smooth camera experience, so camera will not be used.";
             if (hasCamera == STATUS_FAILED) return "No camera";
             if (hasCameraPermission == STATUS_FAILED) return "No camera permission";
             if (isCameraSupported == STATUS_FAILED) return "Camera not supported";
@@ -171,6 +149,7 @@ public String getMessage() {
             return toString();
         }
 
+        @NonNull
         @Override
         public String toString() {
             return String.format(Locale.US, "Is new enough: %s, has camera: %s, has camera persmission: %s, recognition library supported: %s, camera supported: %s",
@@ -179,7 +158,7 @@ public String toString() {
                     statusToString(hasCameraPermission),
                     statusToString(recognitionCoreSupported),
                     statusToString(isCameraSupported)
-                    );
+            );
         }
     }
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionCoreUtils.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionCoreUtils.java
index 0833849..071d4c5 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionCoreUtils.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RecognitionCoreUtils.java
@@ -1,23 +1,20 @@
 package cards.pay.paycardsrecognizer.sdk.camera;
 
 import android.content.Context;
-import android.support.annotation.RestrictTo;
 
-import java.util.concurrent.atomic.AtomicBoolean;
+import androidx.annotation.RestrictTo;
 
 import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionCore;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public final class RecognitionCoreUtils {
 
-    private static AtomicBoolean deployRecognitionCoreActive = new AtomicBoolean();
-
     private RecognitionCoreUtils() {
     }
 
     public static boolean isRecognitionCoreDeployRequired(Context context) {
         //noinspection RedundantIfStatement
-        if (!RecognitionAvailabilityChecker.isDeviceHasCamera(context)
+        if (!CameraUtils.isCameraSupported(context)
                 || !RecognitionAvailabilityChecker.isDeviceNewEnough(context)
                 || RecognitionCore.isInitialized()) {
             return false;
@@ -34,33 +31,4 @@ public static void deployRecognitionCoreSync(Context context) {
             // IGNORE
         }
     }
-
-    public static void startDeployRecognitionCore(Context context) {
-        if (!RecognitionCoreUtils.isRecognitionCoreDeployRequired(context)) return;
-        if (deployRecognitionCoreActive.get()) return;
-        final Context appContext = context.getApplicationContext();
-        new Thread() {
-            @Override
-            public void run() {
-                super.run();
-                if (deployRecognitionCoreActive.compareAndSet(false, true)) {
-                    try {
-                        RecognitionCore.deploy(appContext);
-                    } catch (Throwable e) {
-                        // IGNORE
-                    }
-                    deployRecognitionCoreActive.set(true);
-                }
-            }
-        }.start();
-    }
-
-    public static boolean isScanCardSupported(Context context) {
-        RecognitionAvailabilityChecker.Result checkResult = RecognitionAvailabilityChecker.doCheck(context);
-
-        return checkResult.isPassed()
-                || checkResult.isAdditionalCheckRequired()
-                || checkResult.isFailedOnCameraPermission();
-    }
-
 }
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RenderThread.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RenderThread.java
deleted file mode 100644
index a142727..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/RenderThread.java
+++ /dev/null
@@ -1,583 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import android.content.Context;
-import android.graphics.SurfaceTexture;
-import android.hardware.Camera;
-import android.opengl.GLES20;
-import android.opengl.Matrix;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-import android.support.annotation.RestrictTo;
-import android.util.Log;
-import android.view.SurfaceHolder;
-
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-
-import cards.pay.paycardsrecognizer.sdk.camera.gles.Drawable2d;
-import cards.pay.paycardsrecognizer.sdk.camera.gles.EglCore;
-import cards.pay.paycardsrecognizer.sdk.camera.gles.GlUtil;
-import cards.pay.paycardsrecognizer.sdk.camera.gles.Sprite2d;
-import cards.pay.paycardsrecognizer.sdk.camera.gles.Texture2dProgram;
-import cards.pay.paycardsrecognizer.sdk.camera.gles.WindowSurface;
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-/**
- * Thread that handles all rendering and camera operations.
- */
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class RenderThread extends Thread {
-
-    private static final boolean DBG = Constants.DEBUG;
-    private static final String TAG = "RenderNCameraThread";
-
-    // Object must be created on render thread to get correct Looper, but is used from
-    // UI thread, so we need to declare it volatile to ensure the UI thread sees a fully
-    // constructed object.
-    private volatile RenderHandler mHandler;
-
-    // Used to wait for the thread to start.
-    private final Object mStartLock = new Object();
-    private boolean mReady = false;
-
-    private ScanManagerHandler mMainHandler;
-
-    private final Context mAppContext;
-
-    private CameraManager mCameraManager;
-
-    // Receives the output from the camera preview.
-    private SurfaceTexture mCameraTexture;
-
-    private EglCore mEglCore;
-    private WindowSurface mWindowSurface;
-
-    private Texture2dProgram mTexProgram;
-    private final Sprite2d mRect = new Sprite2d(new Drawable2d());
-
-    // Orthographic projection matrix.
-    private float[] mDisplayProjectionMatrix = new float[16];
-
-    private int mWindowSurfaceWidth;
-    private int mWindowSurfaceHeight;
-
-    private int mCameraPreviewWidth = 1280;
-    private int mCameraPreviewHeight = 720;
-    private int mCameraRotation;
-
-    private float mPosX, mPosY;
-
-    private volatile boolean mOnFreeze;
-
-    public RenderThread(Context context, ScanManagerHandler mainHandler) {
-        mMainHandler = mainHandler;
-        mAppContext = context.getApplicationContext();
-    }
-
-    /**
-     * Thread entry point.
-     */
-    @Override
-    public void run() {
-        Looper.prepare();
-
-        if (DBG) Log.d(TAG, "Thread started. TID: " + Thread.currentThread().getId());
-
-        // We need to create the Handler before reporting ready.
-        mHandler = new RenderHandler(this);
-        synchronized (mStartLock) {
-            mReady = true;
-            mStartLock.notify();    // signal waitUntilReady()
-        }
-
-        try {
-            // Prepare EGL and open the camera before we start handling messages.
-            mEglCore = new EglCore(null, 0);
-
-            mCameraManager = new CameraManager(mAppContext);
-            mCameraManager.openCamera();
-            mCameraManager.setProcessFrameCallbacks(new ProcessFrameThread.Callbacks() {
-                @Override
-                public void onFrameProcessed(int newBorders) {
-                    mMainHandler.sendFrameProcessed(newBorders);
-                }
-
-                @Override
-                public void onFpsReport(String report) {
-                    mMainHandler.sendFpsResport(report);
-                }
-            });
-            mCameraManager.setAutoFocusCallbacks(new AutoFocusManager.FocusMoveCallback() {
-                @Override
-                public void onAutoFocusMoving(boolean start, Camera camera) {
-                    mMainHandler.sendAutoFocusMoving(start, camera.getParameters().getFocusMode());
-                }
-
-                @Override
-                public void onAutoFocusComplete(boolean success, Camera camera) {
-                    mMainHandler.sendAutoFocusComplete(success, camera.getParameters().getFocusMode());
-                }
-            });
-
-            Camera.Size previewSize = mCameraManager.getCurrentPreviewSize();
-            mCameraPreviewWidth = previewSize.width;
-            mCameraPreviewHeight = previewSize.height;
-            mCameraRotation = mCameraManager.calculateDataRotation();
-            mMainHandler.sendCameraOpened(mCameraManager.getCamera().getParameters());
-        } catch (Exception e) {
-            Looper looper = Looper.myLooper();
-            if (looper != null) looper.quit();
-
-            if (mEglCore != null) mEglCore.release();
-
-            mMainHandler.sendOpenCameraError(e);
-
-            if (DBG) Log.d(TAG, "Thread finished. TID: " + Thread.currentThread().getId());
-            synchronized (mStartLock) {
-                mReady = false;
-                mStartLock.notify();
-            }
-            return;
-        }
-
-        try {
-            Looper.loop();
-        } catch (Throwable e) {
-            mMainHandler.sendRenderThreadError(e);
-        } finally {
-            if (DBG) Log.d(TAG, "looper quit");
-            mCameraManager.releaseCamera();
-
-            releaseGl();
-            mEglCore.release();
-
-            if (DBG) Log.d(TAG, "Thread finished. TID: " + Thread.currentThread().getId());
-            synchronized (mStartLock) {
-                mReady = false;
-            }
-        }
-    }
-
-    /**
-     * Waits until the render thread is ready to receive messages.
-     * <p>
-     * Call from the UI thread.
-     */
-    public void waitUntilReady() {
-        synchronized (mStartLock) {
-            while (!mReady) {
-                try {
-                    mStartLock.wait();
-                } catch (InterruptedException ie) { /* not expected */ }
-            }
-        }
-    }
-
-    /**
-     * Shuts everything down.
-     */
-    private void shutdown() {
-        if (DBG) Log.d(TAG, "shutdown()");
-        mCameraManager.releaseCamera(); // avoid "sending message to a Handler on a dead thread"
-        Looper.myLooper().quit();
-    }
-
-    /**
-     * Returns the render thread's Handler.  This may be called from any thread.
-     */
-    public RenderHandler getHandler() {
-        return mHandler;
-    }
-
-    /**
-     * Handles the surface-created callback from SurfaceView.  Prepares GLES and the Surface.
-     */
-    private void surfaceAvailable(SurfaceHolder holder, boolean newSurface) {
-        if (DBG) Log.d(TAG, "surfaceAvailable() called with: " +  "holder = [" + holder + "], newSurface = [" + newSurface + "]");
-        mWindowSurface = new WindowSurface(mEglCore, holder, false);
-        mWindowSurface.makeCurrent();
-
-        // Create and configure the SurfaceTexture, which will receive frames from the
-        // camera.  We set the textured rect's program to render from it.
-        mTexProgram = new Texture2dProgram();
-        int textureId = mTexProgram.createTextureObject();
-        mCameraTexture = new SurfaceTexture(textureId);
-        mRect.setTexture(textureId);
-
-        if (!newSurface) {
-            // This Surface was established on a previous run, so no surfaceChanged()
-            // message is forthcoming.  Finish the surface setup now.
-            //
-            // We could also just call this unconditionally, and perhaps do an unnecessary
-            // bit of reallocating if a surface-changed message arrives.
-            mWindowSurfaceWidth = mWindowSurface.getWidth();
-            mWindowSurfaceHeight = mWindowSurface.getHeight();
-            finishSurfaceSetup();
-        }
-
-        mCameraTexture.setOnFrameAvailableListener(new SurfaceTexture.OnFrameAvailableListener() {
-            @Override
-            public void onFrameAvailable(SurfaceTexture surfaceTexture) {
-                // SurfaceTexture.OnFrameAvailableListener; runs on arbitrary thread
-                mHandler.sendFrameAvailable();
-            }
-        });
-    }
-
-    /**
-     * Handles incoming frame of data from the camera.
-     */
-    private void frameAvailable() {
-        mCameraTexture.updateTexImage();
-        draw();
-    }
-
-    /**
-     * Releases most of the GL resources we currently hold (anything allocated by
-     * surfaceAvailable()).
-     * <p>
-     * Does not release EglCore.
-     */
-    private void releaseGl() {
-        GlUtil.checkGlError("releaseGl start");
-
-        if (mWindowSurface != null) {
-            mWindowSurface.release();
-            mWindowSurface = null;
-        }
-        if (mTexProgram != null) {
-            mTexProgram.release();
-            mTexProgram = null;
-        }
-        GlUtil.checkGlError("releaseGl done");
-
-        mEglCore.makeNothingCurrent();
-    }
-
-    /**
-     * Handles the surfaceChanged message.
-     * <p>
-     * We always receive surfaceChanged() after surfaceCreated(), but surfaceAvailable()
-     * could also be called with a Surface created on a previous run.  So this may not
-     * be called.
-     */
-    void surfaceChanged(int width, int height) {
-        if (DBG) Log.d(TAG, "RenderThread surfaceChanged " + width + "x" + height);
-
-        mWindowSurfaceWidth = width;
-        mWindowSurfaceHeight = height;
-        finishSurfaceSetup();
-    }
-
-    private void orientationChanged(int rotation) {
-        if (DBG) Log.d(TAG, "orientationChanged() called with: " +  "rotation = [" + rotation + "]");
-        mCameraRotation = rotation;
-        updateGeometry();
-    }
-
-    private void freeze() {
-        if (DBG) Log.d(TAG, "freeze()");
-        mOnFreeze = true;
-    }
-
-    private void unfreeze() {
-        if (DBG) Log.d(TAG, "unfreeze()");
-        mOnFreeze = false;
-    }
-
-    /**
-     * Handles the surfaceDestroyed message.
-     */
-    private void surfaceDestroyed() {
-
-        // In practice this never appears to be called -- the activity is always paused
-        // before the surface is destroyed.  In theory it could be called though.
-        if (DBG) Log.d(TAG, "surfaceDestroyed()");
-        releaseGl();
-    }
-
-    /**
-     * Sets up anything that depends on the window size.
-     * <p>
-     * Open the camera (to set mCameraAspectRatio) before calling here.
-     */
-    private void finishSurfaceSetup() {
-        int width = mWindowSurfaceWidth;
-        int height = mWindowSurfaceHeight;
-        if (DBG) Log.d(TAG, "finishSurfaceSetup size=" + width + "x" + height +
-                " camera=" + mCameraPreviewWidth + "x" + mCameraPreviewHeight);
-
-        // Use full window.
-        GLES20.glViewport(0, 0, width, height);
-
-        // Simple orthographic projection, with (0,0) in lower-left corner.
-        Matrix.orthoM(mDisplayProjectionMatrix, 0, 0, width, 0, height, -1, 1);
-
-        // Default position is center of screen.
-        mPosX = width / 2.0f;
-        mPosY = height / 2.0f;
-
-        updateGeometry();
-
-        // Ready to go, start the camera.
-        if (DBG) Log.d(TAG, "starting camera preview");
-        try {
-            mCameraManager.startPreview(mCameraTexture);
-        } catch (IOException ioe) {
-            throw new RuntimeException(ioe);
-        }
-    }
-
-    /**
-     * Updates the geometry of mRect, based on the size of the window and the current
-     * values set by the UI.
-     */
-    private void updateGeometry() {
-        int viewWidth;
-        int viewHeight;
-        int newWidth;
-        int newHeight;
-        int previewWidth = mCameraPreviewWidth;
-        int previewHeight = mCameraPreviewHeight;
-
-        if (mCameraRotation % 180 == 0) {
-            viewWidth = mWindowSurfaceWidth;
-            viewHeight = mWindowSurfaceHeight;
-        } else {
-            viewWidth = mWindowSurfaceHeight;
-            viewHeight = mWindowSurfaceWidth;
-        }
-
-        // Center crop
-        if (previewWidth * viewHeight > previewHeight * viewWidth) {
-            // Scale to height
-            newWidth = (int)(previewWidth * viewHeight / (float)previewHeight + 0.5f);
-            newHeight = viewHeight;
-        } else {
-            // Scale to width
-            newWidth = viewWidth;
-            newHeight = (int)(previewHeight * viewWidth / (float)previewWidth + 0.5f);
-        }
-
-        mRect.setScale(newWidth, newHeight);
-        mRect.setPosition(mPosX, mPosY);
-        mRect.setRotation((360 - mCameraRotation) % 360);
-    }
-
-    /**
-     * Draws the scene and submits the buffer.
-     */
-    private void draw() {
-        if (mOnFreeze) return;
-
-        GlUtil.checkGlError("draw start");
-
-        GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-        GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
-        mRect.draw(mTexProgram, mDisplayProjectionMatrix);
-        mWindowSurface.swapBuffers();
-
-        GlUtil.checkGlError("draw done");
-    }
-
-    /**
-     * Handler for RenderThread.  Used for messages sent from the UI thread to the render thread.
-     * <p>
-     * The object is created on the render thread, and the various "send" methods are called
-     * from the UI thread.
-     */
-    static class RenderHandler extends Handler {
-        private static final int MSG_SURFACE_AVAILABLE = 0;
-        private static final int MSG_SURFACE_CHANGED = 1;
-        private static final int MSG_SURFACE_DESTROYED = 2;
-        private static final int MSG_SHUTDOWN = 3;
-        private static final int MSG_FRAME_AVAILABLE = 4;
-        private static final int MSG_ORIENTATION_CHANGED = 5;
-        private static final int MSG_REDRAW = 9;
-
-        private static final int MSG_PAUSE_CAMERA = 10;
-        private static final int MSG_RESUME_CAMERA = 11;
-        private static final int MSG_PAUSE_PROCESS_FRAMES = 12;
-        private static final int MSG_RESUME_PROCESS_FRAMES = 14;
-        private static final int MSG_TOGGLE_FLASH = 15;
-        private static final int MSG_REQUEST_FOCUS = 16;
-        private static final int MSG_FREEZE = 17;
-        private static final int MSG_UNFREEZE = 18;
-
-
-
-        // This shouldn't need to be a weak ref, since we'll go away when the Looper quits,
-        // but no real harm in it.
-        private WeakReference<RenderThread> mWeakRenderThread;
-
-        /**
-         * Call from render thread.
-         */
-        public RenderHandler(RenderThread rt) {
-            mWeakRenderThread = new WeakReference<RenderThread>(rt);
-        }
-
-        /**
-         * Sends the "surface available" message.  If the surface was newly created (i.e.
-         * this is called from surfaceCreated()), set newSurface to true.  If this is
-         * being called during Activity startup for a previously-existing surface, set
-         * newSurface to false.
-         * <p>
-         * The flag tells the caller whether or not it can expect a surfaceChanged() to
-         * arrive very soon.
-         * <p>
-         * Call from UI thread.
-         */
-        public void sendSurfaceAvailable(SurfaceHolder holder, boolean newSurface) {
-            sendMessage(obtainMessage(MSG_SURFACE_AVAILABLE,
-                    newSurface ? 1 : 0, 0, holder));
-        }
-
-        /**
-         * Sends the "surface changed" message, forwarding what we got from the SurfaceHolder.
-         * <p>
-         * Call from UI thread.
-         */
-        public void sendSurfaceChanged(@SuppressWarnings("unused") int format, int width,
-                                       int height) {
-            // ignore format
-            sendMessage(obtainMessage(MSG_SURFACE_CHANGED, width, height));
-        }
-
-        /**
-         * Sends the "shutdown" message, which tells the render thread to halt.
-         * <p>
-         * Call from UI thread.
-         */
-        public void sendSurfaceDestroyed() {
-            sendMessage(obtainMessage(MSG_SURFACE_DESTROYED));
-        }
-
-        /**
-         * Sends the "shutdown" message, which tells the render thread to halt.
-         * <p>
-         * Call from UI thread.
-         */
-        public void sendShutdown() {
-            sendMessage(obtainMessage(MSG_SHUTDOWN));
-        }
-
-        /**
-         * Sends the "frame available" message.
-         * <p>
-         * Call from UI thread.
-         */
-        public void sendFrameAvailable() {
-            sendMessage(obtainMessage(MSG_FRAME_AVAILABLE));
-        }
-
-        public void sendOrientationChanged(int newRotation) {
-            sendMessage(obtainMessage(MSG_ORIENTATION_CHANGED, newRotation, 0));
-        }
-
-        public void sendUnfreeze() {
-            sendMessage(obtainMessage(MSG_UNFREEZE));
-        }
-
-        public void sendFreeze() {
-            sendMessage(obtainMessage(MSG_FREEZE));
-        }
-
-        public void sendRequestFocus() {
-            sendMessage(obtainMessage(MSG_REQUEST_FOCUS));
-        }
-
-        public void sendPauseCamera() {
-            sendMessage(obtainMessage(MSG_PAUSE_CAMERA));
-        }
-
-        public void sendResumeCamera() {
-            sendMessage(obtainMessage(MSG_RESUME_CAMERA));
-        }
-
-        public void sendPauseProcessFrames() {
-            sendMessage(obtainMessage(MSG_PAUSE_PROCESS_FRAMES));
-        }
-
-        public void sendResumeProcessFrames() {
-            sendMessage(obtainMessage(MSG_RESUME_PROCESS_FRAMES));
-        }
-
-
-        /**
-         * Sends the "redraw" message.  Forces an immediate redraw.
-         * <p>
-         * Call from UI thread.
-         */
-        public void sendRedraw() {
-            sendMessage(obtainMessage(MSG_REDRAW));
-        }
-
-        public void sendToggleFlash() {
-            sendMessage(obtainMessage(MSG_TOGGLE_FLASH));
-        }
-
-        @Override  // runs on RenderThread
-        public void handleMessage(Message msg) {
-            int what = msg.what;
-            //if (DBG) Log.d(TAG, "RenderHandler [" + this + "]: what=" + what);
-
-            RenderThread renderThread = mWeakRenderThread.get();
-            if (renderThread == null) {
-                if (DBG) Log.w(TAG, "RenderHandler.handleMessage: weak ref is null");
-                return;
-            }
-
-            switch (what) {
-                case MSG_SURFACE_AVAILABLE:
-                    renderThread.surfaceAvailable((SurfaceHolder) msg.obj, msg.arg1 != 0);
-                    break;
-                case MSG_SURFACE_CHANGED:
-                    renderThread.surfaceChanged(msg.arg1, msg.arg2);
-                    break;
-                case MSG_SURFACE_DESTROYED:
-                    renderThread.surfaceDestroyed();
-                    break;
-                case MSG_SHUTDOWN:
-                    renderThread.shutdown();
-                    break;
-                case MSG_FRAME_AVAILABLE:
-                    renderThread.frameAvailable();
-                    break;
-                case MSG_REDRAW:
-                    renderThread.draw();
-                    break;
-                case MSG_ORIENTATION_CHANGED:
-                    renderThread.orientationChanged(msg.arg1);
-                    break;
-                case MSG_FREEZE:
-                    renderThread.freeze();
-                    break;
-                case MSG_UNFREEZE:
-                    renderThread.unfreeze();
-                    break;
-                case MSG_TOGGLE_FLASH:
-                    renderThread.mCameraManager.toggleFlash();
-                    break;
-                case MSG_REQUEST_FOCUS:
-                    renderThread.mCameraManager.requestFocus();
-                    break;
-                case MSG_PAUSE_CAMERA:
-                    renderThread.mCameraManager.pause();
-                    break;
-                case MSG_RESUME_CAMERA:
-                    renderThread.mCameraManager.resume();
-                    break;
-                case MSG_PAUSE_PROCESS_FRAMES:
-                    renderThread.mCameraManager.pauseProcessFrames();
-                    break;
-                case MSG_RESUME_PROCESS_FRAMES:
-                    renderThread.mCameraManager.resumeProcessFrames();
-                    break;
-                default:
-                    throw new RuntimeException("unknown message " + what);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManager.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManager.java
deleted file mode 100644
index 87aba44..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManager.java
+++ /dev/null
@@ -1,435 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Rect;
-import android.hardware.Camera;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.support.annotation.MainThread;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.util.Log;
-import android.view.Display;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.WindowManager;
-
-import java.util.Locale;
-
-import cards.pay.paycardsrecognizer.sdk.camera.widget.CameraPreviewLayout;
-import cards.pay.paycardsrecognizer.sdk.camera.widget.CardDetectionStateView;
-import cards.pay.paycardsrecognizer.sdk.camera.widget.OnWindowFocusChangedListener;
-import cards.pay.paycardsrecognizer.sdk.ndk.DisplayConfigurationImpl;
-import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants;
-import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionCore;
-import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionResult;
-import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionStatusListener;
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_DATE;
-import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_GRAB_CARD_IMAGE;
-import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_NAME;
-import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_NUMBER;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class ScanManager {
-
-    private static final int DEFAULT_RECOGNITION_MODE = RECOGNIZER_MODE_NUMBER | RECOGNIZER_MODE_DATE
-            | RECOGNIZER_MODE_NAME | RECOGNIZER_MODE_GRAB_CARD_IMAGE;
-
-    private static final boolean DBG = Constants.DEBUG;
-    private static final String TAG = "ScanManager";
-
-    private static SurfaceHolder sSurfaceHolder;
-
-    private final @RecognitionConstants.RecognitionMode int mRecognitionMode;
-
-    private final Context mAppContext;
-
-    private final Callbacks mCallbacks;
-
-    private RecognitionCore mRecognitionCore;
-
-    private CameraPreviewLayout mPreviewLayout;
-
-    // Receives messages from renderer thread.
-    private ScanManagerHandler mHandler;
-
-    // Thread that handles rendering and controls the camera.  Started in onResume(),
-    // stopped in onPause().
-    @Nullable
-    private RenderThread mRenderThread;
-
-    private final WindowRotationListener mWindowRotationListener;
-
-    private final DisplayConfigurationImpl mDisplayConfiguration;
-
-    public interface Callbacks {
-        void onCameraOpened(Camera.Parameters cameraParameters);
-        void onOpenCameraError(Exception exception);
-        void onRecognitionComplete(RecognitionResult result);
-        void onCardImageReceived(Bitmap bitmap);
-        void onFpsReport(String report);
-        void onAutoFocusMoving(boolean start, String cameraFocusMode);
-        void onAutoFocusComplete(boolean success, String cameraFocusMode);
-    }
-
-    public ScanManager(Context context, CameraPreviewLayout previewLayout, Callbacks callbacks) {
-        this(DEFAULT_RECOGNITION_MODE, context, previewLayout, callbacks);
-    }
-
-    public ScanManager(int recognitionMode, Context context, CameraPreviewLayout previewLayout, Callbacks callbacks) throws RuntimeException {
-        if (recognitionMode == 0) recognitionMode = DEFAULT_RECOGNITION_MODE;
-        mRecognitionMode = recognitionMode;
-        mAppContext = context.getApplicationContext();
-        mCallbacks = callbacks;
-        mPreviewLayout = previewLayout;
-        mRecognitionCore = RecognitionCore.getInstance(mAppContext);
-        mHandler = new ScanManagerHandler(this);
-
-        Display display = getDisplay();
-        mDisplayConfiguration = new DisplayConfigurationImpl();
-        mDisplayConfiguration.setCameraParameters(CameraUtils.getBackCameraSensorOrientation());
-        mDisplayConfiguration.setDisplayParameters(display);
-        mRecognitionCore.setDisplayConfiguration(mDisplayConfiguration);
-
-        SurfaceHolder sh = getSurfaceView().getHolder();
-        sh.addCallback(new SurfaceHolder.Callback() {
-            @Override
-            public void surfaceCreated(SurfaceHolder holder) {
-                if (DBG) Log.d(TAG, "SurfaceView  surfaceCreated holder=" + holder + " (static=" + sSurfaceHolder + ")");
-                if (sSurfaceHolder != null) {
-                    throw new RuntimeException("sSurfaceHolder is already set");
-                }
-
-                sSurfaceHolder = holder;
-
-                if (mRenderThread != null) {
-                    // Normal case -- render thread is running, tell it about the new surface.
-                    RenderThread.RenderHandler rh = mRenderThread.getHandler();
-                    rh.sendSurfaceAvailable(holder, true);
-                } else {
-                    // Sometimes see this on 4.4.x N5: power off, power on, unlock, with device in
-                    // landscape and a lock screen that requires portrait.  The surface-created
-                    // message is showing up after onPause().
-                    //
-                    // Chances are good that the surface will be destroyed before the activity is
-                    // unpaused, but we track it anyway.  If the activity is un-paused and we start
-                    // the RenderThread, the SurfaceHolder will be passed in right after the thread
-                    // is created.
-                    if (DBG) Log.d(TAG, "render thread not running");
-                }
-            }
-
-            @Override
-            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-                if (DBG) Log.d(TAG, "SurfaceView surfaceChanged fmt=" + format + " size=" + width + "x" + height +
-                        " holder=" + holder);
-
-                if (mRenderThread != null) {
-                    RenderThread.RenderHandler rh = mRenderThread.getHandler();
-                    rh.sendSurfaceChanged(format, width, height);
-                } else {
-                    if (DBG) Log.d(TAG, "Ignoring surfaceChanged");
-                }
-            }
-
-            @Override
-            public void surfaceDestroyed(SurfaceHolder holder) {
-                // In theory we should tell the RenderThread that the surface has been destroyed.
-                if (mRenderThread != null) {
-                    RenderThread.RenderHandler rh = mRenderThread.getHandler();
-                    rh.sendSurfaceDestroyed();
-                }
-                if (DBG) Log.d(TAG, "SurfaceView surfaceDestroyed holder=" + holder);
-                sSurfaceHolder = null;
-            }
-        });
-
-        mWindowRotationListener = new WindowRotationListener();
-    }
-
-    public void onResume() {
-        if (DBG) Log.d(TAG, "onResume()");
-
-        mRenderThread = new RenderThread(mAppContext, mHandler);
-        mRenderThread.setName("Camera thread");
-        mRenderThread.start();
-        mRenderThread.waitUntilReady();
-
-        RenderThread.RenderHandler rh = mRenderThread.getHandler();
-        if (sSurfaceHolder != null) {
-            if (DBG) Log.d(TAG, "Sending previous surface");
-            rh.sendSurfaceAvailable(sSurfaceHolder, false);
-        } else {
-            if (DBG) Log.d(TAG, "No previous surface");
-        }
-
-        mDisplayConfiguration.setCameraParameters(CameraUtils.getBackCameraSensorOrientation());
-        mRecognitionCore.setRecognitionMode(mRecognitionMode);
-        mRecognitionCore.setStatusListener(mRecognitionStatusListener);
-        mRecognitionCore.resetResult();
-
-        RenderThread.RenderHandler handler = mRenderThread.getHandler();
-        handler.sendOrientationChanged(CameraUtils.getBackCameraDataRotation(getDisplay()));
-        handler.sendUnfreeze();
-
-        mPreviewLayout.setOnWindowFocusChangedListener(new OnWindowFocusChangedListener() {
-            @Override
-            public void onWindowFocusChanged(View view, boolean hasWindowFocus) {
-                if (hasWindowFocus) {
-                    setRecognitionCoreIdle(false);
-                } else {
-                    setRecognitionCoreIdle(true);
-                }
-            }
-        });
-
-        startShakeDetector();
-        mWindowRotationListener.register(mAppContext, getDisplay(), new WindowRotationListener.RotationListener() {
-            @Override
-            public void onWindowRotationChanged() {
-                refreshDisplayOrientation();
-            }
-        });
-        getCardDetectionStateView().setRecognitionResult(RecognitionResult.empty());
-        setRecognitionCoreIdle(false);
-    }
-
-    public void onPause() {
-        if (DBG) Log.d(TAG, "onPause()");
-        setRecognitionCoreIdle(true);
-        stopShakeDetector();
-        mPreviewLayout.setOnWindowFocusChangedListener(null);
-        mRecognitionCore.setStatusListener(null);
-
-        if (mRenderThread != null) {
-            RenderThread.RenderHandler rh = mRenderThread.getHandler();
-            rh.sendShutdown();
-            try {
-                mRenderThread.join();
-            } catch (InterruptedException ie) {
-                // not expected
-                if (mCallbacks != null) mCallbacks.onOpenCameraError(ie);
-            }
-            mRenderThread = null;
-        }
-        mWindowRotationListener.unregister();
-    }
-
-    public void resumeScan() {
-        setRecognitionCoreIdle(false);
-    }
-
-    public void toggleFlash() {
-        if (mRenderThread == null) return;
-        RenderThread.RenderHandler rh = mRenderThread.getHandler();
-        rh.sendToggleFlash();
-    }
-
-    private SurfaceView getSurfaceView() {
-        return mPreviewLayout.getSurfaceView();
-    }
-
-    private CardDetectionStateView getCardDetectionStateView() {
-        return mPreviewLayout.getDetectionStateOverlay();
-    }
-
-    private Display getDisplay() {
-        return ((WindowManager)mAppContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-    }
-
-    public void resetResult() {
-        if (DBG) Log.d(TAG, "resetResult()");
-        mRecognitionCore.resetResult();
-        if (mRenderThread != null) {
-            RenderThread.RenderHandler rh = mRenderThread.getHandler();
-            rh.sendResumeProcessFrames();
-        }
-
-        unfreezeCameraPreview();
-    }
-
-    private void refreshDisplayOrientation() {
-        if (DBG) Log.d(TAG, "refreshDisplayOrientation()");
-        final Display display = getDisplay();
-        mDisplayConfiguration.setDisplayParameters(display);
-        mRecognitionCore.setDisplayConfiguration(mDisplayConfiguration);
-        if (mRenderThread != null) {
-            int rotation = CameraUtils.getBackCameraDataRotation(display);
-            mRenderThread.getHandler().sendOrientationChanged(rotation);
-        }
-    }
-
-    public void setRecognitionCoreIdle(boolean idle) {
-        if (DBG) Log.d(TAG, "setRecognitionCoreIdle() called with: " +  "idle = [" + idle + "]");
-        mRecognitionCore.setIdle(idle);
-        if (mRenderThread != null) {
-            if (idle) {
-                mRenderThread.getHandler().sendPauseCamera();
-            } else {
-                mRenderThread.getHandler().sendResumeCamera();
-            }
-        }
-    }
-
-    private void setupCardDetectionCameraParameters(int previewSizeWidth, int previewSizeHeight) {
-        /* Card on 720x1280 preview frame */
-        Rect cardNdkRect = mRecognitionCore.getCardFrameRect();
-
-        /* Card on 1280x720 preview frame */
-        @SuppressWarnings("SuspiciousNameCombination")
-        Rect cardCameraRect = OrientationHelper.rotateRect(cardNdkRect,
-                CameraUtils.CAMERA_RESOLUTION.size.height,
-                CameraUtils.CAMERA_RESOLUTION.size.width,
-                90, null);
-
-        mPreviewLayout.setCameraParameters(previewSizeWidth, previewSizeHeight,
-                CameraUtils.getBackCameraDataRotation(getDisplay()),
-                cardCameraRect);
-    }
-
-    @MainThread
-    void onCameraOpened(Camera.Parameters parameters) {
-        Camera.Size previewSize = parameters.getPreviewSize();
-        setupCardDetectionCameraParameters(previewSize.width, previewSize.height);
-        if (mCallbacks != null) mCallbacks.onCameraOpened(parameters);
-    }
-
-    @MainThread
-    void onOpenCameraError(Exception e) {
-        if (DBG) Log.d(TAG, "onOpenCameraError() called with: " +  "e = [" + e + "]");
-        if (mCallbacks != null) mCallbacks.onOpenCameraError(e);
-        mRenderThread = null;
-    }
-
-    @MainThread
-    void onRenderThreadError(Throwable e) {
-        // XXX
-        if (DBG) Log.d(TAG, "onRenderThreadError() called with: " +  "e = [" + e + "]");
-        if (mCallbacks != null) mCallbacks.onOpenCameraError((Exception) e);
-        mRenderThread = null;
-    }
-
-    @MainThread
-    void onFrameProcessed(int newBorders) {
-        if (mCallbacks != null) mPreviewLayout.getDetectionStateOverlay().setDetectionState(newBorders);
-    }
-
-    @MainThread
-    void onFpsReport(String fpsReport) {
-        if (mCallbacks != null) mCallbacks.onFpsReport(fpsReport);
-    }
-
-    @MainThread
-    void onAutoFocusMoving(boolean isStart, String focusMode) {
-        if (mCallbacks != null) mCallbacks.onAutoFocusMoving(isStart, focusMode);
-    }
-
-    @MainThread
-    void onAutoFocusComplete(boolean isSuccess, String focusMode) {
-        if (mCallbacks != null) mCallbacks.onAutoFocusComplete(isSuccess, focusMode);
-    }
-
-    public void freezeCameraPreview() {
-        if (DBG) Log.d(TAG, "freezeCameraPreview() called with: " +  "");
-        if (mRenderThread != null) mRenderThread.getHandler().sendFreeze();
-    }
-
-    public void unfreezeCameraPreview() {
-        if (DBG) Log.d(TAG, "unfreezeCameraPreview() called with: " +  "");
-        if (mRenderThread != null) {
-            mRenderThread.getHandler().sendUnfreeze();
-        }
-    }
-
-    private void startShakeDetector() {
-        SensorManager sensorManager = (SensorManager) mAppContext.getSystemService(Context.SENSOR_SERVICE);
-        final Sensor sensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-        if (null != sensor) {
-            sensorManager.registerListener(mShakeEventListener, sensor, SensorManager.SENSOR_DELAY_GAME);
-        }
-    }
-
-    private void stopShakeDetector() {
-        SensorManager sensorManager = (SensorManager) mAppContext.getSystemService(Context.SENSOR_SERVICE);
-        sensorManager.unregisterListener(mShakeEventListener);
-    }
-
-    private final RecognitionStatusListener mRecognitionStatusListener = new RecognitionStatusListener() {
-        private long mRecognitionCompleteTs;
-
-        @Override
-        public void onRecognitionComplete(RecognitionResult result) {
-            getCardDetectionStateView().setRecognitionResult(result);
-            if (result.isFirst()) {
-                if (mRenderThread != null) mRenderThread.getHandler().sendPauseProcessFrames();
-                getCardDetectionStateView().setDetectionState(RecognitionConstants.DETECTED_BORDER_TOP
-                        | RecognitionConstants.DETECTED_BORDER_LEFT
-                        | RecognitionConstants.DETECTED_BORDER_RIGHT
-                        | RecognitionConstants.DETECTED_BORDER_BOTTOM
-                );
-                if (DBG) mRecognitionCompleteTs = System.nanoTime();
-            }
-            if (result.isFinal()) {
-                long newTs = System.nanoTime();
-                if (DBG) Log.v(TAG, String.format(Locale.US, "Final result received after %.3f ms", (newTs - mRecognitionCompleteTs) / 1_000_000f));
-            }
-            mCallbacks.onRecognitionComplete(result);
-        }
-
-        @Override
-        public void onCardImageReceived(Bitmap bitmap) {
-            if (DBG) {
-                long newTs = System.nanoTime();
-                Log.v(TAG, String.format(Locale.US, "Card image received after %.3f ms", (newTs - mRecognitionCompleteTs) / 1_000_000f));
-            }
-            mCallbacks.onCardImageReceived(bitmap);
-        }
-    };
-
-    private final SensorEventListener mShakeEventListener = new SensorEventListener() {
-
-        private static final double SHAKE_THRESHOLD = 3.3;
-
-        long lastUpdate;
-        public double[] gravity = new double[3];
-
-        @Override
-        public void onSensorChanged(final SensorEvent event) {
-            final long curTime = System.currentTimeMillis();
-            // only allow one update every 100ms.
-            final long diffTime = (curTime - lastUpdate);
-            if (500 < diffTime) {
-                lastUpdate = curTime;
-
-                final float alpha = 0.8f;
-                gravity[0] = alpha * gravity[0] + (1 - alpha) * event.values[0];
-                gravity[1] = alpha * gravity[1] + (1 - alpha) * event.values[1];
-                gravity[2] = alpha * gravity[2] + (1 - alpha) * event.values[2];
-
-                final double x = event.values[0] - gravity[0];
-                final double y = event.values[1] - gravity[1];
-                final double z = event.values[2] - gravity[2];
-
-                final double speed = Math.sqrt(x * x + y * y + z * z);
-
-                if (SHAKE_THRESHOLD < speed) {
-                    if (mRenderThread != null) {
-                        if (DBG) Log.d(TAG, "shake focus request");
-                        mRenderThread.getHandler().sendRequestFocus();
-                    }
-                }
-            }
-        }
-
-        @Override
-        public void onAccuracyChanged(final Sensor sensor, final int accuracy) {
-
-        }
-    };
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManagerHandler.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManagerHandler.java
deleted file mode 100644
index 93f8395..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/ScanManagerHandler.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import android.hardware.Camera;
-import android.os.Handler;
-import android.os.Message;
-import android.support.annotation.RestrictTo;
-import android.util.Log;
-
-import java.lang.ref.WeakReference;
-
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-
-/**
- * Custom message handler for main UI thread.
- * <p>
- * Receives messages from the renderer thread with UI-related updates, like the camera
- * parameters (which we show in a text message on screen).
- */
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class ScanManagerHandler extends Handler {
-    private static final boolean DBG = Constants.DEBUG;
-    private static final String TAG = "ScanManagerHandler";
-
-    private static final int MSG_SEND_OPEN_CAMERA_ERROR = 1;
-
-    private static final int MSG_SEND_RENDER_THREAD_ERROR = 2;
-
-    private static final int MSG_SEND_CAMERA_OPENED = 3;
-
-    private static final int MSG_SEND_NEW_BORDERS = 4;
-
-    private static final int MSG_SEND_FPS_REPORT = 5;
-
-    private static final int MSG_SEND_AUTO_FOCUS_MOVING = 6;
-
-    private static final int MSG_SEND_AUTO_FOCUS_COMPLETE = 7;
-
-    private WeakReference<ScanManager> mWeakScanManager;
-
-    public ScanManagerHandler(ScanManager manager) {
-        mWeakScanManager = new WeakReference<>(manager);
-    }
-
-    public void sendOpenCameraError(Exception e) {
-        sendMessage(obtainMessage(MSG_SEND_OPEN_CAMERA_ERROR, e));
-    }
-
-    public void sendRenderThreadError(Throwable e) {
-        sendMessage(obtainMessage(MSG_SEND_RENDER_THREAD_ERROR, e));
-    }
-
-    public void sendCameraOpened(Camera.Parameters cameraParameters) {
-        sendMessage(obtainMessage(MSG_SEND_CAMERA_OPENED, cameraParameters));
-    }
-
-    public void sendFrameProcessed(int newBorders) {
-        sendMessage(obtainMessage(MSG_SEND_NEW_BORDERS, newBorders, 0));
-    }
-
-    public void sendFpsResport(String fpSreport) {
-        sendMessage(obtainMessage(MSG_SEND_FPS_REPORT, fpSreport));
-    }
-
-    public void sendAutoFocusMoving(boolean isStart, String cameraFocusMode) {
-        sendMessage(obtainMessage(MSG_SEND_AUTO_FOCUS_MOVING, isStart ? 1 : 0, 0, cameraFocusMode));
-    }
-
-    public void sendAutoFocusComplete(boolean isSuccess, String cameraFocusMode) {
-        sendMessage(obtainMessage(MSG_SEND_AUTO_FOCUS_COMPLETE, isSuccess ? 1 : 0, 0, cameraFocusMode));
-    }
-
-    @Override
-    public void handleMessage(Message msg) {
-        ScanManager scanManager = mWeakScanManager.get();
-        if (scanManager == null) {
-            if (DBG) Log.d(TAG, "Got message for dead activity");
-            return;
-        }
-
-        switch (msg.what) {
-            case MSG_SEND_OPEN_CAMERA_ERROR:
-                scanManager.onOpenCameraError((Exception) msg.obj);
-                break;
-            case MSG_SEND_RENDER_THREAD_ERROR:
-                scanManager.onRenderThreadError((Throwable) msg.obj);
-                break;
-            case MSG_SEND_CAMERA_OPENED:
-                scanManager.onCameraOpened((Camera.Parameters) msg.obj);
-                break;
-            case MSG_SEND_NEW_BORDERS:
-                scanManager.onFrameProcessed(msg.arg1);
-                break;
-            case MSG_SEND_FPS_REPORT:
-                scanManager.onFpsReport((String)msg.obj);
-                break;
-            case MSG_SEND_AUTO_FOCUS_MOVING:
-                scanManager.onAutoFocusMoving(msg.arg1 != 0, (String)msg.obj);
-                break;
-            case MSG_SEND_AUTO_FOCUS_COMPLETE:
-                scanManager.onAutoFocusComplete(msg.arg1 != 0, (String)msg.obj);
-                break;
-            default:
-                throw new RuntimeException("Unknown message " + msg.what);
-        }
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/TorchManager.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/TorchManager.java
deleted file mode 100644
index 726f56d..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/TorchManager.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import android.hardware.Camera;
-import android.support.annotation.RestrictTo;
-import android.util.Log;
-
-import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionCore;
-import cards.pay.paycardsrecognizer.sdk.ndk.TorchStatusListener;
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class TorchManager {
-
-    private static final boolean DBG = Constants.DEBUG;
-    private static final String TAG = "TorchManager";
-
-    private final Camera mCamera;
-
-    private boolean mPaused;
-
-    private boolean mTorchTurnedOn;
-
-    private final RecognitionCore mRecognitionCore;
-
-    public TorchManager(RecognitionCore recognitionCore, Camera camera) {
-        mCamera = camera;
-        mRecognitionCore = recognitionCore;
-    }
-
-    public void pause() {
-        if (DBG) Log.d(TAG, "pause()");
-        CameraConfigurationUtils.setFlashLight(mCamera, false);
-        mPaused = true;
-        mRecognitionCore.setTorchListener(null);
-    }
-
-    public void resume() {
-        if (DBG) Log.d(TAG, "resume()");
-        mPaused = false;
-        mRecognitionCore.setTorchListener(mRecognitionCoreTorchStatusListener);
-        if (mTorchTurnedOn) {
-            mRecognitionCore.setTorchStatus(true);
-        } else {
-            mRecognitionCore.setTorchStatus(false);
-        }
-    }
-
-    public void destroy() {
-        mRecognitionCore.setTorchListener(null);
-    }
-
-    private boolean isTorchTurnedOn() {
-        String flashMode = mCamera.getParameters().getFlashMode();
-        return Camera.Parameters.FLASH_MODE_TORCH.equals(flashMode)
-                || Camera.Parameters.FLASH_MODE_ON.equals(flashMode);
-    }
-
-    public void toggleTorch() {
-        if (mPaused) return;
-        boolean newStatus = !isTorchTurnedOn();
-        if (DBG) Log.d(TAG, "toggleTorch() called with newStatus: " +  newStatus);
-        mRecognitionCore.setTorchStatus(newStatus);
-
-        // onTorchStatusChanged() will not be called if the RecognitionCore internal status will not be changed.
-        // Sync twice to keep safe
-        CameraConfigurationUtils.setFlashLight(mCamera, newStatus);
-    }
-
-    private final TorchStatusListener mRecognitionCoreTorchStatusListener = new TorchStatusListener() {
-
-        // called from RecognitionCore
-        @Override
-        public void onTorchStatusChanged(boolean turnTorchOn) {
-            if (mCamera == null) return;
-            if (DBG) Log.d(TAG, "onTorchStatusChanged() called with: " +  "turnTorchOn = [" + turnTorchOn + "]");
-            if (turnTorchOn) {
-                mTorchTurnedOn = true;
-                if (!mPaused) CameraConfigurationUtils.setFlashLight(mCamera, true);
-            } else {
-                mTorchTurnedOn = false;
-                CameraConfigurationUtils.setFlashLight(mCamera, false);
-            }
-        }
-    };
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/WindowRotationListener.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/WindowRotationListener.java
deleted file mode 100644
index 673c482..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/WindowRotationListener.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.camera;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.hardware.display.DisplayManager;
-import android.os.Build;
-import android.os.Handler;
-import android.support.annotation.RestrictTo;
-import android.util.Log;
-import android.view.Display;
-import android.view.OrientationEventListener;
-
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class WindowRotationListener {
-
-    private static final String TAG = "WindowRotationListener";
-    private static boolean DBG = Constants.DEBUG;
-
-    public interface RotationListener {
-        void onWindowRotationChanged();
-    }
-
-    private interface Impl {
-        void register(Context context, Display display, RotationListener listener);
-        void unregister();
-    }
-
-    private static final Impl sImpl;
-
-    static {
-        if (Build.VERSION.SDK_INT >= 17) {
-            sImpl = new ImplApi17();
-        } else {
-            sImpl = new ImplDefault();
-        }
-    }
-
-    public void register(Context context, Display display, RotationListener listener) {
-        sImpl.register(context, display, listener);
-    }
-
-    public void unregister() {
-        sImpl.unregister();
-    }
-
-    private static class ImplDefault implements Impl {
-
-        private Display mDisplay;
-
-        private RotationListener mListener;
-
-        private OrientationEventListener mOrientationListener;
-
-        @Override
-        public void register(Context context, Display display, RotationListener listener) {
-            mDisplay = display;
-            mListener = listener;
-            mOrientationListener = new OrientationEventListener(context) {
-                int lastWindowOrientation = OrientationHelper.getDisplayRotationDegrees(mDisplay);
-                int lastOrientation = lastWindowOrientation;
-
-                @Override
-                public void onOrientationChanged(int orientation) {
-                    if (mDisplay == null) return; // onOrientationChanged() called after unsubscribe. Skip
-                    orientation = ((orientation + 45) / 90) * 90;
-                    if (orientation == lastOrientation) return;
-                    lastOrientation = orientation;
-
-                    int windowOrientation = OrientationHelper.getDisplayRotationDegrees(mDisplay);
-                    if (windowOrientation == lastWindowOrientation) return;
-                    lastWindowOrientation = windowOrientation;
-
-                    if (orientation == ORIENTATION_UNKNOWN) return;
-                    if (mListener != null) mListener.onWindowRotationChanged();
-                }
-            };
-            mOrientationListener.enable();
-        }
-
-        @Override
-        public void unregister() {
-            if (mOrientationListener == null) return;
-            mOrientationListener.disable();
-            mOrientationListener = null;
-            mDisplay = null;
-            mListener = null;
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-    private static class ImplApi17 implements Impl, DisplayManager.DisplayListener {
-
-        private RotationListener mListener;
-
-        private final Handler mHandler;
-
-        private DisplayManager mDisplayManager;
-
-        private int mDisplayId;
-
-        public ImplApi17() {
-            mHandler = new Handler();
-        }
-
-        @Override
-        public void register(Context context, Display display, RotationListener listener) {
-            mListener = listener;
-            mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
-            mDisplayManager.registerDisplayListener(this, mHandler);
-            mDisplayId = display.getDisplayId();
-        }
-
-        @Override
-        public void unregister() {
-            if (mDisplayManager == null) return;
-            mDisplayManager.unregisterDisplayListener(this);
-            mDisplayManager = null;
-            mListener = null;
-        }
-
-        @Override
-        public void onDisplayAdded(int displayId) {
-            if (DBG) Log.d(TAG, "onDisplayAdded() called with: " +  "displayId = [" + displayId + "]");
-        }
-
-        @Override
-        public void onDisplayRemoved(int displayId) {
-            if (DBG) Log.d(TAG, "onDisplayRemoved() called with: " +  "displayId = [" + displayId + "]");
-        }
-
-        @Override
-        public void onDisplayChanged(int displayId) {
-            if (DBG) Log.d(TAG, "onDisplayChanged() called with: " +  "displayId = [" + displayId + "]");
-            if (mListener != null && displayId == this.mDisplayId) {
-                mListener.onWindowRotationChanged();
-            }
-        }
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Drawable2d.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Drawable2d.java
deleted file mode 100644
index adc710c..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Drawable2d.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cards.pay.paycardsrecognizer.sdk.camera.gles;
-
-import android.support.annotation.RestrictTo;
-
-import java.nio.FloatBuffer;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class Drawable2d {
-    private static final int SIZEOF_FLOAT = 4;
-
-    /**
-     * Simple square, specified as a triangle strip.  The square is centered on (0,0) and has
-     * a size of 1x1.
-     * <p>
-     * Triangles are 0-1-2 and 2-1-3 (counter-clockwise winding).
-     */
-    private static final float RECTANGLE_COORDS[] = {
-            -0.5f, -0.5f,   // 0 bottom left
-            0.5f, -0.5f,   // 1 bottom right
-            -0.5f,  0.5f,   // 2 top left
-            0.5f,  0.5f,   // 3 top right
-    };
-    private static final float RECTANGLE_TEX_COORDS[] = {
-            0.0f, 1.0f,     // 0 bottom left
-            1.0f, 1.0f,     // 1 bottom right
-            0.0f, 0.0f,     // 2 top left
-            1.0f, 0.0f      // 3 top right
-    };
-    private static final FloatBuffer RECTANGLE_BUF =
-            GlUtil.createFloatBuffer(RECTANGLE_COORDS);
-    private static final FloatBuffer RECTANGLE_TEX_BUF =
-            GlUtil.createFloatBuffer(RECTANGLE_TEX_COORDS);
-
-    private FloatBuffer mVertexArray;
-    private FloatBuffer mTexCoordArray;
-    private int mVertexCount;
-    private int mCoordsPerVertex;
-    private int mVertexStride;
-    private int mTexCoordStride;
-
-    /**
-     * Prepares a drawable from a "pre-fabricated" shape definition.
-     * <p>
-     * Does no EGL/GL operations, so this can be done at any time.
-     */
-    public Drawable2d() {
-        mVertexArray = RECTANGLE_BUF;
-        mTexCoordArray = RECTANGLE_TEX_BUF;
-        mCoordsPerVertex = 2;
-        mVertexStride = mCoordsPerVertex * SIZEOF_FLOAT;
-        mVertexCount = RECTANGLE_COORDS.length / mCoordsPerVertex;
-        mTexCoordStride = 2 * SIZEOF_FLOAT;
-    }
-
-    /**
-     * Returns the array of vertices.
-     * <p>
-     * To avoid allocations, this returns internal state.  The caller must not modify it.
-     */
-    public FloatBuffer getVertexArray() {
-        return mVertexArray;
-    }
-
-    /**
-     * Returns the array of texture coordinates.
-     * <p>
-     * To avoid allocations, this returns internal state.  The caller must not modify it.
-     */
-    public FloatBuffer getTexCoordArray() {
-        return mTexCoordArray;
-    }
-
-    /**
-     * Returns the number of vertices stored in the vertex array.
-     */
-    public int getVertexCount() {
-        return mVertexCount;
-    }
-
-    /**
-     * Returns the width, in bytes, of the data for each vertex.
-     */
-    public int getVertexStride() {
-        return mVertexStride;
-    }
-
-    /**
-     * Returns the width, in bytes, of the data for each texture coordinate.
-     */
-    public int getTexCoordStride() {
-        return mTexCoordStride;
-    }
-
-    /**
-     * Returns the number of position coordinates per vertex.  This will be 2 or 3.
-     */
-    public int getCoordsPerVertex() {
-        return mCoordsPerVertex;
-    }
-
-    @Override
-    public String toString() {
-        return "[Drawable2d: Rectangle]";
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/EglCore.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/EglCore.java
deleted file mode 100644
index 2275ecc..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/EglCore.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cards.pay.paycardsrecognizer.sdk.camera.gles;
-
-import android.graphics.SurfaceTexture;
-import android.opengl.EGL14;
-import android.support.annotation.RestrictTo;
-import android.util.Log;
-import android.view.SurfaceHolder;
-
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-import javax.microedition.khronos.egl.EGLSurface;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class EglCore {
-    private static final boolean DBG = GlUtil.DBG;
-    private static final String TAG = GlUtil.TAG;
-
-    /**
-     * Constructor flag: surface must be recordable.  This discourages EGL from using a
-     * pixel format that cannot be converted efficiently to something usable by the video
-     * encoder.
-     */
-    public static final int FLAG_RECORDABLE = 0x01;
-
-    // Android-specific extension.
-    private static final int EGL_RECORDABLE_ANDROID = 0x3142;
-
-    private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
-
-    private EGL10 mEgl;
-    private EGLDisplay mEGLDisplay = EGL10.EGL_NO_DISPLAY;
-    private EGLContext mEGLContext = EGL10.EGL_NO_CONTEXT;
-    private EGLConfig mEGLConfig = null;
-    private int mGlVersion = -1;
-
-    /**
-     * Prepares EGL display and context.
-     * <p>
-     * Equivalent to EglCore(null, 0).
-     */
-    public EglCore() {
-        this(null, 0);
-    }
-
-    /**
-     * Prepares EGL display and context.
-     * <p>
-     * @param sharedContext The context to share, or null if sharing is not desired.
-     * @param flags Configuration bit flags, e.g. FLAG_RECORDABLE.
-     */
-    public EglCore(EGLContext sharedContext, int flags) throws RuntimeException {
-        if (mEGLDisplay != EGL10.EGL_NO_DISPLAY) {
-            throw new RuntimeException("EGL already set up");
-        }
-
-        if (sharedContext == null) {
-            sharedContext = EGL10.EGL_NO_CONTEXT;
-        }
-
-        mEgl = (EGL10) EGLContext.getEGL();
-
-        mEGLDisplay = mEgl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-        if (mEGLDisplay == EGL10.EGL_NO_DISPLAY) {
-            throw new RuntimeException("unable to get EGL14 display");
-        }
-        int[] version = new int[2];
-        if (!mEgl.eglInitialize(mEGLDisplay, version)) {
-            mEGLDisplay = null;
-            throw new RuntimeException("unable to initialize EGL14");
-        }
-
-        EGLConfig config = getConfig(flags);
-        if (config == null) {
-            throw new RuntimeException("Unable to find a suitable EGLConfig");
-        }
-        int[] attrib2_list = {
-                EGL_CONTEXT_CLIENT_VERSION, 2,
-                EGL10.EGL_NONE
-        };
-        EGLContext context = mEgl.eglCreateContext(mEGLDisplay, config, EGL10.EGL_NO_CONTEXT, attrib2_list);
-        checkEglError("eglCreateContext");
-        mEGLConfig = config;
-        mEGLContext = context;
-        mGlVersion = 2;
-
-        // Confirm with query.
-        int[] values = new int[1];
-        mEgl.eglQueryContext(mEGLDisplay, mEGLContext, EGL_CONTEXT_CLIENT_VERSION,
-                values);
-        if (DBG) Log.d(TAG, "EGLContext created, client version " + values[0]);
-    }
-
-    /**
-     * Finds a suitable EGLConfig.
-     *
-     * @param flags Bit flags from constructor.
-     */
-    private EGLConfig getConfig(int flags) {
-        int renderableType = /* EGL14.EGL_OPENGL_ES2_BIT */ 4;
-
-        // The actual surface is generally RGBA or RGBX, so situationally omitting alpha
-        // doesn't really help.  It can also lead to a huge performance hit on glReadPixels()
-        // when reading into a GL_RGBA buffer.
-        int[] attribList = {
-                EGL10.EGL_RED_SIZE, 8,
-                EGL10.EGL_GREEN_SIZE, 8,
-                EGL10.EGL_BLUE_SIZE, 8,
-                EGL10.EGL_ALPHA_SIZE, 8,
-                //EGL14.EGL_DEPTH_SIZE, 16,
-                //EGL14.EGL_STENCIL_SIZE, 8,
-                EGL10.EGL_RENDERABLE_TYPE, renderableType,
-                EGL10.EGL_NONE, 0,      // placeholder for recordable [@-3]
-                EGL10.EGL_NONE
-        };
-        if ((flags & FLAG_RECORDABLE) != 0) {
-            attribList[attribList.length - 3] = EGL_RECORDABLE_ANDROID;
-            attribList[attribList.length - 2] = 1;
-        }
-        EGLConfig[] configs = new EGLConfig[1];
-        int[] numConfigs = new int[1];
-        if (!mEgl.eglChooseConfig(mEGLDisplay, attribList, configs, configs.length, numConfigs)) {
-            if (DBG) Log.w(TAG, "unable to find RGB8888 / " + 2 + " EGLConfig");
-            return null;
-        }
-        return configs[0];
-    }
-
-    /**
-     * Discards all resources held by this class, notably the EGL context.  This must be
-     * called from the thread where the context was created.
-     * <p>
-     * On completion, no context will be current.
-     */
-    public void release() {
-        if (mEGLDisplay != EGL10.EGL_NO_DISPLAY) {
-            // Android is unusual in that it uses a reference-counted EGLDisplay.  So for
-            // every eglInitialize() we need an eglTerminate().
-            mEgl.eglMakeCurrent(mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE,
-                    EGL10.EGL_NO_CONTEXT);
-            mEgl.eglDestroyContext(mEGLDisplay, mEGLContext);
-            // TODO mEgl.eglReleaseThread();
-            mEgl.eglTerminate(mEGLDisplay);
-        }
-
-        mEGLDisplay = EGL10.EGL_NO_DISPLAY;
-        mEGLContext = EGL10.EGL_NO_CONTEXT;
-        mEGLConfig = null;
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (mEGLDisplay != EGL10.EGL_NO_DISPLAY) {
-                // We're limited here -- finalizers don't run on the thread that holds
-                // the EGL state, so if a surface or context is still current on another
-                // thread we can't fully release it here.  Exceptions thrown from here
-                // are quietly discarded.  Complain in the log file.
-                if (DBG) Log.w(TAG, "WARNING: EglCore was not explicitly released -- state may be leaked");
-                release();
-            }
-        } finally {
-            super.finalize();
-        }
-    }
-
-    /**
-     * Destroys the specified surface.  Note the EGLSurface won't actually be destroyed if it's
-     * still current in a context.
-     */
-    public void releaseSurface(EGLSurface eglSurface) {
-        mEgl.eglDestroySurface(mEGLDisplay, eglSurface);
-    }
-
-    /**
-     * Creates an EGL surface associated with a Surface.
-     * <p>
-     * If this is destined for MediaCodec, the EGLConfig should have the "recordable" attribute.
-     */
-    public EGLSurface createWindowSurface(Object surface) {
-        if (!(surface instanceof SurfaceHolder) && !(surface instanceof SurfaceTexture)) {
-            throw new RuntimeException("invalid surface: " + surface);
-        }
-
-        // Create a window surface, and attach it to the Surface we received.
-        int[] surfaceAttribs = {
-                EGL10.EGL_NONE
-        };
-        EGLSurface eglSurface = mEgl.eglCreateWindowSurface(mEGLDisplay, mEGLConfig, surface,
-                surfaceAttribs);
-        checkEglError("eglCreateWindowSurface");
-        if (eglSurface == null) {
-            throw new RuntimeException("surface was null");
-        }
-        return eglSurface;
-    }
-
-    /**
-     * Creates an EGL surface associated with an offscreen buffer.
-     */
-    public EGLSurface createOffscreenSurface(int width, int height) {
-        int[] surfaceAttribs = {
-                EGL10.EGL_WIDTH, width,
-                EGL10.EGL_HEIGHT, height,
-                EGL10.EGL_NONE
-        };
-        EGLSurface eglSurface = mEgl.eglCreatePbufferSurface(mEGLDisplay, mEGLConfig,
-                surfaceAttribs);
-        checkEglError("eglCreatePbufferSurface");
-        if (eglSurface == null) {
-            throw new RuntimeException("surface was null");
-        }
-        return eglSurface;
-    }
-
-    /**
-     * Makes our EGL context current, using the supplied surface for both "draw" and "read".
-     */
-    public void makeCurrent(EGLSurface eglSurface) {
-        if (mEGLDisplay == EGL10.EGL_NO_DISPLAY) {
-            // called makeCurrent() before create?
-            if (DBG) Log.d(TAG, "NOTE: makeCurrent w/o display");
-        }
-        if (!mEgl.eglMakeCurrent(mEGLDisplay, eglSurface, eglSurface, mEGLContext)) {
-            throw new RuntimeException("eglMakeCurrent failed");
-        }
-    }
-
-    /**
-     * Makes our EGL context current, using the supplied "draw" and "read" surfaces.
-     */
-    public void makeCurrent(EGLSurface drawSurface, EGLSurface readSurface) {
-        if (mEGLDisplay == EGL10.EGL_NO_DISPLAY) {
-            // called makeCurrent() before create?
-            if (DBG) Log.d(TAG, "NOTE: makeCurrent w/o display");
-        }
-        if (!mEgl.eglMakeCurrent(mEGLDisplay, drawSurface, readSurface, mEGLContext)) {
-            throw new RuntimeException("eglMakeCurrent(draw,read) failed");
-        }
-    }
-
-    /**
-     * Makes no context current.
-     */
-    public void makeNothingCurrent() {
-        if (!mEgl.eglMakeCurrent(mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE,
-                EGL10.EGL_NO_CONTEXT)) {
-            throw new RuntimeException("eglMakeCurrent failed");
-        }
-    }
-
-    /**
-     * Calls eglSwapBuffers.  Use this to "publish" the current frame.
-     *
-     * @return false on failure
-     */
-    public boolean swapBuffers(EGLSurface eglSurface) {
-        return mEgl.eglSwapBuffers(mEGLDisplay, eglSurface);
-    }
-
-
-    /**
-     * Returns true if our context and the specified surface are current.
-     */
-    public boolean isCurrent(EGLSurface eglSurface) {
-        return mEGLContext.equals(mEgl.eglGetCurrentContext()) &&
-                eglSurface.equals(mEgl.eglGetCurrentSurface(EGL10.EGL_DRAW));
-    }
-
-    /**
-     * Performs a simple surface query.
-     */
-    public int querySurface(EGLSurface eglSurface, int what) {
-        int[] value = new int[1];
-        mEgl.eglQuerySurface(mEGLDisplay, eglSurface, what, value);
-        return value[0];
-    }
-
-    /**
-     * Queries a string value.
-     */
-    public String queryString(int what) {
-        return mEgl.eglQueryString(mEGLDisplay, what);
-    }
-
-    /**
-     * Returns the GLES version this context is configured for (currently 2 or 3).
-     */
-    public int getGlVersion() {
-        return mGlVersion;
-    }
-
-    /**
-     * Checks for EGL errors.  Throws an exception if an error has been raised.
-     */
-    private void checkEglError(String msg) {
-        int error;
-        if ((error = mEgl.eglGetError()) != EGL14.EGL_SUCCESS) {
-            throw new RuntimeException(msg + ": EGL error: 0x" + Integer.toHexString(error));
-        }
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/GlUtil.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/GlUtil.java
deleted file mode 100644
index 54b2dc7..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/GlUtil.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cards.pay.paycardsrecognizer.sdk.camera.gles;
-
-import android.opengl.GLES20;
-import android.opengl.Matrix;
-import android.util.Log;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-public class GlUtil {
-    public static final boolean DBG = Constants.DEBUG;
-    public static final String TAG = "gles";
-
-    /** Identity matrix for general use.  Don't modify or life will get weird. */
-    public static final float[] IDENTITY_MATRIX;
-    static {
-        IDENTITY_MATRIX = new float[16];
-        Matrix.setIdentityM(IDENTITY_MATRIX, 0);
-    }
-
-    private static final int SIZEOF_FLOAT = 4;
-
-
-    private GlUtil() {}     // do not instantiate
-
-    /**
-     * Creates a new program from the supplied vertex and fragment shaders.
-     *
-     * @return A handle to the program, or 0 on failure.
-     */
-    public static int createProgram(String vertexSource, String fragmentSource) {
-        int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
-        if (vertexShader == 0) {
-            return 0;
-        }
-        int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
-        if (pixelShader == 0) {
-            return 0;
-        }
-
-        int program = GLES20.glCreateProgram();
-        checkGlError("glCreateProgram");
-        if (program == 0) {
-            if (DBG) Log.e(TAG, "Could not create program");
-        }
-        GLES20.glAttachShader(program, vertexShader);
-        checkGlError("glAttachShader");
-        GLES20.glAttachShader(program, pixelShader);
-        checkGlError("glAttachShader");
-        GLES20.glLinkProgram(program);
-        int[] linkStatus = new int[1];
-        GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
-        if (linkStatus[0] != GLES20.GL_TRUE) {
-            if (DBG) Log.e(TAG, "Could not link program: ");
-            if (DBG) Log.e(TAG, GLES20.glGetProgramInfoLog(program));
-            GLES20.glDeleteProgram(program);
-            program = 0;
-        }
-        return program;
-    }
-
-    /**
-     * Compiles the provided shader source.
-     *
-     * @return A handle to the shader, or 0 on failure.
-     */
-    public static int loadShader(int shaderType, String source) {
-        int shader = GLES20.glCreateShader(shaderType);
-        checkGlError("glCreateShader type=" + shaderType);
-        GLES20.glShaderSource(shader, source);
-        GLES20.glCompileShader(shader);
-        int[] compiled = new int[1];
-        GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
-        if (compiled[0] == 0) {
-            if (DBG) Log.e(TAG, "Could not compile shader " + shaderType + ":");
-            if (DBG) Log.e(TAG, " " + GLES20.glGetShaderInfoLog(shader));
-            GLES20.glDeleteShader(shader);
-            shader = 0;
-        }
-        return shader;
-    }
-
-    /**
-     * Checks to see if a GLES error has been raised.
-     */
-    public static void checkGlError(String op) {
-        int error = GLES20.glGetError();
-        if (error != GLES20.GL_NO_ERROR) {
-            String msg = op + ": glError 0x" + Integer.toHexString(error);
-            if (DBG) Log.e(TAG, msg);
-            throw new RuntimeException(msg);
-        }
-    }
-
-    /**
-     * Checks to see if the location we obtained is valid.  GLES returns -1 if a label
-     * could not be found, but does not set the GL error.
-     * <p>
-     * Throws a RuntimeException if the location is invalid.
-     */
-    public static void checkLocation(int location, String label) {
-        if (location < 0) {
-            throw new RuntimeException("Unable to locate '" + label + "' in program");
-        }
-    }
-
-    /**
-     * Allocates a direct float buffer, and populates it with the float array data.
-     */
-    public static FloatBuffer createFloatBuffer(float[] coords) {
-        // Allocate a direct ByteBuffer, using 4 bytes per float, and copy coords into it.
-        ByteBuffer bb = ByteBuffer.allocateDirect(coords.length * SIZEOF_FLOAT);
-        bb.order(ByteOrder.nativeOrder());
-        FloatBuffer fb = bb.asFloatBuffer();
-        fb.put(coords);
-        fb.position(0);
-        return fb;
-    }
-
-    /**
-     * Writes GL version info to the log.
-     */
-    public static void logVersionInfo() {
-        if (DBG) Log.i(TAG, "vendor  : " + GLES20.glGetString(GLES20.GL_VENDOR));
-        if (DBG) Log.i(TAG, "renderer: " + GLES20.glGetString(GLES20.GL_RENDERER));
-        if (DBG) Log.i(TAG, "version : " + GLES20.glGetString(GLES20.GL_VERSION));
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Sprite2d.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Sprite2d.java
deleted file mode 100644
index e05288f..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Sprite2d.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cards.pay.paycardsrecognizer.sdk.camera.gles;
-
-import android.opengl.Matrix;
-import android.support.annotation.RestrictTo;
-
-/**
- * Base class for a 2d object.  Includes position, scale, rotation, and flat-shaded color.
- */
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class Sprite2d {
-    private Drawable2d mDrawable;
-    private float mColor[];
-    private int mTextureId;
-    private float mAngle;
-    private float mScaleX, mScaleY;
-    private float mPosX, mPosY;
-
-    private float[] mModelViewMatrix;
-    private boolean mMatrixReady;
-
-    private float[] mScratchMatrix = new float[16];
-
-    public Sprite2d(Drawable2d drawable) {
-        mDrawable = drawable;
-        mColor = new float[4];
-        mColor[3] = 1.0f;
-        mTextureId = -1;
-
-        mModelViewMatrix = new float[16];
-        mMatrixReady = false;
-    }
-
-    /**
-     * Re-computes mModelViewMatrix, based on the current values for rotation, scale, and
-     * translation.
-     */
-    private void recomputeMatrix() {
-        float[] modelView = mModelViewMatrix;
-
-        Matrix.setIdentityM(modelView, 0);
-        Matrix.translateM(modelView, 0, mPosX, mPosY, 0.0f);
-        if (mAngle != 0.0f) {
-            Matrix.rotateM(modelView, 0, mAngle, 0.0f, 0.0f, 1.0f);
-        }
-        Matrix.scaleM(modelView, 0, mScaleX, mScaleY, 1.0f);
-        mMatrixReady = true;
-    }
-
-    /**
-     * Returns the sprite scale along the X axis.
-     */
-    public float getScaleX() {
-        return mScaleX;
-    }
-
-    /**
-     * Returns the sprite scale along the Y axis.
-     */
-    public float getScaleY() {
-        return mScaleY;
-    }
-
-    /**
-     * Sets the sprite scale (size).
-     */
-    public void setScale(float scaleX, float scaleY) {
-        mScaleX = scaleX;
-        mScaleY = scaleY;
-        mMatrixReady = false;
-    }
-
-    /**
-     * Gets the sprite rotation angle, in degrees.
-     */
-    public float getRotation() {
-        return mAngle;
-    }
-
-    /**
-     * Sets the sprite rotation angle, in degrees.  Sprite will rotate counter-clockwise.
-     */
-    public void setRotation(float angle) {
-        // Normalize.  We're not expecting it to be way off, so just iterate.
-        while (angle >= 360.0f) {
-            angle -= 360.0f;
-        }
-        while (angle <= -360.0f) {
-            angle += 360.0f;
-        }
-        mAngle = angle;
-        mMatrixReady = false;
-    }
-
-    /**
-     * Returns the position on the X axis.
-     */
-    public float getPositionX() {
-        return mPosX;
-    }
-
-    /**
-     * Returns the position on the Y axis.
-     */
-    public float getPositionY() {
-        return mPosY;
-    }
-
-    /**
-     * Sets the sprite position.
-     */
-    public void setPosition(float posX, float posY) {
-        mPosX = posX;
-        mPosY = posY;
-        mMatrixReady = false;
-    }
-
-    /**
-     * Returns the model-view matrix.
-     * <p>
-     * To avoid allocations, this returns internal state.  The caller must not modify it.
-     */
-    public float[] getModelViewMatrix() {
-        if (!mMatrixReady) {
-            recomputeMatrix();
-        }
-        return mModelViewMatrix;
-    }
-
-    /**
-     * Sets color to use for flat-shaded rendering.  Has no effect on textured rendering.
-     */
-    public void setColor(float red, float green, float blue) {
-        mColor[0] = red;
-        mColor[1] = green;
-        mColor[2] = blue;
-    }
-
-    /**
-     * Sets texture to use for textured rendering.  Has no effect on flat-shaded rendering.
-     */
-    public void setTexture(int textureId) {
-        mTextureId = textureId;
-    }
-
-    /**
-     * Returns the color.
-     * <p>
-     * To avoid allocations, this returns internal state.  The caller must not modify it.
-     */
-    public float[] getColor() {
-        return mColor;
-    }
-
-    /**
-     * Draws the rectangle with the supplied program and projection matrix.
-     */
-    public void draw(Texture2dProgram program, float[] projectionMatrix) {
-        // Compute model/view/projection matrix.
-        Matrix.multiplyMM(mScratchMatrix, 0, projectionMatrix, 0, getModelViewMatrix(), 0);
-
-        program.draw(mScratchMatrix, mDrawable.getVertexArray(), 0,
-                mDrawable.getVertexCount(), mDrawable.getCoordsPerVertex(),
-                mDrawable.getVertexStride(), GlUtil.IDENTITY_MATRIX, mDrawable.getTexCoordArray(),
-                mTextureId, mDrawable.getTexCoordStride());
-    }
-
-    @Override
-    public String toString() {
-        return "[Sprite2d pos=" + mPosX + "," + mPosY +
-                " scale=" + mScaleX + "," + mScaleY + " angle=" + mAngle +
-                " color={" + mColor[0] + "," + mColor[1] + "," + mColor[2] +
-                "} drawable=" + mDrawable + "]";
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Texture2dProgram.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Texture2dProgram.java
deleted file mode 100644
index 90d4541..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/Texture2dProgram.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cards.pay.paycardsrecognizer.sdk.camera.gles;
-
-import android.opengl.GLES11Ext;
-import android.opengl.GLES20;
-import android.util.Log;
-
-import java.nio.FloatBuffer;
-
-import cards.pay.paycardsrecognizer.sdk.utils.Constants;
-
-public class Texture2dProgram {
-    private static final boolean DBG = Constants.DEBUG;
-    private static final String TAG = GlUtil.TAG;
-
-    // Simple vertex shader, used for all programs.
-    private static final String VERTEX_SHADER =
-            "uniform mat4 uMVPMatrix;\n" +
-                    "uniform mat4 uTexMatrix;\n" +
-                    "attribute vec4 aPosition;\n" +
-                    "attribute vec4 aTextureCoord;\n" +
-                    "varying vec2 vTextureCoord;\n" +
-                    "void main() {\n" +
-                    "    gl_Position = uMVPMatrix * aPosition;\n" +
-                    "    vTextureCoord = (uTexMatrix * aTextureCoord).xy;\n" +
-                    "}\n";
-
-    // Simple fragment shader for use with external 2D textures (e.g. what we get from
-    // SurfaceTexture).
-    private static final String FRAGMENT_SHADER_EXT =
-            "#extension GL_OES_EGL_image_external : require\n" +
-                    "precision mediump float;\n" +
-                    "varying vec2 vTextureCoord;\n" +
-                    "uniform samplerExternalOES sTexture;\n" +
-                    "void main() {\n" +
-                    "    gl_FragColor = texture2D(sTexture, vTextureCoord);\n" +
-                    "}\n";
-
-    public static final int KERNEL_SIZE = 9;
-
-    // Handles to the GL program and various components of it.
-    private int mProgramHandle;
-    private int muMVPMatrixLoc;
-    private int muTexMatrixLoc;
-    private int muKernelLoc;
-    private int muTexOffsetLoc;
-    private int muColorAdjustLoc;
-    private int maPositionLoc;
-    private int maTextureCoordLoc;
-
-    private int mTextureTarget;
-
-    private float[] mKernel = new float[KERNEL_SIZE];
-    private float[] mTexOffset;
-    private float mColorAdjust;
-
-    /**
-     * Prepares the program in the current EGL context.
-     */
-    public Texture2dProgram() {
-        mTextureTarget = GLES11Ext.GL_TEXTURE_EXTERNAL_OES;
-        mProgramHandle = GlUtil.createProgram(VERTEX_SHADER, FRAGMENT_SHADER_EXT);
-
-        if (DBG) Log.d(TAG, "Created program " + mProgramHandle + " (TEXTURE_EXT)");
-
-        // get locations of attributes and uniforms
-
-        maPositionLoc = GLES20.glGetAttribLocation(mProgramHandle, "aPosition");
-        GlUtil.checkLocation(maPositionLoc, "aPosition");
-        maTextureCoordLoc = GLES20.glGetAttribLocation(mProgramHandle, "aTextureCoord");
-        GlUtil.checkLocation(maTextureCoordLoc, "aTextureCoord");
-        muMVPMatrixLoc = GLES20.glGetUniformLocation(mProgramHandle, "uMVPMatrix");
-        GlUtil.checkLocation(muMVPMatrixLoc, "uMVPMatrix");
-        muTexMatrixLoc = GLES20.glGetUniformLocation(mProgramHandle, "uTexMatrix");
-        GlUtil.checkLocation(muTexMatrixLoc, "uTexMatrix");
-        muKernelLoc = GLES20.glGetUniformLocation(mProgramHandle, "uKernel");
-        if (muKernelLoc < 0) {
-            // no kernel in this one
-            muKernelLoc = -1;
-            muTexOffsetLoc = -1;
-            muColorAdjustLoc = -1;
-        } else {
-            // has kernel, must also have tex offset and color adj
-            muTexOffsetLoc = GLES20.glGetUniformLocation(mProgramHandle, "uTexOffset");
-            GlUtil.checkLocation(muTexOffsetLoc, "uTexOffset");
-            muColorAdjustLoc = GLES20.glGetUniformLocation(mProgramHandle, "uColorAdjust");
-            GlUtil.checkLocation(muColorAdjustLoc, "uColorAdjust");
-
-            // initialize default values
-            setKernel(new float[] {0f, 0f, 0f,  0f, 1f, 0f,  0f, 0f, 0f}, 0f);
-            setTexSize(256, 256);
-        }
-    }
-
-    /**
-     * Releases the program.
-     * <p>
-     * The appropriate EGL context must be current (i.e. the one that was used to create
-     * the program).
-     */
-    public void release() {
-        if (DBG) Log.d(TAG, "deleting program " + mProgramHandle);
-        GLES20.glDeleteProgram(mProgramHandle);
-        mProgramHandle = -1;
-    }
-
-    /**
-     * Creates a texture object suitable for use with this program.
-     * <p>
-     * On exit, the texture will be bound.
-     */
-    public int createTextureObject() {
-        int[] textures = new int[1];
-        GLES20.glGenTextures(1, textures, 0);
-        GlUtil.checkGlError("glGenTextures");
-
-        int texId = textures[0];
-        GLES20.glBindTexture(mTextureTarget, texId);
-        GlUtil.checkGlError("glBindTexture " + texId);
-
-        GLES20.glTexParameterf(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MIN_FILTER,
-                GLES20.GL_NEAREST);
-        GLES20.glTexParameterf(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MAG_FILTER,
-                GLES20.GL_LINEAR);
-        GLES20.glTexParameteri(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_WRAP_S,
-                GLES20.GL_CLAMP_TO_EDGE);
-        GLES20.glTexParameteri(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_WRAP_T,
-                GLES20.GL_CLAMP_TO_EDGE);
-        GlUtil.checkGlError("glTexParameter");
-
-        return texId;
-    }
-
-    /**
-     * Configures the convolution filter values.
-     *
-     * @param values Normalized filter values; must be KERNEL_SIZE elements.
-     */
-    private void setKernel(float[] values, float colorAdj) {
-        if (values.length != KERNEL_SIZE) {
-            throw new IllegalArgumentException("Kernel size is " + values.length +
-                    " vs. " + KERNEL_SIZE);
-        }
-        System.arraycopy(values, 0, mKernel, 0, KERNEL_SIZE);
-        mColorAdjust = colorAdj;
-    }
-
-    /**
-     * Sets the size of the texture.  This is used to find adjacent texels when filtering.
-     */
-    public void setTexSize(int width, int height) {
-        float rw = 1.0f / width;
-        float rh = 1.0f / height;
-
-        // Don't need to create a new array here, but it's syntactically convenient.
-        mTexOffset = new float[] {
-                -rw, -rh,   0f, -rh,    rw, -rh,
-                -rw, 0f,    0f, 0f,     rw, 0f,
-                -rw, rh,    0f, rh,     rw, rh
-        };
-        //if (DBG) Log.d(TAG, "filt size: " + width + "x" + height + ": " + Arrays.toString(mTexOffset));
-    }
-
-    /**
-     * Issues the draw call.  Does the full setup on every call.
-     *
-     * @param mvpMatrix The 4x4 projection matrix.
-     * @param vertexBuffer Buffer with vertex position data.
-     * @param firstVertex Index of first vertex to use in vertexBuffer.
-     * @param vertexCount Number of vertices in vertexBuffer.
-     * @param coordsPerVertex The number of coordinates per vertex (e.g. x,y is 2).
-     * @param vertexStride Width, in bytes, of the position data for each vertex (often
-     *        vertexCount * sizeof(float)).
-     * @param texMatrix A 4x4 transformation matrix for texture coords.  (Primarily intended
-     *        for use with SurfaceTexture.)
-     * @param texBuffer Buffer with vertex texture data.
-     * @param texStride Width, in bytes, of the texture data for each vertex.
-     */
-    public void draw(float[] mvpMatrix, FloatBuffer vertexBuffer, int firstVertex,
-                     int vertexCount, int coordsPerVertex, int vertexStride,
-                     float[] texMatrix, FloatBuffer texBuffer, int textureId, int texStride) {
-        GlUtil.checkGlError("draw start");
-
-        // Select the program.
-        GLES20.glUseProgram(mProgramHandle);
-        GlUtil.checkGlError("glUseProgram");
-
-        // Set the texture.
-        GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-        GLES20.glBindTexture(mTextureTarget, textureId);
-
-        // Copy the model / view / projection matrix over.
-        GLES20.glUniformMatrix4fv(muMVPMatrixLoc, 1, false, mvpMatrix, 0);
-        GlUtil.checkGlError("glUniformMatrix4fv");
-
-        // Copy the texture transformation matrix over.
-        GLES20.glUniformMatrix4fv(muTexMatrixLoc, 1, false, texMatrix, 0);
-        GlUtil.checkGlError("glUniformMatrix4fv");
-
-        // Enable the "aPosition" vertex attribute.
-        GLES20.glEnableVertexAttribArray(maPositionLoc);
-        GlUtil.checkGlError("glEnableVertexAttribArray");
-
-        // Connect vertexBuffer to "aPosition".
-        GLES20.glVertexAttribPointer(maPositionLoc, coordsPerVertex,
-                GLES20.GL_FLOAT, false, vertexStride, vertexBuffer);
-        GlUtil.checkGlError("glVertexAttribPointer");
-
-        // Enable the "aTextureCoord" vertex attribute.
-        GLES20.glEnableVertexAttribArray(maTextureCoordLoc);
-        GlUtil.checkGlError("glEnableVertexAttribArray");
-
-        // Connect texBuffer to "aTextureCoord".
-        GLES20.glVertexAttribPointer(maTextureCoordLoc, 2,
-                GLES20.GL_FLOAT, false, texStride, texBuffer);
-        GlUtil.checkGlError("glVertexAttribPointer");
-
-        // Populate the convolution kernel, if present.
-        if (muKernelLoc >= 0) {
-            GLES20.glUniform1fv(muKernelLoc, KERNEL_SIZE, mKernel, 0);
-            GLES20.glUniform2fv(muTexOffsetLoc, KERNEL_SIZE, mTexOffset, 0);
-            GLES20.glUniform1f(muColorAdjustLoc, mColorAdjust);
-        }
-
-        // Draw the rect.
-        GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, firstVertex, vertexCount);
-        GlUtil.checkGlError("glDrawArrays");
-
-        // Done -- disable vertex array, texture, and program.
-        GLES20.glDisableVertexAttribArray(maPositionLoc);
-        GLES20.glDisableVertexAttribArray(maTextureCoordLoc);
-        GLES20.glBindTexture(mTextureTarget, 0);
-        GLES20.glUseProgram(0);
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/WindowSurface.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/WindowSurface.java
deleted file mode 100644
index 573d2af..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/gles/WindowSurface.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright 2014 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cards.pay.paycardsrecognizer.sdk.camera.gles;
-
-import android.graphics.Bitmap;
-import android.opengl.GLES20;
-import android.support.annotation.RestrictTo;
-import android.util.Log;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLSurface;
-
-/**
- * Recordable EGL window surface.
- * <p>
- * It's good practice to explicitly release() the surface, preferably from a "finally" block.
- */
-@RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class WindowSurface {
-    protected static final String TAG = GlUtil.TAG;
-    private static final boolean DBG = GlUtil.DBG;
-    // EglCore object we're associated with.  It may be associated with multiple surfaces.
-    protected EglCore mEglCore;
-    private Surface mSurface;
-    private boolean mReleaseSurface;
-    private EGLSurface mEGLSurface = null;
-    private int mWidth = -1;
-    private int mHeight = -1;
-
-    /**
-     * Associates an EGL surface with the native window surface.
-     * <p>
-     * Set releaseSurface to true if you want the Surface to be released when release() is
-     * called.  This is convenient, but can interfere with framework classes that expect to
-     * manage the Surface themselves (e.g. if you release a SurfaceView's Surface, the
-     * surfaceDestroyed() callback won't fire).
-     */
-    public WindowSurface(EglCore eglCore, SurfaceHolder surfaceHolder, boolean releaseSurface) {
-        mEglCore = eglCore;
-        createWindowSurface(surfaceHolder);
-        mSurface = surfaceHolder.getSurface();
-        mReleaseSurface = releaseSurface;
-    }
-
-    /**
-     * Releases any resources associated with the EGL surface (and, if configured to do so,
-     * with the Surface as well).
-     * <p>
-     * Does not require that the surface's EGL context be current.
-     */
-    public void release() {
-        releaseEglSurface();
-        if (mSurface != null) {
-            if (mReleaseSurface) {
-                mSurface.release();
-            }
-            mSurface = null;
-        }
-    }
-
-    /**
-     * Creates a window surface.
-     * <p>
-     * @param surface May be a Surface or SurfaceTexture.
-     */
-    public void createWindowSurface(Object surface) {
-        if (mEGLSurface != null) {
-            throw new IllegalStateException("surface already created");
-        }
-        mEGLSurface = mEglCore.createWindowSurface(surface);
-
-        // Don't cache width/height here, because the size of the underlying surface can change
-        // out from under us (see e.g. HardwareScalerActivity).
-        //mWidth = mEglCore.querySurface(mEGLSurface, EGL14.EGL_WIDTH);
-        //mHeight = mEglCore.querySurface(mEGLSurface, EGL14.EGL_HEIGHT);
-    }
-
-    /**
-     * Returns the surface's width, in pixels.
-     * <p>
-     * If this is called on a window surface, and the underlying surface is in the process
-     * of changing size, we may not see the new size right away (e.g. in the "surfaceChanged"
-     * callback).  The size should match after the next buffer swap.
-     */
-    public int getWidth() {
-        if (mWidth < 0) {
-            return mEglCore.querySurface(mEGLSurface, EGL10.EGL_WIDTH);
-        } else {
-            return mWidth;
-        }
-    }
-
-    /**
-     * Returns the surface's height, in pixels.
-     */
-    public int getHeight() {
-        if (mHeight < 0) {
-            return mEglCore.querySurface(mEGLSurface, EGL10.EGL_HEIGHT);
-        } else {
-            return mHeight;
-        }
-    }
-
-    /**
-     * Release the EGL surface.
-     */
-    public void releaseEglSurface() {
-        mEglCore.releaseSurface(mEGLSurface);
-        mEGLSurface = null;
-        mWidth = mHeight = -1;
-    }
-
-    /**
-     * Makes our EGL context and surface current.
-     */
-    public void makeCurrent() {
-        mEglCore.makeCurrent(mEGLSurface);
-    }
-
-    /**
-     * Calls eglSwapBuffers.  Use this to "publish" the current frame.
-     *
-     * @return false on failure
-     */
-    public boolean swapBuffers() {
-        boolean result = mEglCore.swapBuffers(mEGLSurface);
-        if (!result) {
-            Log.d(TAG, "WARNING: swapBuffers() failed");
-        }
-        return result;
-    }
-
-    /**
-     * Saves the EGL surface to a file.
-     * <p>
-     * Expects that this object's EGL surface is current.
-     */
-    public void saveFrame(File file) throws IOException {
-        if (!mEglCore.isCurrent(mEGLSurface)) {
-            throw new RuntimeException("Expected EGL context/surface is not current");
-        }
-
-        // glReadPixels fills in a "direct" ByteBuffer with what is essentially big-endian RGBA
-        // data (i.e. a byte of red, followed by a byte of green...).  While the Bitmap
-        // constructor that takes an int[] wants little-endian ARGB (blue/red swapped), the
-        // Bitmap "copy pixels" method wants the same format GL provides.
-        //
-        // Ideally we'd have some way to re-use the ByteBuffer, especially if we're calling
-        // here often.
-        //
-        // Making this even more interesting is the upside-down nature of GL, which means
-        // our output will look upside down relative to what appears on screen if the
-        // typical GL conventions are used.
-
-        String filename = file.toString();
-
-        int width = getWidth();
-        int height = getHeight();
-        ByteBuffer buf = ByteBuffer.allocateDirect(width * height * 4);
-        buf.order(ByteOrder.LITTLE_ENDIAN);
-        GLES20.glReadPixels(0, 0, width, height,
-                GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);
-        GlUtil.checkGlError("glReadPixels");
-        buf.rewind();
-
-        BufferedOutputStream bos = null;
-        try {
-            bos = new BufferedOutputStream(new FileOutputStream(filename));
-            Bitmap bmp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-            bmp.copyPixelsFromBuffer(buf);
-            bmp.compress(Bitmap.CompressFormat.PNG, 90, bos);
-            bmp.recycle();
-        } finally {
-            if (bos != null) bos.close();
-        }
-        if (DBG) Log.d(TAG, "Saved " + width + "x" + height + " frame as '" + filename + "'");
-    }
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CameraPreviewLayout.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CameraPreviewLayout.java
index 7ef2b60..fc76d4e 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CameraPreviewLayout.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CameraPreviewLayout.java
@@ -4,28 +4,28 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
-import android.support.annotation.RestrictTo;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Gravity;
-import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.annotation.RestrictTo;
+import androidx.camera.view.PreviewView;
+import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
+
 import cards.pay.paycardsrecognizer.sdk.R;
 import cards.pay.paycardsrecognizer.sdk.utils.Constants;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
-public final class CameraPreviewLayout extends FrameLayout {
+public class CameraPreviewLayout extends FrameLayout {
 
     private static final String TAG = "CameraPreviewLayout";
     private static final boolean DBG = Constants.DEBUG;
 
-    private SurfaceView mSurfaceView;
-
+    private PreviewView mPreviewView;
     private CardDetectionStateView mDetectionStateOverlay;
 
     private OnWindowFocusChangedListener mWindowFocusChangedListener;
@@ -35,7 +35,6 @@ public final class CameraPreviewLayout extends FrameLayout {
     /**
      * These are used for computing child frames based on their gravity.
      */
-    private final Rect mTmpCard = new Rect();
     private final Rect mTmp = new Rect();
 
     public CameraPreviewLayout(Context context) {
@@ -51,8 +50,8 @@ public CameraPreviewLayout(Context context, AttributeSet attrs, int defStyleAttr
         mCardFrame = new CardRectCoordsMapper();
     }
 
-    public SurfaceView getSurfaceView() {
-        return mSurfaceView;
+    public PreviewView getPreviewView() {
+        return mPreviewView;
     }
 
     public CardDetectionStateView getDetectionStateOverlay() {
@@ -67,7 +66,8 @@ public void setCameraParameters(int previewSizeWidth,
                                     int previewSizeHeight,
                                     int rotation,
                                     Rect cardFrame) {
-        if (DBG) Log.d(TAG, "setCameraParameters() called with: " +  "previewSizeWidth = [" + previewSizeWidth + "], previewSizeHeight = [" + previewSizeHeight + "], rotation = [" + rotation + "], cardFrame = [" + cardFrame + "]");
+        if (DBG)
+            Log.d(TAG, "setCameraParameters() called with: " + "previewSizeWidth = [" + previewSizeWidth + "], previewSizeHeight = [" + previewSizeHeight + "], rotation = [" + rotation + "], cardFrame = [" + cardFrame + "]");
         mDetectionStateOverlay.setCameraParameters(previewSizeWidth, previewSizeHeight, rotation, cardFrame);
 
         boolean changed = mCardFrame.setCameraParameters(previewSizeWidth, previewSizeHeight, rotation, cardFrame);
@@ -85,7 +85,7 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        mSurfaceView = (SurfaceView) getChildAt(0);
+        mPreviewView = (PreviewView) getChildAt(0);
         mDetectionStateOverlay = (CardDetectionStateView) getChildAt(1);
     }
 
@@ -116,10 +116,11 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 
         for (int i = 0; i < count; i++) {
             final View child = getChildAt(i);
-            final LayoutParams lp = (LayoutParams) child.getLayoutParams();
+            final CameraPreviewLayout.LayoutParams lp = (CameraPreviewLayout.LayoutParams) child.getLayoutParams();
 
             if (child.getVisibility() == GONE
-                    || lp.cardGravity == LayoutParams.UNSPECIFIED_CARD_GRAVITY) continue;
+                    || lp.cardGravity == CameraPreviewLayout.LayoutParams.UNSPECIFIED_CARD_GRAVITY)
+                continue;
 
             final int layoutDirection = ViewCompat.getLayoutDirection(this);
             final int childWidth = child.getMeasuredWidth();
@@ -131,10 +132,9 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
         }
     }
 
-
     @SuppressLint("RtlHardcoded")
     private void getChildRect(int layoutDirection,
-                              Rect cardRect, Rect out, LayoutParams lp, int childWidth, int childHeight) {
+                              Rect cardRect, Rect out, CameraPreviewLayout.LayoutParams lp, int childWidth, int childHeight) {
         final int absCardGravity = GravityCompat.getAbsoluteGravity(
                 resolveGravity(lp.cardGravity),
                 layoutDirection);
@@ -146,29 +146,27 @@ private void getChildRect(int layoutDirection,
         int top;
 
         switch (cardHgrav) {
-            default:
-            case Gravity.LEFT:
-                left = cardRect.left + lp.leftMargin;
-                break;
             case Gravity.RIGHT:
-                left = cardRect.right  - childWidth - lp.rightMargin;
+                left = cardRect.right - childWidth - lp.rightMargin;
                 break;
             case Gravity.CENTER_HORIZONTAL:
                 left = cardRect.left + cardRect.width() / 2 - childWidth / 2 + lp.leftMargin - lp.rightMargin;
                 break;
+            default:
+                left = cardRect.left + lp.leftMargin;
+                break;
         }
 
         switch (cardVgrav) {
-            default:
-            case Gravity.TOP:
-                top = cardRect.top - childHeight - lp.bottomMargin;
-                break;
             case Gravity.BOTTOM:
                 top = cardRect.bottom + lp.topMargin;
                 break;
             case Gravity.CENTER_VERTICAL:
                 top = cardRect.top + cardRect.height() / 2 - childHeight / 2 + lp.topMargin - lp.bottomMargin;
                 break;
+            default:
+                top = cardRect.top - childHeight - lp.bottomMargin;
+                break;
         }
 
         out.set(left, top, left + childWidth, top + childHeight);
@@ -184,7 +182,7 @@ private static int resolveGravity(int gravity) {
         return gravity;
     }
 
-    private void constrainChildRect(LayoutParams lp, Rect out, int childWidth, int childHeight) {
+    private void constrainChildRect(CameraPreviewLayout.LayoutParams lp, Rect out, int childWidth, int childHeight) {
         final int width = getWidth();
         final int height = getHeight();
 
@@ -200,13 +198,13 @@ private void constrainChildRect(LayoutParams lp, Rect out, int childWidth, int c
     }
 
     @Override
-    public LayoutParams generateLayoutParams(AttributeSet attrs) {
+    public CameraPreviewLayout.LayoutParams generateLayoutParams(AttributeSet attrs) {
         return new CameraPreviewLayout.LayoutParams(getContext(), attrs);
     }
 
     @Override
-    protected LayoutParams generateDefaultLayoutParams() {
-        return new CameraPreviewLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+    protected CameraPreviewLayout.LayoutParams generateDefaultLayoutParams() {
+        return new CameraPreviewLayout.LayoutParams(CameraPreviewLayout.LayoutParams.MATCH_PARENT, CameraPreviewLayout.LayoutParams.MATCH_PARENT);
     }
 
     @Override
@@ -219,8 +217,6 @@ protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
         return p instanceof CameraPreviewLayout.LayoutParams;
     }
 
-
-
     public static class LayoutParams extends FrameLayout.LayoutParams {
         public static final int UNSPECIFIED_CARD_GRAVITY = -1;
 
@@ -231,18 +227,24 @@ public static class LayoutParams extends FrameLayout.LayoutParams {
         public int cardGravity = UNSPECIFIED_CARD_GRAVITY;
 
 
+        @SuppressLint("CustomViewStyleable")
         public LayoutParams(Context c, AttributeSet attrs) {
             super(c, attrs);
 
             // Pull the layout param values from the layout XML during
             // inflation.  This is not needed if you don't care about
             // changing the layout behavior in XML.
-            @SuppressLint("CustomViewStyleable")
-            TypedArray a = c.obtainStyledAttributes(attrs, R.styleable.wocr_CameraPreviewLayout_Layout);
-            if (a.hasValue(R.styleable.wocr_CameraPreviewLayout_Layout_wocr_layout_cardAlignGravity)) {
-                cardGravity = a.getInt(R.styleable.wocr_CameraPreviewLayout_Layout_wocr_layout_cardAlignGravity, Gravity.CENTER);
+            TypedArray a = null;
+            try {
+                a = c.obtainStyledAttributes(attrs, R.styleable.wocr_CameraPreviewLayout_Layout);
+                if (a.hasValue(R.styleable.wocr_CameraPreviewLayout_Layout_wocr_layout_cardAlignGravity)) {
+                    cardGravity = a.getInt(R.styleable.wocr_CameraPreviewLayout_Layout_wocr_layout_cardAlignGravity, Gravity.CENTER);
+                }
+            } finally {
+                if (a != null) {
+                    a.recycle();
+                }
             }
-            a.recycle();
         }
 
         public LayoutParams(int width, int height) {
@@ -253,4 +255,4 @@ public LayoutParams(ViewGroup.LayoutParams source) {
             super(source);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CardDetectionStateView.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CardDetectionStateView.java
index 0089d08..e667363 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CardDetectionStateView.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CardDetectionStateView.java
@@ -15,6 +15,9 @@
 import android.util.Log;
 import android.view.View;
 
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+
 import cards.pay.paycardsrecognizer.sdk.R;
 import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants;
 import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionResult;
@@ -97,14 +100,14 @@ private void init(final Context context) {
 
         mCardFrame = new CardRectCoordsMapper();
 
-        int mBackgroundDrawableColor = context.getResources().getColor(R.color.wocr_card_shadow_color);
+        int mBackgroundDrawableColor = ContextCompat.getColor(context, R.color.wocr_card_shadow_color);
 
         mCornerPaddingTop = density * RECT_CORNER_PADDING_TOP;
         mCornerPaddingLeft = density * RECT_CORNER_PADDING_LEFT;
         mCornerLineWidth = density * RECT_CORNER_LINE_STROKE_WIDTH;
         mCornerRadius = density * RECT_CORNER_RADIUS;
 
-        mCardGradientDrawable = context.getResources().getDrawable(R.drawable.wocr_frame_rect_gradient);
+        mCardGradientDrawable = ContextCompat.getDrawable(context, R.drawable.wocr_frame_rect_gradient);
 
         initCornerDrawables(context);
         initLineDrawables(context);
@@ -135,8 +138,15 @@ private Paint createCardTextPaint() {
     }
 
     private void initCornerDrawables(Context context) {
-        mCornerTopLeftDrawable = (BitmapDrawable) context.getResources().getDrawable(R.drawable.wocr_card_frame_rect_corner_top_left);
+        BitmapDrawable tempDrawable = (BitmapDrawable) ContextCompat.getDrawable(context, R.drawable.wocr_card_frame_rect_corner_top_left);
+        if (tempDrawable == null) {
+            return;
+        }
 
+        Drawable mutatedDrawable = DrawableCompat.wrap(tempDrawable).mutate();
+        int color = ContextCompat.getColor(getContext(), android.R.color.holo_purple);
+        DrawableCompat.setTint(mutatedDrawable, color);
+        mCornerTopLeftDrawable = (BitmapDrawable) mutatedDrawable;
         Matrix m = new Matrix();
         Bitmap bitmap = mCornerTopLeftDrawable.getBitmap();
 
@@ -155,7 +165,7 @@ private void initCornerDrawables(Context context) {
     }
 
     private void initLineDrawables(Context context) {
-        mLineTopDrawable = (BitmapDrawable) context.getResources().getDrawable(R.drawable.wocr_card_frame_rect_line_top);
+        mLineTopDrawable = (BitmapDrawable) ContextCompat.getDrawable(context, R.drawable.wocr_card_frame_rect_line_top);
         Matrix m = new Matrix();
         Bitmap bitmap = mLineTopDrawable.getBitmap();
 
@@ -258,7 +268,7 @@ private void refreshCardRectCoords() {
 
     private void refreshCardRectInvalidation() {
         Rect cardRect = mCardFrame.getCardRect();
-        int border = (int)(0.5f + mCornerPaddingLeft) + (int)(0.5f + mCornerLineWidth / 2f);
+        int border = (int) (0.5f + mCornerPaddingLeft) + (int) (0.5f + mCornerLineWidth / 2f);
         mCardRectInvalidation.left = cardRect.left - border;
         mCardRectInvalidation.top = cardRect.top - border;
         mCardRectInvalidation.right = cardRect.right + border;
@@ -271,7 +281,7 @@ private void refreshDrawableBounds() {
 
         int rectWidth = mCornerTopLeftDrawable.getIntrinsicWidth();
         int rectHeight = mCornerTopLeftDrawable.getIntrinsicHeight();
-        int cornerStroke = (int)(0.5f + mCornerLineWidth / 2f);
+        int cornerStroke = (int) (0.5f + mCornerLineWidth / 2f);
 
         int left1 = Math.round(cardRect.left - mCornerPaddingLeft - cornerStroke);
         int left2 = Math.round(cardRect.right - rectWidth + mCornerPaddingLeft + cornerStroke);
@@ -285,7 +295,7 @@ private void refreshDrawableBounds() {
         mCornerBottomRightDrawable.setBounds(left2, top2, left2 + rectWidth, top2 + rectHeight);
 
         // Lines
-        int offset = (int)mCornerRadius;
+        int offset = (int) mCornerRadius;
         mLineTopDrawable.setBounds(
                 left1 + offset,
                 top1,
@@ -320,12 +330,12 @@ public synchronized void setDetectionState(final int detectionState) {
                     mCardRectInvalidation.top,
                     mCardRectInvalidation.right,
                     mCardRectInvalidation.bottom
-                    );
+            );
         }
     }
 
     public synchronized void setRecognitionResult(RecognitionResult result) {
-        if (DBG) Log.d(TAG, "setRecognitionResult() called with: " +  "result = [" + result + "]");
+        if (DBG) Log.d(TAG, "setRecognitionResult() called with: " + "result = [" + result + "]");
 
         if (!TextUtils.isEmpty(result.getNumber())) {
             mRecognitionResultCardNumber = CardUtils.prettyPrintCardNumber(result.getNumber());
@@ -349,9 +359,9 @@ public synchronized void setRecognitionResult(RecognitionResult result) {
     }
 
     void setCameraParameters(int previewSizeWidth,
-                                    int previewSizeHeight,
-                                    int rotation,
-                                    Rect cardFrame) {
+                             int previewSizeHeight,
+                             int rotation,
+                             Rect cardFrame) {
         boolean changed = mCardFrame.setCameraParameters(previewSizeWidth, previewSizeHeight, rotation, cardFrame);
         if (changed) {
             refreshCardRectCoords();
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CardRectCoordsMapper.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CardRectCoordsMapper.java
index 3288a91..8bf9cfa 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CardRectCoordsMapper.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/camera/widget/CardRectCoordsMapper.java
@@ -17,11 +17,11 @@ class CardRectCoordsMapper {
 
     private static final Rect DEFAULT_CAMERA_RECT_LANDSCAPE = new Rect(310, 152, 970, 568);
 
-    private static final PointF DEFAULT_CARD_NUMBER_POS = new PointF(60f,268f);
+    private static final PointF DEFAULT_CARD_NUMBER_POS = new PointF(60f, 268f);
 
-    private static final PointF DEFAULT_CARD_DATE_POS = new PointF(289f,321f);
+    private static final PointF DEFAULT_CARD_DATE_POS = new PointF(289f, 321f);
 
-    private static final PointF DEFAULT_CARD_HOLDER_POS = new PointF(33f,364f);
+    private static final PointF DEFAULT_CARD_HOLDER_POS = new PointF(33f, 364f);
 
     private static final float DEFAULT_CARD_NUMBER_FONT_SIZE = 40;
 
@@ -41,7 +41,7 @@ class CardRectCoordsMapper {
     /**
      * Camera resolution
      */
-    private final int mCameraPreviewSize[] = new int[]{DEFAULT_CAMERA_RESOLUTION[0], DEFAULT_CAMERA_RESOLUTION[1]};
+    private final int[] mCameraPreviewSize = new int[]{DEFAULT_CAMERA_RESOLUTION[0], DEFAULT_CAMERA_RESOLUTION[1]};
 
     /**
      * Camera rotation
@@ -185,7 +185,7 @@ private void refreshTransform() {
         OrientationHelper.rotateRect(mCardCameraRectRaw, mCameraPreviewSize[0], mCameraPreviewSize[1], mCameraRotation, mCardCameraRect);
 
         if (DBG) Log.d(TAG, "refreshTransform() widthXheight: " + mViewWidth + "x" + mViewHeight
-                +"; translateXY: [" + translateX +"," + mTranslateY + "], scale: " + mScale);
+                + "; translateXY: [" + translateX + "," + mTranslateY + "], scale: " + mScale);
     }
 
     private void refreshCardRect() {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfiguration.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfiguration.java
index 27dd25b..7dced78 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfiguration.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfiguration.java
@@ -1,6 +1,6 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
 
 import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.WorkAreaOrientation;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfigurationImpl.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfigurationImpl.java
index 38809f2..28c0913 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfigurationImpl.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayConfigurationImpl.java
@@ -1,12 +1,16 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.VisibleForTesting;
+
 import android.util.Log;
 import android.view.Display;
 
 import cards.pay.paycardsrecognizer.sdk.BuildConfig;
+import cards.pay.paycardsrecognizer.sdk.camera.OrientationHelper;
 import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.WorkAreaOrientation;
 
 import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.WORK_AREA_ORIENTATION_LANDSCAPE_LEFT;
@@ -30,7 +34,7 @@ public class DisplayConfigurationImpl implements DisplayConfiguration {
 
     // The orientation of the camera image. The value is the angle that the camera image needs
     // to be rotated clockwise so it shows correctly on the display in its natural orientation.
-    private int mCameraSensorRotation  = 0;
+    private int mCameraSensorRotation = 0;
 
     private int mPreprocessFrameRotation = 0;
 
@@ -38,9 +42,7 @@ public DisplayConfigurationImpl() {
     }
 
     public void setDisplayParameters(Display display) {
-        setDisplayParameters(DisplayHelper.getDisplayRotationDegrees(display),
-                DisplayHelper.naturalOrientationIsLandscape(display)
-                );
+        setDisplayParameters(OrientationHelper.getDisplayRotationDegrees(display), OrientationHelper.naturalOrientationIsLandscape(display));
     }
 
     @VisibleForTesting
@@ -48,8 +50,8 @@ void setDisplayParameters(int displayRotation, boolean naturalOrientationIsLands
         mDisplayRotation = displayRotation;
         mNaturalOrientationIsLandscape = naturalOrientationIsLandscape;
         if (DBG) Log.d(TAG, "setDisplayParameters() called with: "
-                +  "rotation: "+ mDisplayRotation
-                +  "; natural orientation: " + (mNaturalOrientationIsLandscape ? "landscape" : "portait (or square)"));
+                + "rotation: " + mDisplayRotation
+                + "; natural orientation: " + (mNaturalOrientationIsLandscape ? "landscape" : "portait (or square)"));
         refreshPreprocessFrameRotation();
     }
 
@@ -60,7 +62,8 @@ void setDisplayRotation(int displayRotation) {
     }
 
     public void setCameraParameters(int sensorRotation) {
-        if (DBG) Log.d(TAG, "setCameraParameters() called with: " +  "sensorRotation = [" + sensorRotation + "]");
+        if (DBG)
+            Log.d(TAG, "setCameraParameters() called with: " + "sensorRotation = [" + sensorRotation + "]");
         mCameraSensorRotation = sensorRotation;
         refreshPreprocessFrameRotation();
     }
@@ -88,7 +91,7 @@ public int getNativeDisplayRotation() {
     }
 
     private void refreshPreprocessFrameRotation() {
-        int rotation = DisplayHelper.getCameraRotationToNatural(mDisplayRotation, mCameraSensorRotation, false);
+        int rotation = OrientationHelper.getCameraRotationToNatural(mDisplayRotation, mCameraSensorRotation, false);
 
         int nativeDisplayRotation = getNativeDisplayRotation();
         if (nativeDisplayRotation == WORK_AREA_ORIENTATION_LANDSCAPE_RIGHT
@@ -96,7 +99,8 @@ private void refreshPreprocessFrameRotation() {
             rotation = (360 + rotation - 90) % 360;
         }
         mPreprocessFrameRotation = rotation;
-        if (DBG) Log.v(TAG, "refreshPreprocessFrameRotation() rotation result: " + mPreprocessFrameRotation);
+        if (DBG)
+            Log.v(TAG, "refreshPreprocessFrameRotation() rotation result: " + mPreprocessFrameRotation);
     }
 
     @SuppressLint("Range")
@@ -125,6 +129,7 @@ private boolean sanityCheckPreprocessFrameRotation(int frameWidth, int frameHeig
         return true;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "DisplayConfigurationImpl{" +
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayHelper.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayHelper.java
deleted file mode 100644
index 12028d4..0000000
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/DisplayHelper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package cards.pay.paycardsrecognizer.sdk.ndk;
-
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Display;
-import android.view.Surface;
-
-import cards.pay.paycardsrecognizer.sdk.BuildConfig;
-
-final class DisplayHelper {
-
-    private static final boolean DBG = BuildConfig.DEBUG;
-    private static final String TAG = "DisplayHelper";
-
-    private DisplayHelper() {}
-
-    /**
-     * Returns the rotation of the screen with the rotation of the camera from its "natural" orientation.
-     * @param displayRotation {@link Display#getRotation()} in degrees
-     * @param cameraOrientation {@link android.hardware.Camera.CameraInfo#orientation} in degrees
-     */
-    // http://developer.android.com/intl/ru/reference/android/hardware/Camera.html#setDisplayOrientation%28int%29
-    public static int getCameraRotationToNatural(int displayRotation, int cameraOrientation, boolean compensateMirror) {
-        if (DBG) Log.d(TAG, "getCameraRotationToNatural() called with: " +  "displayRotation = [" + displayRotation + "], cameraOrientation = [" + cameraOrientation + "], compensateMirror = [" + compensateMirror + "]");
-        int result = 0;
-        if (compensateMirror) {
-            result = (cameraOrientation + displayRotation) % 360;
-            result = (360 - result) % 360;	// compensate the mirror
-        } else {
-            result = (cameraOrientation - displayRotation + 360) % 360;
-        }
-        return result;
-    }
-
-    public static int getDisplayRotationDegrees(int surfaceRotationVal) {
-        switch (surfaceRotationVal) {
-            case Surface.ROTATION_0: return 0;
-            case Surface.ROTATION_90: return 90;
-            case Surface.ROTATION_180: return 180;
-            case Surface.ROTATION_270: return 270;
-            default: throw new IllegalArgumentException();
-        }
-    }
-
-    public static int getDisplayRotationDegrees(Display display) {return getDisplayRotationDegrees(display.getRotation());}
-
-    public static boolean naturalOrientationIsLandscape(Display display) {
-        int rotation = display.getRotation();
-
-        DisplayMetrics dm = new DisplayMetrics();
-        display.getMetrics(dm);
-
-        switch (rotation) {
-            case Surface.ROTATION_0:
-            case Surface.ROTATION_180:
-                return dm.widthPixels > dm.heightPixels;
-            case Surface.ROTATION_270:
-            case Surface.ROTATION_90:
-            default:
-                return dm.heightPixels > dm.widthPixels;
-        }
-    }
-
-
-}
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionConstants.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionConstants.java
index 35f7a0f..baa4d4f 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionConstants.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionConstants.java
@@ -1,7 +1,8 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.IntDef;
+import androidx.annotation.RestrictTo;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCore.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCore.java
index 5f7e343..cd073ad 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCore.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCore.java
@@ -2,16 +2,12 @@
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
-import android.view.Display;
 
 import java.io.IOException;
 
-@RestrictTo(RestrictTo.Scope.LIBRARY)
 public final class RecognitionCore {
 
     private static volatile RecognitionCore sInstance;
@@ -78,7 +74,7 @@ public Rect getCardFrameRect() {
     }
 
     @RecognitionConstants.DetectedBorderFlags
-    public int processFrameYV12(int width, int height, byte buffer[]) {
+    public int processFrameYV12(int width, int height, byte[] buffer) {
         return sImpl.processFrameYV12(width, height, buffer);
     }
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreDummy.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreDummy.java
index a9b40f8..19a4f67 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreDummy.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreDummy.java
@@ -1,9 +1,8 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.Display;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 class RecognitionCoreDummy implements RecognitionCoreImpl {
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreImpl.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreImpl.java
index b4c8d90..183b861 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreImpl.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreImpl.java
@@ -1,10 +1,9 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.view.Display;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public interface RecognitionCoreImpl {
@@ -22,7 +21,7 @@ public interface RecognitionCoreImpl {
     Rect getCardFrameRect();
 
     @RecognitionConstants.DetectedBorderFlags
-    int processFrameYV12(int width, int height, byte buffer[]);
+    int processFrameYV12(int width, int height, byte[] buffer);
 
     void resetResult();
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreNdk.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreNdk.java
index 7fcfbf4..6b92849 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreNdk.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionCoreNdk.java
@@ -7,12 +7,13 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
 import android.util.Log;
-import android.view.Display;
 
 import java.io.IOException;
 
@@ -42,7 +43,7 @@ public static RecognitionCoreNdk getInstance(Context context) {
 
     private final Handler mMainThreadHandler;
 
-    private final Rect mCardFrameRect = new Rect(30, 432, 30+660, 432 + 416);
+    private final Rect mCardFrameRect = new Rect(30, 432, 30 + 660, 432 + 416);
 
     private DisplayConfiguration mDisplayConfiguration = new DisplayConfigurationImpl();
 
@@ -62,25 +63,24 @@ private RecognitionCoreNdk(Context appContext) {
             Log.e("CardRecognizerCore", "initialization failed", e);
         }
 
-        mMainThreadHandler = new Handler(Looper.getMainLooper(), new Handler.Callback() {
-            @Override
-            public boolean handleMessage(Message msg) {
-                switch (msg.what) {
-                    case MESSAGE_RESULT_RECEIVED:
-                        if (mStatusListener != null) {
-                            RecognitionResult result = (RecognitionResult)msg.obj;
-                            mStatusListener.onRecognitionComplete(result);
-                        }
-                        return true;
-                    case MESSAGE_CARD_IMAGE_RECEIVED:
-                        if (mStatusListener != null) {
-                            Bitmap bitmap = (Bitmap)msg.obj;
-                            mStatusListener.onCardImageReceived(bitmap);
-                        }
-                        return true;
+        mMainThreadHandler = new Handler(Looper.getMainLooper(), msg -> {
+            switch (msg.what) {
+                case MESSAGE_RESULT_RECEIVED: {
+                    if (mStatusListener != null) {
+                        RecognitionResult result = (RecognitionResult) msg.obj;
+                        mStatusListener.onRecognitionComplete(result);
+                    }
+                    return true;
+                }
+                case MESSAGE_CARD_IMAGE_RECEIVED: {
+                    if (mStatusListener != null) {
+                        Bitmap bitmap = (Bitmap) msg.obj;
+                        mStatusListener.onCardImageReceived(bitmap);
+                    }
+                    return true;
                 }
-                return false;
             }
+            return false;
         });
     }
 
@@ -111,10 +111,8 @@ public void stop() {
 
         @Override
         public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MESSAGE_TORCH_STATUS_CHANGED:
-                    mListener.onTorchStatusChanged(msg.arg1 != 0);
-                    break;
+            if (msg.what == MESSAGE_TORCH_STATUS_CHANGED) {
+                mListener.onTorchStatusChanged(msg.arg1 != 0);
             }
             super.handleMessage(msg);
         }
@@ -165,7 +163,7 @@ public Rect getCardFrameRect() {
     }
 
     @DetectedBorderFlags
-    public synchronized int processFrameYV12(int width, int height, byte buffer[]) {
+    public synchronized int processFrameYV12(int width, int height, byte[] buffer) {
         int orientation = mDisplayConfiguration.getPreprocessFrameRotation(width, height);
         if (orientation == -1) return 0;
 
@@ -191,8 +189,8 @@ private static void onRecognitionResultReceived(
             boolean isFirst,
             boolean isFinal,
             String number, String date, String name, String nameRaw,
-                                                    Bitmap cardImage,
-                                                    int numberRectX, int numberRectY, int numberRectWidth, int numberRectHeight
+            Bitmap cardImage,
+            int numberRectX, int numberRectY, int numberRectWidth, int numberRectHeight
     ) {
         final Rect numberRect;
 
@@ -271,5 +269,5 @@ protected void finalize() throws Throwable {
     native void nativeResetResult();
 
     @DetectedBorderFlags
-    native int nativeProcessFrameYV12(int width, int height, int rotation, byte buffer[]);
+    native int nativeProcessFrameYV12(int width, int height, int rotation, byte[] buffer);
 }
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionResult.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionResult.java
index a199f80..dd06adb 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionResult.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionResult.java
@@ -4,8 +4,8 @@
 import android.graphics.Rect;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public final class RecognitionResult implements Parcelable {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionStatusListener.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionStatusListener.java
index db5d377..27dfb08 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionStatusListener.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/RecognitionStatusListener.java
@@ -2,7 +2,8 @@
 
 
 import android.graphics.Bitmap;
-import android.support.annotation.RestrictTo;
+
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public interface RecognitionStatusListener {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/TorchStatusListener.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/TorchStatusListener.java
index 707dfd4..0ba3d3e 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/TorchStatusListener.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ndk/TorchStatusListener.java
@@ -1,6 +1,6 @@
 package cards.pay.paycardsrecognizer.sdk.ndk;
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public interface TorchStatusListener {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/InitLibraryFragment.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/InitLibraryFragment.java
index c9a4ad6..8c52c15 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/InitLibraryFragment.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/InitLibraryFragment.java
@@ -1,20 +1,21 @@
 package cards.pay.paycardsrecognizer.sdk.ui;
 
 import android.Manifest;
-import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.graphics.Color;
-import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.fragment.app.Fragment;
+
 import java.lang.ref.WeakReference;
 
 import cards.pay.paycardsrecognizer.sdk.R;
@@ -24,6 +25,7 @@
 import cards.pay.paycardsrecognizer.sdk.camera.RecognitionUnavailableException;
 import cards.pay.paycardsrecognizer.sdk.camera.widget.CameraPreviewLayout;
 import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionCore;
+import cards.pay.paycardsrecognizer.sdk.utils.AsyncTaskV2;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public final class InitLibraryFragment extends Fragment {
@@ -32,8 +34,6 @@ public final class InitLibraryFragment extends Fragment {
 
     private InteractionListener mListener;
 
-    private static final int REQUEST_CAMERA_PERMISSION_CODE = 1;
-
     private View mProgressBar;
     private CameraPreviewLayout mCameraPreviewLayout;
     private ViewGroup mMainContent;
@@ -41,8 +41,25 @@ public final class InitLibraryFragment extends Fragment {
 
     private DeployCoreTask mDeployCoreTask;
 
+    private final ActivityResultLauncher<String> requestPermissionLauncher = registerForActivityResult(
+            new ActivityResultContracts.RequestPermission(),
+            new ActivityResultCallback<>() {
+                @Override
+                public void onActivityResult(Boolean result) {
+                    if (result) {
+                        // PERMISSION GRANTED
+                        subscribeToInitCore();
+                    } else {
+                        // PERMISSION NOT GRANTED
+                        if (mListener != null) mListener.onInitLibraryFailed(
+                                new RecognitionUnavailableException(RecognitionUnavailableException.ERROR_NO_CAMERA_PERMISSION));
+                    }
+                }
+            }
+    );
+
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         try {
             mListener = (InteractionListener) getActivity();
@@ -51,7 +68,7 @@ public void onAttach(Context context) {
         }
     }
 
-    @Nullable
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.wocr_fragment_scan_card, container, false);
@@ -63,62 +80,38 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         View enterManuallyButton = root.findViewById(R.id.wocr_tv_enter_card_number_id);
         enterManuallyButton.setVisibility(View.VISIBLE);
-        enterManuallyButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View clickview) {
-                if (mListener != null) mListener.onScanCardCanceled(ScanCardIntent.ADD_MANUALLY_PRESSED);
-            }
+        enterManuallyButton.setOnClickListener(clickView -> {
+            if (mListener != null)
+                mListener.onScanCardCanceled(ScanCardIntent.ADD_MANUALLY_PRESSED);
         });
         return root;
     }
 
     @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         mProgressBar.setVisibility(View.GONE);
         mMainContent.setVisibility(View.VISIBLE);
         mCameraPreviewLayout.setVisibility(View.VISIBLE);
-        mCameraPreviewLayout.getSurfaceView().setVisibility(View.GONE);
+        mCameraPreviewLayout.getPreviewView().setVisibility(View.GONE);
         mCameraPreviewLayout.setBackgroundColor(Color.BLACK);
         if (mFlashButton != null) mFlashButton.setVisibility(View.GONE);
-    }
 
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
         RecognitionAvailabilityChecker.Result checkResult = RecognitionAvailabilityChecker.doCheck(getContext());
         if (checkResult.isFailedOnCameraPermission()) {
             if (savedInstanceState == null) {
-                requestPermissions(new String[] {Manifest.permission.CAMERA}, REQUEST_CAMERA_PERMISSION_CODE);
+                requestPermissionLauncher.launch(Manifest.permission.CAMERA);
             }
         } else {
-            subscribeToInitCore(getActivity());
+            subscribeToInitCore();
         }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        switch (requestCode) {
-            case REQUEST_CAMERA_PERMISSION_CODE:
-                if (grantResults.length > 0
-                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    subscribeToInitCore(getActivity());
-                } else {
-                    if (mListener != null ) mListener.onInitLibraryFailed(
-                            new RecognitionUnavailableException(RecognitionUnavailableException.ERROR_NO_CAMERA_PERMISSION));
-                }
-                return;
-            default:
-                break;
-        }
-    }
-
-    private void subscribeToInitCore(Context context) {
+    private void subscribeToInitCore() {
         if (mProgressBar != null) mProgressBar.setVisibility(View.VISIBLE);
         if (mDeployCoreTask != null) mDeployCoreTask.cancel(false);
         mDeployCoreTask = new DeployCoreTask(this);
-        mDeployCoreTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        mDeployCoreTask.execute((Void) null);
     }
 
     @Override
@@ -145,20 +138,24 @@ public void onDetach() {
 
     public interface InteractionListener {
         void onScanCardCanceled(@ScanCardIntent.CancelReason int actionId);
+
         void onInitLibraryFailed(Throwable e);
+
         void onInitLibraryComplete();
     }
 
-    private static class DeployCoreTask extends AsyncTask<Void, Void, Throwable> {
+    private static class DeployCoreTask extends AsyncTaskV2<Void, Void, Throwable> {
 
         private final WeakReference<InitLibraryFragment> fragmentRef;
 
-        @SuppressLint("StaticFieldLeak")
-        private final Context appContext;
+        @Nullable
+        private Context appContext;
 
         DeployCoreTask(InitLibraryFragment parent) {
-            this.fragmentRef = new WeakReference<InitLibraryFragment>(parent);
-            this.appContext = parent.getContext().getApplicationContext();
+            this.fragmentRef = new WeakReference<>(parent);
+            if (parent.getContext() != null) {
+                this.appContext = parent.getContext().getApplicationContext();
+            }
         }
 
         @Override
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardActivity.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardActivity.java
index 38a0a33..9f109fb 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardActivity.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardActivity.java
@@ -3,11 +3,11 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.fragment.app.Fragment;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.WindowManager;
 
@@ -55,6 +55,7 @@ private void showInitLibrary() {
 
     private void showScanCard() {
         Fragment fragment = new ScanCardFragment();
+
         Bundle args = new Bundle(1);
         args.putParcelable(ScanCardIntent.KEY_SCAN_CARD_REQUEST, getScanRequest());
         fragment.setArguments(args);
@@ -76,7 +77,7 @@ public void onScanCardFailed(Exception e) {
 
     @Override
     @RestrictTo(RestrictTo.Scope.LIBRARY)
-    public void onScanCardFinished(Card card, @Nullable byte cardImage[]) {
+    public void onScanCardFinished(Card card, @Nullable byte[] cardImage) {
         Intent intent = new Intent();
         intent.putExtra(ScanCardIntent.RESULT_PAYCARDS_CARD, (Parcelable) card);
         if (cardImage != null) intent.putExtra(ScanCardIntent.RESULT_CARD_IMAGE, cardImage);
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardFragment.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardFragment.java
index d228546..382ffaf 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardFragment.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardFragment.java
@@ -1,73 +1,94 @@
 package cards.pay.paycardsrecognizer.sdk.ui;
 
+import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_DATE;
+import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_GRAB_CARD_IMAGE;
+import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_NAME;
+import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_NUMBER;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.hardware.Camera;
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.SoundPool;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.v4.app.Fragment;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.URLSpan;
-import android.util.Log;
+import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
+import android.view.OrientationEventListener;
+import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.Animation;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.camera.core.AspectRatio;
+import androidx.camera.core.Camera;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.Preview;
+import androidx.camera.core.TorchState;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
 import java.io.ByteArrayOutputStream;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import cards.pay.paycardsrecognizer.sdk.Card;
 import cards.pay.paycardsrecognizer.sdk.R;
 import cards.pay.paycardsrecognizer.sdk.ScanCardIntent;
-import cards.pay.paycardsrecognizer.sdk.camera.ScanManager;
+import cards.pay.paycardsrecognizer.sdk.camera.CameraUtils;
+import cards.pay.paycardsrecognizer.sdk.camera.ImageAnalyzer;
 import cards.pay.paycardsrecognizer.sdk.camera.widget.CameraPreviewLayout;
 import cards.pay.paycardsrecognizer.sdk.ndk.RecognitionResult;
 import cards.pay.paycardsrecognizer.sdk.ui.views.ProgressBarIndeterminate;
 import cards.pay.paycardsrecognizer.sdk.utils.Constants;
 
-import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_DATE;
-import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_GRAB_CARD_IMAGE;
-import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_NAME;
-import static cards.pay.paycardsrecognizer.sdk.ndk.RecognitionConstants.RECOGNIZER_MODE_NUMBER;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class ScanCardFragment extends Fragment {
-    @SuppressWarnings("unused")
-    public static final String TAG = "ScanCardFragment";
 
-    private CameraPreviewLayout mCameraPreviewLayout;
+    public static final String TAG = "ScanCardFragment";
 
-    private ProgressBarIndeterminate mProgressBar;
+    private static final float RATIO_4_3_VALUE = 4.0f / 3.0f;
+    private static final float RATIO_16_9_VALUE = 16.0f / 9.0f;
 
+    private CameraPreviewLayout mCameraPreviewLayout;
     private ViewGroup mMainContent;
-
-    @Nullable
+    private ProgressBarIndeterminate mProgressBar;
+    private PreviewView mCameraPreview;
     private View mFlashButton;
-
-    @Nullable
-    private ScanManager mScanManager;
-
-    private SoundPool mSoundPool;
-
-    private int mCapturedSoundId = -1;
-
+    private ListenableFuture<ProcessCameraProvider> mCameraProviderFuture;
+    private ProcessCameraProvider mCameraProvider;
+    private Camera mCamera;
+    private ImageAnalysis mImageAnalysis;
+    private ImageAnalyzer mImageAnalyzer;
+    private ExecutorService mCameraExecutor;
     private InteractionListener mListener;
-
     private ScanCardRequest mRequest;
+    private SoundPool mSoundPool;
+    private int mCapturedSoundId = -1;
+    private byte[] mLastCardImage = null;
+    private Boolean flashEnabled = false;
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         try {
-            mListener = (InteractionListener) getActivity();
+            mListener = (ScanCardFragment.InteractionListener) getActivity();
         } catch (ClassCastException ex) {
             throw new RuntimeException("Parent must implement " + InteractionListener.class.getSimpleName());
         }
@@ -83,75 +104,54 @@ public void onCreate(Bundle savedInstanceState) {
         if (mRequest == null) mRequest = ScanCardRequest.getDefault();
     }
 
-    @Override
-    public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
-        if (Constants.DEBUG) Log.d(TAG, "onCreateAnimation() called with: " +  "transit = [" + transit + "], enter = [" + enter + "], nextAnim = [" + nextAnim + "]");
-        // SurfaceView is hard to animate
-        Animation a = new Animation() {};
-        a.setDuration(0);
-        return a;
-    }
-
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View root =  inflater.inflate(R.layout.wocr_fragment_scan_card, container, false);
-
-        mProgressBar = root.findViewById(R.id.wocr_progress_bar);
-
-        mCameraPreviewLayout = root.findViewById(R.id.wocr_card_recognition_view);
-        mMainContent = root.findViewById(R.id.wocr_main_content);
-        mFlashButton = root.findViewById(R.id.wocr_iv_flash_id);
-
-        initView(root);
+        var root = inflater.inflate(R.layout.wocr_fragment_scan_card, container, false);
 
+        initViews(root);
+        mCameraPreviewLayout.setClipToOutline(true);
         showMainContent();
         mProgressBar.setVisibility(View.VISIBLE);
+
         return root;
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
+    public void onResume() {
+        super.onResume();
+        if (mImageAnalyzer != null) {
+            mImageAnalyzer.onResume();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mImageAnalyzer != null) mImageAnalyzer.onPause();
+    }
+
+    @SuppressLint("SourceLockedOrientationActivity")
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
 
         if (!isTablet()) {
-            getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         } else {
             mCameraPreviewLayout.setBackgroundColor(Color.BLACK);
         }
 
         int recognitionMode = RECOGNIZER_MODE_NUMBER;
-        if (mRequest.isScanCardHolderEnabled()) recognitionMode |=  RECOGNIZER_MODE_NAME;
+        if (mRequest.isScanCardHolderEnabled()) recognitionMode |= RECOGNIZER_MODE_NAME;
         if (mRequest.isScanExpirationDateEnabled()) recognitionMode |= RECOGNIZER_MODE_DATE;
         if (mRequest.isGrabCardImageEnabled()) recognitionMode |= RECOGNIZER_MODE_GRAB_CARD_IMAGE;
 
-        mScanManager = new ScanManager(recognitionMode, getActivity(), mCameraPreviewLayout, new ScanManager.Callbacks() {
-
-            private byte mLastCardImage[] = null;
-
-            @Override
-            public void onCameraOpened(Camera.Parameters cameraParameters) {
-                boolean isFlashSupported = (cameraParameters.getSupportedFlashModes() != null
-                        && !cameraParameters.getSupportedFlashModes().isEmpty());
-                if (getView() == null) return;
-                mProgressBar.hideSlow();
-                mCameraPreviewLayout.setBackgroundDrawable(null);
-                if (mFlashButton != null) mFlashButton.setVisibility(isFlashSupported ? View.VISIBLE : View.GONE);
-
-                innitSoundPool();
-            }
-
-            @Override
-            public void onOpenCameraError(Exception exception) {
-                mProgressBar.hideSlow();
-                hideMainContent();
-                finishWithError(exception);
-            }
-
+        mImageAnalyzer = new ImageAnalyzer(recognitionMode, requireActivity(), mCameraPreviewLayout, new ImageAnalyzer.Callbacks() {
             @Override
             public void onRecognitionComplete(RecognitionResult result) {
                 if (result.isFirst()) {
-                    if (mScanManager != null) mScanManager.freezeCameraPreview();
+                    mCameraProvider.unbindAll();
                     playCaptureSound();
                 }
                 if (result.isFinal()) {
@@ -159,13 +159,13 @@ public void onRecognitionComplete(RecognitionResult result) {
                     if (TextUtils.isEmpty(result.getDate())) {
                         date = null;
                     } else {
-                        date =  result.getDate().substring(0, 2) + '/' + result.getDate().substring(2);
+                        date = result.getDate().substring(0, 2) + '/' + result.getDate().substring(2);
                     }
 
                     Card card = new Card(result.getNumber(), result.getName(), date);
-                    byte cardImage[] = mLastCardImage;
+                    var cardImage = mLastCardImage;
                     mLastCardImage = null;
-                    finishWithResult(card, cardImage);
+                    new Handler(Looper.getMainLooper()).postDelayed(() -> finishWithResult(card, cardImage), 500);
                 }
             }
 
@@ -173,60 +173,40 @@ public void onRecognitionComplete(RecognitionResult result) {
             public void onCardImageReceived(Bitmap cardImage) {
                 mLastCardImage = compressCardImage(cardImage);
             }
-
-            @Override
-            public void onFpsReport(String report) {}
-
-            @Override
-            public void onAutoFocusMoving(boolean start, String cameraFocusMode) {}
-
-            @Override
-            public void onAutoFocusComplete(boolean success, String cameraFocusMode) {}
-
-            @Nullable
-            private byte[] compressCardImage(Bitmap img) {
-                byte result[];
-                ByteArrayOutputStream stream = new ByteArrayOutputStream();
-                if (img.compress(Bitmap.CompressFormat.JPEG, 80, stream)) {
-                    result = stream.toByteArray();
-                } else {
-                    result = null;
-                }
-                return result;
-            }
         });
-    }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-    }
+        mCameraProviderFuture = ProcessCameraProvider.getInstance(requireContext());
+        mCameraExecutor = Executors.newSingleThreadExecutor();
 
-    @Override
-    public void onStop() {
-        super.onStop();
+        mCameraProviderFuture.addListener(() -> {
+            try {
+                mCameraProvider = mCameraProviderFuture.get();
+                bindPreview(mCameraProvider);
+            } catch (ExecutionException | InterruptedException e) {
+                mProgressBar.hideSlow();
+                hideMainContent();
+                finishWithError(e);
+            }
+        }, ContextCompat.getMainExecutor(requireContext()));
     }
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-    }
+    public void onDestroyView() {
+        super.onDestroyView();
 
-    @Override
-    public void onDetach() {
-        super.onDetach();
-    }
+        new Handler(requireContext().getMainLooper()).post(() -> {
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (mScanManager != null) mScanManager.onResume();
-    }
+            if (mImageAnalysis != null) {
+                mImageAnalysis.clearAnalyzer();
+            }
+            if (mCameraProvider != null) {
+                mCameraProvider.unbindAll();
+            }
+        });
 
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (mScanManager != null) mScanManager.onPause();
+        if (mCameraExecutor != null) {
+            mCameraExecutor.shutdown();
+        }
     }
 
     @Override
@@ -239,33 +219,86 @@ public void onDestroy() {
         mCapturedSoundId = -1;
     }
 
-    private void innitSoundPool() {
-        if (mRequest.isSoundEnabled()) {
-            mSoundPool = new SoundPool(1, AudioManager.STREAM_SYSTEM, 0);
-            mCapturedSoundId = mSoundPool.load(getActivity(), R.raw.wocr_capture_card, 0);
+    private void bindPreview(ProcessCameraProvider cameraProvider) {
+        if (getContext() instanceof Activity &&
+                (((Activity)getContext()).isDestroyed() || ((Activity)getContext()).isFinishing())) {
+            //This check is to avoid an exception when trying to re-bind use cases but user closes the activity.
+            //java.lang.IllegalArgumentException: Trying to create use case mediator with destroyed lifecycle.
+            return;
         }
-    }
 
-    private void initView(View view) {
-        view.findViewById(R.id.wocr_tv_enter_card_number_id).setOnClickListener(new View.OnClickListener() {
+        cameraProvider.unbindAll();
+
+//        var metrics = WindowMetricsCalculator.getOrCreate().computeCurrentWindowMetrics(requireActivity()).getBounds();
+//        var screenAspectRatio = aspectRatio(metrics.width(), metrics.height());
+
+        var metrics = new DisplayMetrics();
+        requireActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        var screenAspectRatio = aspectRatio(metrics.widthPixels, metrics.heightPixels);
+
+
+        @SuppressLint("RestrictedApi") Preview preview = new Preview.Builder()
+                .setTargetAspectRatio(screenAspectRatio)
+                .setTargetRotation(mCameraPreview.getDisplay().getRotation())
+                .build();
+
+        CameraSelector cameraSelector = new CameraSelector.Builder()
+                .requireLensFacing(CameraSelector.LENS_FACING_BACK)
+                .build();
+
+        mImageAnalysis = new ImageAnalysis.Builder()
+                .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
+                .setOutputImageFormat(ImageAnalysis.OUTPUT_IMAGE_FORMAT_YUV_420_888)
+                .setTargetRotation(mCameraPreview.getDisplay().getRotation())
+                .setTargetAspectRatio(screenAspectRatio)
+                .build();
+
+        var orientationEventListener = new OrientationEventListener(getContext()) {
             @Override
-            public void onClick(final View v) {
-                if (v.isEnabled()) {
-                    v.setEnabled(false);
-                    if (mListener != null) mListener.onScanCardCanceled(ScanCardIntent.ADD_MANUALLY_PRESSED);
+            public void onOrientationChanged(int orientation) {
+                if (orientation >= 45 && orientation <= 124) {
+                    mImageAnalysis.setTargetRotation(Surface.ROTATION_270);
+                } else if (orientation >= 135 && orientation <= 224) {
+                    mImageAnalysis.setTargetRotation(Surface.ROTATION_180);
+                } else if (orientation >= 225 && orientation <= 314) {
+                    mImageAnalysis.setTargetRotation(Surface.ROTATION_90);
+                } else {
+                    mImageAnalysis.setTargetRotation(Surface.ROTATION_0);
                 }
             }
-        });
-        if(mFlashButton != null) {
-            mFlashButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(final View v) {
-                    if (mScanManager != null) mScanManager.toggleFlash();
-                }
-            });
+        };
+
+        orientationEventListener.enable();
+
+        mImageAnalysis.setAnalyzer(mCameraExecutor, mImageAnalyzer);
+
+        preview.setSurfaceProvider(mCameraPreview.getSurfaceProvider());
+
+        mCamera = cameraProvider.bindToLifecycle(getViewLifecycleOwner(), cameraSelector, mImageAnalysis, preview);
+
+        cameraOpened();
+    }
+
+    private void initViews(View root) {
+        mCameraPreview = root.findViewById(R.id.cameraPreview);
+        mCameraPreviewLayout = root.findViewById(R.id.wocr_card_recognition_view);
+        mMainContent = root.findViewById(R.id.wocr_main_content);
+        mProgressBar = root.findViewById(R.id.wocr_progress_bar);
+        mFlashButton = root.findViewById(R.id.wocr_iv_flash_id);
+
+        if (mFlashButton != null) {
+            mFlashButton.setOnClickListener(v -> mCamera.getCameraControl().enableTorch(!flashEnabled));
         }
 
-        TextView paycardsLink = (TextView)view.findViewById(R.id.wocr_powered_by_paycards_link);
+        root.findViewById(R.id.wocr_tv_enter_card_number_id).setOnClickListener(v -> {
+            if (v.isEnabled()) {
+                v.setEnabled(false);
+                if (mListener != null)
+                    mListener.onScanCardCanceled(ScanCardIntent.ADD_MANUALLY_PRESSED);
+            }
+        });
+
+        var paycardsLink = (TextView) root.findViewById(R.id.wocr_powered_by_paycards_link);
         SpannableString link = new SpannableString(getText(R.string.wocr_powered_by_pay_cards));
         link.setSpan(new URLSpan(Constants.PAYCARDS_URL), 0, link.length(), SpannableString.SPAN_INCLUSIVE_EXCLUSIVE);
         paycardsLink.setText(link);
@@ -282,12 +315,39 @@ private void hideMainContent() {
         mCameraPreviewLayout.setVisibility(View.INVISIBLE);
     }
 
-    private void finishWithError(Exception exception) {
-        if (mListener != null) mListener.onScanCardFailed(exception);
+    private int aspectRatio(int width, int height) {
+        var previewRatio = (float) Math.max(width, height) / (float) Math.min(width, height);
+        if (Math.abs(previewRatio - RATIO_4_3_VALUE) <= Math.abs(previewRatio - RATIO_16_9_VALUE)) {
+            return AspectRatio.RATIO_4_3;
+        }
+        return AspectRatio.RATIO_16_9;
     }
 
-    private void finishWithResult(Card card, @Nullable byte cardImage[]) {
-        if (mListener != null) mListener.onScanCardFinished(card, cardImage);
+    private void cameraOpened() {
+        mImageAnalyzer.setSensorRotation(mCamera.getCameraInfo().getSensorRotationDegrees());
+        mImageAnalyzer.setupCardDetectionCameraParameters(CameraUtils.CAMERA_RESOLUTION.size.width, CameraUtils.CAMERA_RESOLUTION.size.height, mCamera.getCameraInfo().getSensorRotationDegrees());
+        mProgressBar.hideSlow();
+        mCameraPreviewLayout.setBackground(null);
+
+        if (mCamera != null) {
+            var isFlashSupported = mCamera.getCameraInfo().hasFlashUnit();
+            if (mFlashButton != null)
+                mFlashButton.setVisibility(isFlashSupported ? View.VISIBLE : View.GONE);
+
+            mCamera.getCameraInfo().getTorchState().observe(getViewLifecycleOwner(), torchState -> flashEnabled = torchState == TorchState.ON);
+        }
+
+        innitSoundPool();
+    }
+
+    private void innitSoundPool() {
+        if (mRequest.isSoundEnabled()) {
+            mSoundPool = new SoundPool.Builder()
+                    .setMaxStreams(1)
+                    .setAudioAttributes(new AudioAttributes.Builder().setLegacyStreamType(AudioManager.STREAM_SYSTEM).build())
+                    .build();
+            mCapturedSoundId = mSoundPool.load(getActivity(), R.raw.wocr_capture_card, 0);
+        }
     }
 
     private boolean isTablet() {
@@ -298,9 +358,31 @@ private void playCaptureSound() {
         if (mCapturedSoundId >= 0) mSoundPool.play(mCapturedSoundId, 1, 1, 0, 0, 1);
     }
 
+    @Nullable
+    private byte[] compressCardImage(Bitmap img) {
+        byte[] result;
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        if (img.compress(Bitmap.CompressFormat.JPEG, 80, stream)) {
+            result = stream.toByteArray();
+        } else {
+            result = null;
+        }
+        return result;
+    }
+
+    private void finishWithError(Exception exception) {
+        if (mListener != null) mListener.onScanCardFailed(exception);
+    }
+
+    private void finishWithResult(Card card, @Nullable byte[] cardImage) {
+        if (mListener != null) mListener.onScanCardFinished(card, cardImage);
+    }
+
     public interface InteractionListener {
         void onScanCardCanceled(@ScanCardIntent.CancelReason int cancelReason);
+
         void onScanCardFailed(Exception e);
-        void onScanCardFinished(Card card, byte cardImage[]);
+
+        void onScanCardFinished(Card card, byte[] cardImage);
     }
 }
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardRequest.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardRequest.java
index 849c981..b7cd7e5 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardRequest.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/ScanCardRequest.java
@@ -2,7 +2,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.RestrictTo;
+
+import androidx.annotation.RestrictTo;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public final class ScanCardRequest implements Parcelable {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ButtonWithTopBorder.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ButtonWithTopBorder.java
index 5f43b54..eb2d475 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ButtonWithTopBorder.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ButtonWithTopBorder.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.v7.widget.AppCompatButton;
+import androidx.appcompat.widget.AppCompatButton;
 import android.util.AttributeSet;
 
 public class ButtonWithTopBorder extends AppCompatButton {
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ProgressBarIndeterminate.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ProgressBarIndeterminate.java
index 139d85b..cb58484 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ProgressBarIndeterminate.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/ProgressBarIndeterminate.java
@@ -2,11 +2,12 @@
 
 import android.animation.Animator;
 import android.content.Context;
-import android.support.annotation.RestrictTo;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ProgressBar;
 
+import androidx.annotation.RestrictTo;
+
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class ProgressBarIndeterminate extends ProgressBar {
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/TabletCardRecognitionHolderLinearLayout.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/TabletCardRecognitionHolderLinearLayout.java
index 6f5593e..4e8320b 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/TabletCardRecognitionHolderLinearLayout.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/ui/views/TabletCardRecognitionHolderLinearLayout.java
@@ -2,11 +2,12 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.RestrictTo;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import androidx.annotation.RestrictTo;
+
 import cards.pay.paycardsrecognizer.sdk.R;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/AsyncTaskV2.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/AsyncTaskV2.java
new file mode 100644
index 0000000..ff59fec
--- /dev/null
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/AsyncTaskV2.java
@@ -0,0 +1,117 @@
+package cards.pay.paycardsrecognizer.sdk.utils;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+
+import androidx.annotation.AnyThread;
+import androidx.annotation.MainThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public abstract class AsyncTaskV2<Params, Progress, Result> {
+
+    public enum Status {
+        FINISHED,
+        PENDING,
+        RUNNING
+    }
+
+    // This handler will be used to communicate with main thread
+    private final Handler mainThreadHandler = new Handler(Looper.getMainLooper());
+    private final AtomicBoolean cancelled = new AtomicBoolean(false);
+
+    private Result result;
+    private Future<Result> resultFuture;
+    private ExecutorService executor;
+    private Status status = Status.PENDING;
+
+    // Base class must implement this method
+    protected abstract Result doInBackground(Params... params);
+
+    // Methods with default implementation
+    // Base class can optionally override these methods.
+    protected void onPreExecute() {}
+    protected void onPostExecute(Result result) {}
+    @SafeVarargs
+    protected final void onProgressUpdate(Progress... progress) {}
+    protected void onCancelled() {}
+    protected void onCancelled(Result result) {
+        onCancelled();
+    }
+
+    @SafeVarargs
+    @MainThread
+    public final void execute(@Nullable Params... params) {
+        status = Status.RUNNING;
+        onPreExecute();
+        try {
+            executor = Executors.newSingleThreadExecutor();
+            Callable<Result> backgroundCallableTask = () ->  doInBackground(params);
+            // Execute the background task
+            resultFuture = executor.submit(backgroundCallableTask);
+
+            // On the worker thread - wait for the background task to complete
+            executor.execute(getResult());
+        } finally {
+            if (executor != null) {
+                executor.shutdown();
+            }
+        }
+    }
+
+    private Runnable getResult() {
+        return () -> {
+            try {
+                if (!isCancelled()) {
+                    // This will block the worker thread, till the result is available
+                    // Since our executor is a single thread, we will have results by now
+                    result = resultFuture.get();
+
+                    // Post the result to main thread
+                    mainThreadHandler.post(() -> onPostExecute(result));
+                } else {
+                    // User cancelled the operation, ignore the result
+                    mainThreadHandler.post(this::onCancelled);
+                }
+                status = Status.FINISHED;
+            } catch (InterruptedException | ExecutionException e) {
+                Log.e("AsyncTask2", "Exception while trying to get result ", e);
+            }
+        };
+    }
+
+    @SafeVarargs
+    @WorkerThread
+    public final void publishProgress(Progress... progress) {
+        if (!isCancelled()) {
+            mainThreadHandler.post(() -> onProgressUpdate(progress));
+        }
+    }
+
+    @MainThread
+    public final void cancel(boolean mayInterruptIfRunning) {
+        cancelled.set(true);
+        if (resultFuture!= null) {
+            resultFuture.cancel(mayInterruptIfRunning);
+        }
+    }
+
+    @AnyThread
+    public final boolean isCancelled() {
+        return cancelled.get();
+    }
+
+    @AnyThread
+    public final Status getStatus() {
+        return status;
+    }
+
+}
\ No newline at end of file
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/CardUtils.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/CardUtils.java
index 4b04b41..b215c9f 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/CardUtils.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/CardUtils.java
@@ -1,7 +1,8 @@
 package cards.pay.paycardsrecognizer.sdk.utils;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+
 import android.text.TextUtils;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY)
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Constants.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Constants.java
index 775eb47..16298db 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Constants.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Constants.java
@@ -1,6 +1,6 @@
 package cards.pay.paycardsrecognizer.sdk.utils;
 
-import android.support.annotation.RestrictTo;
+import androidx.annotation.RestrictTo;
 
 import cards.pay.paycardsrecognizer.sdk.BuildConfig;
 
diff --git a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Size.java b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Size.java
index 61f19d5..e82f6f0 100644
--- a/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Size.java
+++ b/sdk/src/main/java/cards/pay/paycardsrecognizer/sdk/utils/Size.java
@@ -1,5 +1,7 @@
 package cards.pay.paycardsrecognizer.sdk.utils;
 
+import androidx.annotation.NonNull;
+
 public class Size implements Comparable<Size> {
 
     public final int width;
@@ -42,6 +44,7 @@ public int compareTo(final Size another) {
         return 0;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return width + "x" + height;
diff --git a/sdk/src/main/res/layout-sw600dp-land/wocr_fragment_scan_card.xml b/sdk/src/main/res/layout-sw600dp-land/wocr_fragment_scan_card.xml
index 349a389..bd4da60 100644
--- a/sdk/src/main/res/layout-sw600dp-land/wocr_fragment_scan_card.xml
+++ b/sdk/src/main/res/layout-sw600dp-land/wocr_fragment_scan_card.xml
@@ -36,7 +36,7 @@
             android:layout_height="wrap_content"
             android:text="@string/wocr_button_enter_card_number" />
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/wocr_iv_flash_id"
             style="@style/wocr_FlashButton"
             android:layout_height="wrap_content"
diff --git a/sdk/src/main/res/layout-sw600dp/wocr_fragment_scan_card.xml b/sdk/src/main/res/layout-sw600dp/wocr_fragment_scan_card.xml
index 996becb..2bcc255 100644
--- a/sdk/src/main/res/layout-sw600dp/wocr_fragment_scan_card.xml
+++ b/sdk/src/main/res/layout-sw600dp/wocr_fragment_scan_card.xml
@@ -25,13 +25,14 @@
             android:layout_marginRight="@dimen/wocr_tablet_card_port_right_left_margin"
             android:gravity="center"
             android:clipToPadding="true"
+            android:clipChildren="true"
             android:orientation="vertical">
 
             <include layout="@layout/wocr_include_card_detection_layout" />
 
         </cards.pay.paycardsrecognizer.sdk.ui.views.TabletCardRecognitionHolderLinearLayout>
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/wocr_iv_flash_id"
             style="@style/wocr_FlashButton"
             android:layout_height="wrap_content"
diff --git a/sdk/src/main/res/layout/wocr_fragment_scan_card.xml b/sdk/src/main/res/layout/wocr_fragment_scan_card.xml
index a3403a1..2b2f451 100644
--- a/sdk/src/main/res/layout/wocr_fragment_scan_card.xml
+++ b/sdk/src/main/res/layout/wocr_fragment_scan_card.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:keepScreenOn="true"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:keepScreenOn="true"
     tools:context=".ui.ScanCardActivity">
 
     <RelativeLayout
@@ -18,7 +17,7 @@
 
         <include layout="@layout/wocr_include_card_detection_layout" />
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/wocr_iv_flash_id"
             style="@style/wocr_FlashButton"
             android:layout_height="wrap_content"
diff --git a/sdk/src/main/res/layout/wocr_include_card_detection_layout.xml b/sdk/src/main/res/layout/wocr_include_card_detection_layout.xml
index da113f0..6e6d5d6 100644
--- a/sdk/src/main/res/layout/wocr_include_card_detection_layout.xml
+++ b/sdk/src/main/res/layout/wocr_include_card_detection_layout.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <cards.pay.paycardsrecognizer.sdk.camera.widget.CameraPreviewLayout
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -8,12 +7,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="true"
+    android:clipChildren="true"
     tools:showIn="@layout/wocr_fragment_scan_card">
 
-    <SurfaceView
-        android:id="@+id/surface_view"
+    <androidx.camera.view.PreviewView
+        android:id="@+id/cameraPreview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
     <cards.pay.paycardsrecognizer.sdk.camera.widget.CardDetectionStateView
         android:id="@+id/wocr_card_detection_state"
diff --git a/settings.gradle b/settings.gradle
index 02663eb..2cdf0fd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,18 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
 include ':demo', ':sdk'
+
+