diff --git a/.gitignore b/.gitignore
index d269c437..76fbda25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,55 @@ JS/jspm_packages/
 JS/staging/
 *.swp
 *.swo
+
+# Android
+.idea
+.idea/*
+.DS_Store
+/captures
+.externalNativeBuild
+
+### Android ###
+# Built application files
+*.apk
+*.ap_
+*.iml
+*.swp
+*.swo
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+Trust-strings.zip
+
+# Gradle files
+.gradle/
+/build
+app/release
+
+# Fastlane
+fastlane/report.xml
+
+# Local configuration file (sdk path, etc)
+/local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+### Android Patch ###
+gen-external-apklibs
+
+
+tn/trustnative.aar
diff --git a/TrustWeb3Provider-android/.gitignore b/TrustWeb3Provider-android/.gitignore
deleted file mode 100644
index 4f91dd6f..00000000
--- a/TrustWeb3Provider-android/.gitignore
+++ /dev/null
@@ -1,49 +0,0 @@
-.idea
-.DS_Store
-/captures
-.externalNativeBuild
-
-### Android ###
-# Built application files
-*.apk
-*.ap_
-*.iml
-*.swp
-*.swo
-
-# Files for the Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-Trust-strings.zip
-
-# Gradle files
-.gradle/
-/build
-app/release
-
-# Fastlane
-fastlane/report.xml
-
-# Local configuration file (sdk path, etc)
-/local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-### Android Patch ###
-gen-external-apklibs
-
-
-tn/trustnative.aar
diff --git a/TrustWeb3Provider-android/.idea/vcs.xml b/TrustWeb3Provider-android/.idea/vcs.xml
deleted file mode 100644
index 6c0b8635..00000000
--- a/TrustWeb3Provider-android/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/TrustWeb3Provider-android/app/.gitignore b/app/.gitignore
similarity index 100%
rename from TrustWeb3Provider-android/app/.gitignore
rename to app/.gitignore
diff --git a/TrustWeb3Provider-android/app/build.gradle b/app/build.gradle
similarity index 100%
rename from TrustWeb3Provider-android/app/build.gradle
rename to app/build.gradle
diff --git a/TrustWeb3Provider-android/app/proguard-rules.pro b/app/proguard-rules.pro
similarity index 100%
rename from TrustWeb3Provider-android/app/proguard-rules.pro
rename to app/proguard-rules.pro
diff --git a/TrustWeb3Provider-android/app/src/androidTest/java/trust/web3provider/ExampleInstrumentedTest.java b/app/src/androidTest/java/trust/web3provider/ExampleInstrumentedTest.java
similarity index 100%
rename from TrustWeb3Provider-android/app/src/androidTest/java/trust/web3provider/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/trust/web3provider/ExampleInstrumentedTest.java
diff --git a/TrustWeb3Provider-android/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/TrustWeb3Provider-android/app/src/main/java/trust/web3provider/MainActivity.java b/app/src/main/java/trust/web3provider/MainActivity.java
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/java/trust/web3provider/MainActivity.java
rename to app/src/main/java/trust/web3provider/MainActivity.java
diff --git a/TrustWeb3Provider-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/TrustWeb3Provider-android/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/drawable/ic_launcher_background.xml
rename to app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/TrustWeb3Provider-android/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_main.xml
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/TrustWeb3Provider-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/TrustWeb3Provider-android/app/src/main/res/raw/trust.js/trust-min.js b/app/src/main/res/raw/trust.js/trust-min.js
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/raw/trust.js/trust-min.js
rename to app/src/main/res/raw/trust.js/trust-min.js
diff --git a/TrustWeb3Provider-android/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/TrustWeb3Provider-android/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/TrustWeb3Provider-android/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from TrustWeb3Provider-android/app/src/main/res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/TrustWeb3Provider-android/app/src/test/java/trust/web3provider/ExampleUnitTest.java b/app/src/test/java/trust/web3provider/ExampleUnitTest.java
similarity index 100%
rename from TrustWeb3Provider-android/app/src/test/java/trust/web3provider/ExampleUnitTest.java
rename to app/src/test/java/trust/web3provider/ExampleUnitTest.java
diff --git a/TrustWeb3Provider-android/build.gradle b/build.gradle
similarity index 100%
rename from TrustWeb3Provider-android/build.gradle
rename to build.gradle
diff --git a/TrustWeb3Provider-android/gradle.properties b/gradle.properties
similarity index 100%
rename from TrustWeb3Provider-android/gradle.properties
rename to gradle.properties
diff --git a/TrustWeb3Provider-android/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from TrustWeb3Provider-android/gradle/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/TrustWeb3Provider-android/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from TrustWeb3Provider-android/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
diff --git a/TrustWeb3Provider-android/gradlew b/gradlew
similarity index 100%
rename from TrustWeb3Provider-android/gradlew
rename to gradlew
diff --git a/TrustWeb3Provider-android/gradlew.bat b/gradlew.bat
similarity index 100%
rename from TrustWeb3Provider-android/gradlew.bat
rename to gradlew.bat
diff --git a/TrustWeb3Provider-android/lib/.gitignore b/lib/.gitignore
similarity index 100%
rename from TrustWeb3Provider-android/lib/.gitignore
rename to lib/.gitignore
diff --git a/TrustWeb3Provider-android/lib/build.gradle b/lib/build.gradle
similarity index 100%
rename from TrustWeb3Provider-android/lib/build.gradle
rename to lib/build.gradle
diff --git a/TrustWeb3Provider-android/lib/proguard-rules.pro b/lib/proguard-rules.pro
similarity index 100%
rename from TrustWeb3Provider-android/lib/proguard-rules.pro
rename to lib/proguard-rules.pro
diff --git a/TrustWeb3Provider-android/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
similarity index 100%
rename from TrustWeb3Provider-android/lib/src/main/AndroidManifest.xml
rename to lib/src/main/AndroidManifest.xml
diff --git a/TrustWeb3Provider-android/lib/src/main/res/raw/trust.js b/lib/src/main/res/raw/trust.js
similarity index 100%
rename from TrustWeb3Provider-android/lib/src/main/res/raw/trust.js
rename to lib/src/main/res/raw/trust.js
diff --git a/TrustWeb3Provider-android/settings.gradle b/settings.gradle
similarity index 100%
rename from TrustWeb3Provider-android/settings.gradle
rename to settings.gradle