diff --git a/.idea/misc.xml b/.idea/misc.xml
index af0bbdd..3378229 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/SampleApplication/.classpath b/SampleApplication/.classpath
deleted file mode 100644
index eb19361..0000000
--- a/SampleApplication/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/SampleApplication/.gitignore b/SampleApplication/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/SampleApplication/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/SampleApplication/.project b/SampleApplication/.project
deleted file mode 100644
index ac485d7..0000000
--- a/SampleApplication/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- app
- Project app created by Buildship.
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.buildship.core.gradleprojectbuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.buildship.core.gradleprojectnature
-
-
diff --git a/SampleApplication/.settings/org.eclipse.buildship.core.prefs b/SampleApplication/.settings/org.eclipse.buildship.core.prefs
deleted file mode 100644
index 4fded62..0000000
--- a/SampleApplication/.settings/org.eclipse.buildship.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-arguments=
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(LOCAL_INSTALLATION(L\:\\gradle-5.6.3\\bin))
-connection.project.dir=..
-eclipse.preferences.version=1
-gradle.user.home=
-java.home=C\:/Program Files/Java/jdk1.8.0_201
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true
diff --git a/SampleApplication/build.gradle b/SampleApplication/build.gradle
deleted file mode 100644
index aa5da46..0000000
--- a/SampleApplication/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
- compileSdkVersion 30
-
- defaultConfig {
- applicationId "com.zebra.emdk_deviceidentifiers_sample"
- minSdkVersion 19
- targetSdkVersion 29
- versionCode 2
- versionName "0.2"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-}
-
-dependencies {
- implementation fileTree(dir: "libs", include: ["*.jar"])
- implementation 'androidx.appcompat:appcompat:1.1.0'
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- implementation 'com.zebra.deviceidentifierswrapper:deviceidentifierswrapper:0.1'
- // implementation project(path: ':DeviceIdentifiersWrapper')
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test.ext:junit:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
-}
\ No newline at end of file
diff --git a/SampleApplication/proguard-rules.pro b/SampleApplication/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/SampleApplication/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/SampleApplication/src/main/AndroidManifest.xml b/SampleApplication/src/main/AndroidManifest.xml
deleted file mode 100644
index fe7ad1d..0000000
--- a/SampleApplication/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SampleApplication/src/main/assets/EMDKConfig.xml b/SampleApplication/src/main/assets/EMDKConfig.xml
deleted file mode 100644
index c58d843..0000000
--- a/SampleApplication/src/main/assets/EMDKConfig.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/SampleApplication/src/main/java/com/zebra/emdk_deviceidentifiers_sample/MainActivity.java b/SampleApplication/src/main/java/com/zebra/emdk_deviceidentifiers_sample/MainActivity.java
deleted file mode 100644
index 8ecdbb6..0000000
--- a/SampleApplication/src/main/java/com/zebra/emdk_deviceidentifiers_sample/MainActivity.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.zebra.emdk_deviceidentifiers_sample;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.TextView;
-
-import com.zebra.deviceidentifierswrapper.DIHelper;
-import com.zebra.deviceidentifierswrapper.IDIResultCallbacks;
-
-/**
- * Device Identifiers Sample
- *
- * Original Device Identifier Sample Code:
- * - Darryn Campbell
- * - https://github.com/darryncampbell/EMDK-DeviceIdentifiers-Sample
- *
- * Wrapper Code:
- * - Trudu Laurent
- * - https://github.com/ltrudu/DeviceIdentifiersWrapper-Sample
- *
- * (c) Zebra 2020
- */
-
-public class MainActivity extends AppCompatActivity {
-
- String TAG = "DeviceID";
-
- static String status = "";
- TextView tvStatus;
- TextView tvSerialNumber;
- TextView tvIMEI;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
-
- tvStatus = findViewById(R.id.tv_status);
- tvSerialNumber = (TextView) findViewById(R.id.txtSerialNumber);
- tvIMEI = (TextView) findViewById(R.id.txtImei);
-
- // The call is asynchronous, since we may have to register the app to
- // allow calling device identifier service, we don't wan't to get two
- // concurrent calls to it, so we will ask for the IMEI number only at
- // the end of the getSerialNumber method call (success or error)
- getSerialNumber();
- }
-
- private void getSerialNumber()
- {
- DIHelper.getSerialNumber(this, new IDIResultCallbacks() {
- @Override
- public void onSuccess(String message) {
- updateTextViewContent(tvSerialNumber, message);
- // We got the serial number, let's try the IMEI number
- getIMEINumber();
- }
-
- @Override
- public void onError(String message) {
- addMessageToStatusText(message);
- // We had an error, but we like to play, so we try the IMEI Number
- getIMEINumber();
- }
-
- @Override
- public void onDebugStatus(String message) {
- addMessageToStatusText(message);
- }
- });
- }
-
- private void getIMEINumber()
- {
- DIHelper.getIMEINumber(this, new IDIResultCallbacks() {
- @Override
- public void onSuccess(String message) {
- // We've got an IMEI number, let's update the text view
- updateTextViewContent(tvIMEI, message);
- }
-
- @Override
- public void onError(String message) {
- addMessageToStatusText(message);
- }
-
- @Override
- public void onDebugStatus(String message) {
- addMessageToStatusText(message);
- }
- });
- }
-
- private void addMessageToStatusText(String message)
- {
- status += message + "\n";
- MainActivity.this.runOnUiThread(new Runnable() {
- public void run() {
- tvStatus.setText(status);
- }
- });
- }
-
- private void updateTextViewContent(final TextView tv, final String text)
- {
- MainActivity.this.runOnUiThread(new Runnable() {
- public void run() {
- tv.setText(text);
- }
- });
- }
-}
\ No newline at end of file
diff --git a/SampleApplication/src/main/res/drawable-v24/ic_launcher_foreground.xml b/SampleApplication/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/SampleApplication/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-