diff --git a/app/build.gradle b/app/build.gradle
index 82946b17..03e7dabf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '26.0.3'
 
     defaultConfig {
         applicationId "com.github.orangegangsters.lollipin"
         minSdkVersion 14
-        targetSdkVersion 24
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -20,16 +20,16 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile project(':lib')
-    compile 'com.android.support:appcompat-v7:26.0.2'
+    implementation project(':lib')
+    implementation 'com.android.support:appcompat-v7:26.1.0'
 
     //Lollipop dialogs https://github.com/lewisjdeane/L-Dialogs and buttons, animations etc...
-    compile 'uk.me.lewisdeane.ldialogs:ldialogs:1.2.0@aar'
+    implementation 'uk.me.lewisdeane.ldialogs:ldialogs:1.2.0@aar'
 
     //test
-    androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.5.2'
+    androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.2'
 }
 
 // REQUIRED: Google's new Maven repo is required for the latest
diff --git a/app/src/main/java/com/github/omadahealth/lollipin/LockedCompatActivity.java b/app/src/main/java/com/github/omadahealth/lollipin/LockedCompatActivity.java
index 93141c29..019950a8 100644
--- a/app/src/main/java/com/github/omadahealth/lollipin/LockedCompatActivity.java
+++ b/app/src/main/java/com/github/omadahealth/lollipin/LockedCompatActivity.java
@@ -1,7 +1,7 @@
 package com.github.omadahealth.lollipin;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import com.github.omadahealth.lollipin.lib.PinCompatActivity;
 import lollipin.orangegangsters.github.com.lollipin.R;
 
diff --git a/build.gradle b/build.gradle
index dbe7511e..7618fa82 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,7 +15,8 @@ buildscript {
 
 allprojects {
     repositories {
-        maven{
+        google()
+        maven {
             url "https://github.com/omadahealth/omada-nexus/raw/master/release"
         }
         jcenter()
diff --git a/lib/.gitignore b/lollipin/.gitignore
similarity index 100%
rename from lib/.gitignore
rename to lollipin/.gitignore
diff --git a/lib/build.gradle b/lollipin/build.gradle
similarity index 69%
rename from lib/build.gradle
rename to lollipin/build.gradle
index 55f30cb8..277aafc1 100644
--- a/lib/build.gradle
+++ b/lollipin/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 2
         versionName VERSION_NAME
     }
@@ -19,16 +19,18 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     //RippleView
-    compile 'com.github.traex.rippleeffect:ripple:1.3.1-OG'
+    implementation 'com.github.traex.rippleeffect:ripple:1.3.1-OG'
     //TypefaceView
-    compile 'com.github.omadahealth.typefaceview:typefaceview:1.5.0@aar' //TypefaceTextView
+    implementation 'com.github.omadahealth.typefaceview:typefaceview:1.5.0@aar' //TypefaceTextView
+
+    //implementation 'androidx.fragment:fragment:1.0.0'
 
     //Compat
-    compile 'com.android.support:support-v4:26.0.2'
-    compile 'com.android.support:appcompat-v7:26.0.2'
-    compile "com.android.support:support-v13:26.0.2"
+    //implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    //implementation "androidx.legacy:legacy-support-v13:1.0.0"
 }
 repositories {
     maven {
diff --git a/lib/proguard-rules.pro b/lollipin/proguard-rules.pro
similarity index 100%
rename from lib/proguard-rules.pro
rename to lollipin/proguard-rules.pro
diff --git a/lib/src/androidTest/java/com/github/omadahealth/lollipin/lib/ApplicationTest.java b/lollipin/src/androidTest/java/com/github/omadahealth/lollipin/lib/ApplicationTest.java
similarity index 100%
rename from lib/src/androidTest/java/com/github/omadahealth/lollipin/lib/ApplicationTest.java
rename to lollipin/src/androidTest/java/com/github/omadahealth/lollipin/lib/ApplicationTest.java
diff --git a/lib/src/main/AndroidManifest.xml b/lollipin/src/main/AndroidManifest.xml
similarity index 100%
rename from lib/src/main/AndroidManifest.xml
rename to lollipin/src/main/AndroidManifest.xml
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/PinActivity.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/PinActivity.java
similarity index 97%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/PinActivity.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/PinActivity.java
index 11ed7d6c..0434386d 100644
--- a/lib/src/main/java/com/github/omadahealth/lollipin/lib/PinActivity.java
+++ b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/PinActivity.java
@@ -7,7 +7,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.github.omadahealth.lollipin.lib.interfaces.LifeCycleInterface;
 import com.github.omadahealth.lollipin.lib.managers.AppLockActivity;
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/PinCompatActivity.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/PinCompatActivity.java
similarity index 95%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/PinCompatActivity.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/PinCompatActivity.java
index 15c06d51..bbc5b864 100644
--- a/lib/src/main/java/com/github/omadahealth/lollipin/lib/PinCompatActivity.java
+++ b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/PinCompatActivity.java
@@ -5,8 +5,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.github.omadahealth.lollipin.lib.interfaces.LifeCycleInterface;
 import com.github.omadahealth.lollipin.lib.managers.AppLockActivity;
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/PinFragmentActivity.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/PinFragmentActivity.java
similarity index 95%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/PinFragmentActivity.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/PinFragmentActivity.java
index 78c49479..e2c08717 100644
--- a/lib/src/main/java/com/github/omadahealth/lollipin/lib/PinFragmentActivity.java
+++ b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/PinFragmentActivity.java
@@ -5,8 +5,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.fragment.app.FragmentActivity;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.github.omadahealth.lollipin.lib.interfaces.LifeCycleInterface;
 import com.github.omadahealth.lollipin.lib.managers.AppLockActivity;
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/encryption/Encryptor.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/encryption/Encryptor.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/encryption/Encryptor.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/encryption/Encryptor.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/enums/Algorithm.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/enums/Algorithm.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/enums/Algorithm.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/enums/Algorithm.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/enums/KeyboardButtonEnum.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/enums/KeyboardButtonEnum.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/enums/KeyboardButtonEnum.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/enums/KeyboardButtonEnum.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/interfaces/KeyboardButtonClickedListener.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/interfaces/KeyboardButtonClickedListener.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/interfaces/KeyboardButtonClickedListener.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/interfaces/KeyboardButtonClickedListener.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/interfaces/LifeCycleInterface.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/interfaces/LifeCycleInterface.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/interfaces/LifeCycleInterface.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/interfaces/LifeCycleInterface.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLock.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLock.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLock.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLock.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockActivity.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockActivity.java
similarity index 90%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockActivity.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockActivity.java
index c2c72574..cfd7edf0 100644
--- a/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockActivity.java
+++ b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockActivity.java
@@ -5,7 +5,7 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.view.View;
 import android.view.animation.Animation;
@@ -20,6 +20,7 @@
 import com.github.omadahealth.lollipin.lib.views.KeyboardView;
 import com.github.omadahealth.lollipin.lib.views.PinCodeRoundView;
 
+import java.security.ProviderException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -29,7 +30,8 @@
  * Call this activity in normal or singleTop mode (not singleTask or singleInstance, it does not work
  * with {@link android.app.Activity#startActivityForResult(android.content.Intent, int)}).
  */
-public abstract class AppLockActivity extends PinActivity implements KeyboardButtonClickedListener, View.OnClickListener, FingerprintUiHelper.Callback {
+public abstract class AppLockActivity extends PinActivity implements KeyboardButtonClickedListener, View.OnClickListener, FingerprintUiHelper
+        .Callback {
 
     public static final String TAG = AppLockActivity.class.getSimpleName();
     public static final String ACTION_CANCEL = TAG + ".actionCancelled";
@@ -44,7 +46,6 @@ public abstract class AppLockActivity extends PinActivity implements KeyboardBut
 
     protected LockManager mLockManager;
 
-
     protected FingerprintManager mFingerprintManager;
     protected FingerprintUiHelper mFingerprintUiHelper;
 
@@ -62,7 +63,6 @@ public abstract class AppLockActivity extends PinActivity implements KeyboardBut
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         setContentView(getContentView());
         initLayout(getIntent());
     }
@@ -73,7 +73,6 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-
         initLayout(intent);
     }
 
@@ -96,10 +95,8 @@ protected void onPause() {
      * Init completely the layout, depending of the extra {@link com.github.omadahealth.lollipin.lib.managers.AppLock#EXTRA_TYPE}
      */
     private void initLayout(Intent intent) {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1) {
-            //Animate if greater than 2.3.3
-            overridePendingTransition(R.anim.nothing, R.anim.nothing);
-        }
+        //Animate if greater than 2.3.3
+        overridePendingTransition(R.anim.nothing, R.anim.nothing);
 
         Bundle extras = intent.getExtras();
         if (extras != null) {
@@ -113,16 +110,16 @@ private void initLayout(Intent intent) {
         enableAppLockerIfDoesNotExist();
         mLockManager.getAppLock().setPinChallengeCancelled(false);
 
-        mStepTextView = (TextView) this.findViewById(R.id.pin_code_step_textview);
-        mPinCodeRoundView = (PinCodeRoundView) this.findViewById(R.id.pin_code_round_view);
-        mPinCodeRoundView.setPinLength(this.getPinLength());
-        mForgotTextView = (TextView) this.findViewById(R.id.pin_code_forgot_textview);
+        mStepTextView = findViewById(R.id.pin_code_step_textview);
+        mPinCodeRoundView = findViewById(R.id.pin_code_round_view);
+        mPinCodeRoundView.setPinLength(getPinLength());
+        mForgotTextView = findViewById(R.id.pin_code_forgot_textview);
         mForgotTextView.setOnClickListener(this);
-        mKeyboardView = (KeyboardView) this.findViewById(R.id.pin_code_keyboard_view);
+        mKeyboardView = findViewById(R.id.pin_code_keyboard_view);
         mKeyboardView.setKeyboardButtonClickedListener(this);
 
         int logoId = mLockManager.getAppLock().getLogoId();
-        ImageView logoImage = ((ImageView) findViewById(R.id.pin_code_logo_imageview));
+        ImageView logoImage = findViewById(R.id.pin_code_logo_imageview);
         if (logoId != AppLock.LOGO_ID_NONE) {
             logoImage.setVisibility(View.VISIBLE);
             logoImage.setImageResource(logoId);
@@ -138,14 +135,16 @@ private void initLayout(Intent intent) {
      * and {@link FingerprintManager#isHardwareDetected()}.
      */
     private void initLayoutForFingerprint() {
-        mFingerprintImageView = (ImageView) this.findViewById(R.id.pin_code_fingerprint_imageview);
-        mFingerprintTextView = (TextView) this.findViewById(R.id.pin_code_fingerprint_textview);
+        mFingerprintImageView = findViewById(R.id.pin_code_fingerprint_imageview);
+        mFingerprintTextView = findViewById(R.id.pin_code_fingerprint_textview);
         if (mType == AppLock.UNLOCK_PIN && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             mFingerprintManager = (FingerprintManager) getSystemService(Context.FINGERPRINT_SERVICE);
-            mFingerprintUiHelper = new FingerprintUiHelper.FingerprintUiHelperBuilder(mFingerprintManager).build(mFingerprintImageView, mFingerprintTextView, this);
+            mFingerprintUiHelper = new FingerprintUiHelper.FingerprintUiHelperBuilder(mFingerprintManager).build(mFingerprintImageView,
+                    mFingerprintTextView, this);
             try {
-            if (mFingerprintManager.isHardwareDetected() && mFingerprintUiHelper.isFingerprintAuthAvailable()
-                    && mLockManager.getAppLock().isFingerprintAuthEnabled()) {
+                //mFingerprintManager != null added by Jay
+                if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected() && mFingerprintUiHelper.isFingerprintAuthAvailable()
+                        && mLockManager.getAppLock() != null && mLockManager.getAppLock().isFingerprintAuthEnabled()) {
                     mFingerprintImageView.setVisibility(View.VISIBLE);
                     mFingerprintTextView.setVisibility(View.VISIBLE);
                     mFingerprintUiHelper.startListening();
@@ -153,8 +152,8 @@ private void initLayoutForFingerprint() {
                     mFingerprintImageView.setVisibility(View.GONE);
                     mFingerprintTextView.setVisibility(View.GONE);
                 }
-            } catch (SecurityException e) {
-                Log.e(TAG, e.toString());
+                //} catch (SecurityException e) {
+            } catch (SecurityException | ProviderException e) {//added ProviderException to resolve field issues
                 mFingerprintImageView.setVisibility(View.GONE);
                 mFingerprintTextView.setVisibility(View.GONE);
             }
@@ -218,7 +217,7 @@ public String getForgotText() {
         return getString(R.string.pin_code_forgot_text);
     }
 
-    private void setForgotTextVisibility(){
+    private void setForgotTextVisibility() {
         mForgotTextView.setVisibility(mLockManager.getAppLock().shouldShowForgot(mType) ? View.VISIBLE : View.GONE);
     }
 
@@ -239,10 +238,8 @@ public void finish() {
             }
         }
 
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1) {
-            //Animate if greater than 2.3.3
-            overridePendingTransition(R.anim.nothing, R.anim.slide_down);
-        }
+        //Animate if greater than 2.3.3
+        overridePendingTransition(R.anim.nothing, R.anim.slide_down);
     }
 
     /**
@@ -267,7 +264,7 @@ public void onKeyboardClick(KeyboardButtonEnum keyboardButtonEnum) {
     }
 
     /**
-     * Called at the end of the animation of the {@link com.andexert.library.RippleView}
+     * Called at the end of the animation of the @link com.andexert.library.RippleView
      * Calls {@link #onPinCodeInputed} when {@link #mPinCode}
      */
     @Override
@@ -415,7 +412,6 @@ public void setPinCode(String pinCode) {
         mPinCodeRoundView.refresh(mPinCode.length());
     }
 
-
     /**
      * Returns the type of this {@link com.github.omadahealth.lollipin.lib.managers.AppLockActivity}
      */
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockImpl.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockImpl.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockImpl.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockImpl.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/FingerprintUiHelper.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/FingerprintUiHelper.java
similarity index 92%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/FingerprintUiHelper.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/FingerprintUiHelper.java
index b4febe4f..4cff054f 100644
--- a/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/FingerprintUiHelper.java
+++ b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/FingerprintUiHelper.java
@@ -215,12 +215,13 @@ public void run() {
     /**
      * Tells if the {@link FingerprintManager#isHardwareDetected()}, {@link FingerprintManager#hasEnrolledFingerprints()},
      * and {@link KeyguardManager#isDeviceSecure()}
-     * 
+     *
      * @return true if yes, false otherwise
      * @throws SecurityException If the hardware is not available, or the permission are not set
      */
     public boolean isFingerprintAuthAvailable() throws SecurityException {
-        return mFingerprintManager.isHardwareDetected()
+        //mFingerprintManager != null added by Jay
+        return mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
                 && mFingerprintManager.hasEnrolledFingerprints()
                 && ((KeyguardManager) mIcon.getContext().getSystemService(Context.KEYGUARD_SERVICE)).isDeviceSecure();
     }
@@ -267,13 +268,22 @@ public void createKey() {
                     KeyProperties.PURPOSE_ENCRYPT |
                             KeyProperties.PURPOSE_DECRYPT)
                     .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
-                            // Require the user to authenticate with a fingerprint to authorize every use
-                            // of the key
+                    // Require the user to authenticate with a fingerprint to authorize every use
+                    // of the key
                     .setUserAuthenticationRequired(true)
                     .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)
                     .build());
             mKeyGenerator.generateKey();
-        } catch (NoSuchProviderException | NoSuchAlgorithmException | InvalidAlgorithmParameterException e) {
+
+        } catch (InvalidAlgorithmParameterException e){
+            //  added by Jay. Appears to be an issue specific to Sony Experia Z5
+            //  Fatal Exception: java.lang.RuntimeException: Unable to resume activity {com.rammigsoftware.bluecoins/com.rammigsoftware.bluecoins
+            // .pinsecurity.CustomPinActivity}: java.lang.RuntimeException: java.security.InvalidAlgorithmParameterException: java.lang
+            // .IllegalStateException: At least one fingerprint must be enrolled to create keys requiring user authentication for every use
+            //  at android.app.ActivityThread.performResumeActivity(ActivityThread.java:3493)
+            e.printStackTrace();
+
+        } catch (NoSuchProviderException | NoSuchAlgorithmException e) {
             throw new RuntimeException(e);
         }
     }
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/LockManager.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/LockManager.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/LockManager.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/managers/LockManager.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/views/KeyboardButtonView.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/KeyboardButtonView.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/views/KeyboardButtonView.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/KeyboardButtonView.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/views/KeyboardView.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/KeyboardView.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/views/KeyboardView.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/KeyboardView.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/views/PinCodeRoundView.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/PinCodeRoundView.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/views/PinCodeRoundView.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/PinCodeRoundView.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/views/PinCodeView.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/PinCodeView.java
similarity index 100%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/views/PinCodeView.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/PinCodeView.java
diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/views/SquareImageView.java b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/SquareImageView.java
similarity index 90%
rename from lib/src/main/java/com/github/omadahealth/lollipin/lib/views/SquareImageView.java
rename to lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/SquareImageView.java
index 578a0b00..e73e80ff 100644
--- a/lib/src/main/java/com/github/omadahealth/lollipin/lib/views/SquareImageView.java
+++ b/lollipin/src/main/java/com/github/omadahealth/lollipin/lib/views/SquareImageView.java
@@ -2,12 +2,11 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
 /**
  * An ImageView that shrinks its larger dimension to become square.
  */
-public class SquareImageView extends android.support.v7.widget.AppCompatImageView {
+public class SquareImageView extends androidx.appcompat.widget.AppCompatImageView {
     public SquareImageView(Context context) {
         super(context);
     }
diff --git a/lib/src/main/res/anim/cycle5.xml b/lollipin/src/main/res/anim/cycle5.xml
similarity index 100%
rename from lib/src/main/res/anim/cycle5.xml
rename to lollipin/src/main/res/anim/cycle5.xml
diff --git a/lib/src/main/res/anim/nothing.xml b/lollipin/src/main/res/anim/nothing.xml
similarity index 85%
rename from lib/src/main/res/anim/nothing.xml
rename to lollipin/src/main/res/anim/nothing.xml
index 77bb8151..95d5ce9d 100644
--- a/lib/src/main/res/anim/nothing.xml
+++ b/lollipin/src/main/res/anim/nothing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
+    android:duration="250"
     android:fromXDelta="0"
     android:toXDelta="0" />
\ No newline at end of file
diff --git a/lib/src/main/res/anim/shake.xml b/lollipin/src/main/res/anim/shake.xml
similarity index 100%
rename from lib/src/main/res/anim/shake.xml
rename to lollipin/src/main/res/anim/shake.xml
diff --git a/lib/src/main/res/anim/slide_down.xml b/lollipin/src/main/res/anim/slide_down.xml
similarity index 100%
rename from lib/src/main/res/anim/slide_down.xml
rename to lollipin/src/main/res/anim/slide_down.xml
diff --git a/lib/src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png b/lollipin/src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png
old mode 100755
new mode 100644
similarity index 100%
rename from lib/src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png
rename to lollipin/src/main/res/drawable-hdpi/ic_backspace_grey600_24dp.png
diff --git a/lib/src/main/res/drawable-hdpi/ic_fp_40px.png b/lollipin/src/main/res/drawable-hdpi/ic_fp_40px.png
similarity index 100%
rename from lib/src/main/res/drawable-hdpi/ic_fp_40px.png
rename to lollipin/src/main/res/drawable-hdpi/ic_fp_40px.png
diff --git a/lib/src/main/res/drawable-hdpi/tile.9.png b/lollipin/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from lib/src/main/res/drawable-hdpi/tile.9.png
rename to lollipin/src/main/res/drawable-hdpi/tile.9.png
diff --git a/lib/src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png b/lollipin/src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png
old mode 100755
new mode 100644
similarity index 100%
rename from lib/src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png
rename to lollipin/src/main/res/drawable-mdpi/ic_backspace_grey600_24dp.png
diff --git a/lib/src/main/res/drawable-mdpi/ic_fp_40px.png b/lollipin/src/main/res/drawable-mdpi/ic_fp_40px.png
similarity index 100%
rename from lib/src/main/res/drawable-mdpi/ic_fp_40px.png
rename to lollipin/src/main/res/drawable-mdpi/ic_fp_40px.png
diff --git a/lib/src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png b/lollipin/src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png
old mode 100755
new mode 100644
similarity index 100%
rename from lib/src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png
rename to lollipin/src/main/res/drawable-xhdpi/ic_backspace_grey600_24dp.png
diff --git a/lib/src/main/res/drawable-xhdpi/ic_fp_40px.png b/lollipin/src/main/res/drawable-xhdpi/ic_fp_40px.png
similarity index 100%
rename from lib/src/main/res/drawable-xhdpi/ic_fp_40px.png
rename to lollipin/src/main/res/drawable-xhdpi/ic_fp_40px.png
diff --git a/lib/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png b/lollipin/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png
old mode 100755
new mode 100644
similarity index 100%
rename from lib/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png
rename to lollipin/src/main/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png
diff --git a/lib/src/main/res/drawable-xxhdpi/ic_fp_40px.png b/lollipin/src/main/res/drawable-xxhdpi/ic_fp_40px.png
similarity index 100%
rename from lib/src/main/res/drawable-xxhdpi/ic_fp_40px.png
rename to lollipin/src/main/res/drawable-xxhdpi/ic_fp_40px.png
diff --git a/lib/src/main/res/drawable-xxxhdpi/ic_backspace_grey600_24dp.png b/lollipin/src/main/res/drawable-xxxhdpi/ic_backspace_grey600_24dp.png
old mode 100755
new mode 100644
similarity index 100%
rename from lib/src/main/res/drawable-xxxhdpi/ic_backspace_grey600_24dp.png
rename to lollipin/src/main/res/drawable-xxxhdpi/ic_backspace_grey600_24dp.png
diff --git a/lib/src/main/res/drawable-xxxhdpi/ic_fp_40px.png b/lollipin/src/main/res/drawable-xxxhdpi/ic_fp_40px.png
similarity index 100%
rename from lib/src/main/res/drawable-xxxhdpi/ic_fp_40px.png
rename to lollipin/src/main/res/drawable-xxxhdpi/ic_fp_40px.png
diff --git a/lib/src/main/res/drawable/ic_fingerprint_error.xml b/lollipin/src/main/res/drawable/ic_fingerprint_error.xml
similarity index 100%
rename from lib/src/main/res/drawable/ic_fingerprint_error.xml
rename to lollipin/src/main/res/drawable/ic_fingerprint_error.xml
diff --git a/lib/src/main/res/drawable/ic_fingerprint_success.xml b/lollipin/src/main/res/drawable/ic_fingerprint_success.xml
similarity index 100%
rename from lib/src/main/res/drawable/ic_fingerprint_success.xml
rename to lollipin/src/main/res/drawable/ic_fingerprint_success.xml
diff --git a/lib/src/main/res/drawable/pin_code_round_empty.xml b/lollipin/src/main/res/drawable/pin_code_round_empty.xml
similarity index 100%
rename from lib/src/main/res/drawable/pin_code_round_empty.xml
rename to lollipin/src/main/res/drawable/pin_code_round_empty.xml
diff --git a/lib/src/main/res/drawable/pin_code_round_full.xml b/lollipin/src/main/res/drawable/pin_code_round_full.xml
similarity index 100%
rename from lib/src/main/res/drawable/pin_code_round_full.xml
rename to lollipin/src/main/res/drawable/pin_code_round_full.xml
diff --git a/lib/src/main/res/layout/activity_pin_code.xml b/lollipin/src/main/res/layout/activity_pin_code.xml
similarity index 96%
rename from lib/src/main/res/layout/activity_pin_code.xml
rename to lollipin/src/main/res/layout/activity_pin_code.xml
index 5e087a6a..2847b170 100644
--- a/lib/src/main/res/layout/activity_pin_code.xml
+++ b/lollipin/src/main/res/layout/activity_pin_code.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView 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:layout_height="match_parent"
@@ -12,8 +11,8 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        android:paddingBottom="@dimen/activity_pin_code_padding"
-        android:paddingTop="@dimen/activity_pin_code_padding">
+        android:paddingTop="@dimen/activity_pin_code_padding"
+        android:paddingBottom="@dimen/activity_pin_code_padding">
 
         <ImageView
             android:id="@+id/pin_code_logo_imageview"
@@ -40,8 +39,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/pin_code_step_textview"
-            android:layout_marginBottom="@dimen/pin_code_elements_margin"
-            android:layout_marginTop="@dimen/pin_code_round_top_margin" />
+            android:layout_marginTop="@dimen/pin_code_round_top_margin"
+            android:layout_marginBottom="@dimen/pin_code_elements_margin" />
 
         <com.github.omadahealth.typefaceview.TypefaceTextView
             android:id="@+id/pin_code_forgot_textview"
@@ -59,10 +58,10 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_below="@+id/pin_code_forgot_textview"
-            android:layout_marginBottom="@dimen/light_gray_bar_margin_bottom"
             android:layout_marginLeft="@dimen/light_gray_bar_margin_sides"
-            android:layout_marginRight="@dimen/light_gray_bar_margin_sides"
             android:layout_marginTop="@dimen/light_gray_bar_margin_top"
+            android:layout_marginRight="@dimen/light_gray_bar_margin_sides"
+            android:layout_marginBottom="@dimen/light_gray_bar_margin_bottom"
             android:background="@color/light_gray_bar"
             android:orientation="horizontal" />
 
@@ -86,8 +85,8 @@
             android:id="@+id/pin_code_fingerprint_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
             android:layout_alignParentBottom="true"
+            android:layout_centerInParent="true"
             android:maxLines="1"
             android:textColor="@color/dark_grey_color"
             android:textSize="@dimen/pin_code_forgot_text_size"
diff --git a/lib/src/main/res/layout/view_keyboard.xml b/lollipin/src/main/res/layout/view_keyboard.xml
similarity index 100%
rename from lib/src/main/res/layout/view_keyboard.xml
rename to lollipin/src/main/res/layout/view_keyboard.xml
diff --git a/lib/src/main/res/layout/view_keyboard_button.xml b/lollipin/src/main/res/layout/view_keyboard_button.xml
similarity index 100%
rename from lib/src/main/res/layout/view_keyboard_button.xml
rename to lollipin/src/main/res/layout/view_keyboard_button.xml
diff --git a/lib/src/main/res/layout/view_round.xml b/lollipin/src/main/res/layout/view_round.xml
similarity index 100%
rename from lib/src/main/res/layout/view_round.xml
rename to lollipin/src/main/res/layout/view_round.xml
diff --git a/lib/src/main/res/layout/view_round_pin_code.xml b/lollipin/src/main/res/layout/view_round_pin_code.xml
similarity index 100%
rename from lib/src/main/res/layout/view_round_pin_code.xml
rename to lollipin/src/main/res/layout/view_round_pin_code.xml
diff --git a/lib/src/main/res/values-id/strings.xml b/lollipin/src/main/res/values-id/strings.xml
similarity index 100%
rename from lib/src/main/res/values-id/strings.xml
rename to lollipin/src/main/res/values-id/strings.xml
diff --git a/lib/src/main/res/values-ko/strings.xml b/lollipin/src/main/res/values-ko/strings.xml
similarity index 100%
rename from lib/src/main/res/values-ko/strings.xml
rename to lollipin/src/main/res/values-ko/strings.xml
diff --git a/lib/src/main/res/values-pt/strings.xml b/lollipin/src/main/res/values-pt/strings.xml
similarity index 100%
rename from lib/src/main/res/values-pt/strings.xml
rename to lollipin/src/main/res/values-pt/strings.xml
diff --git a/lib/src/main/res/values-ru/strings.xml b/lollipin/src/main/res/values-ru/strings.xml
similarity index 100%
rename from lib/src/main/res/values-ru/strings.xml
rename to lollipin/src/main/res/values-ru/strings.xml
diff --git a/lib/src/main/res/values/attrs.xml b/lollipin/src/main/res/values/attrs.xml
similarity index 100%
rename from lib/src/main/res/values/attrs.xml
rename to lollipin/src/main/res/values/attrs.xml
diff --git a/lib/src/main/res/values/colors.xml b/lollipin/src/main/res/values/colors.xml
similarity index 100%
rename from lib/src/main/res/values/colors.xml
rename to lollipin/src/main/res/values/colors.xml
diff --git a/lib/src/main/res/values/dimens.xml b/lollipin/src/main/res/values/dimens.xml
similarity index 100%
rename from lib/src/main/res/values/dimens.xml
rename to lollipin/src/main/res/values/dimens.xml
diff --git a/lib/src/main/res/values/integers.xml b/lollipin/src/main/res/values/integers.xml
similarity index 100%
rename from lib/src/main/res/values/integers.xml
rename to lollipin/src/main/res/values/integers.xml
diff --git a/lib/src/main/res/values/strings.xml b/lollipin/src/main/res/values/strings.xml
similarity index 100%
rename from lib/src/main/res/values/strings.xml
rename to lollipin/src/main/res/values/strings.xml