diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50f9f425..24ee4e7b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@
 ### BREAKING CHANGES
 
 - Plugin conversion to a [Federated Plugin](https://docs.flutter.dev/packages-and-plugins/developing-packages#federated-plugins) to better support multiple environments and implementations.
-- `web_support.js` path has been changed to `packages/flutter_inappwebview_web/assets/web/web_support.js`
+- Android package name has been changed to `com.pichillilorenzo.flutter_inappwebview_android`. References to old package name `com.pichillilorenzo.flutter_inappwebview` should be updated, for example inside `AndroidManifest.xml` file: `<provider android:name="com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFileProvider" android:authorities="${applicationId}.flutter_inappwebview_android.fileprovider" ...`
+- Web Platform: `web_support.js` file path has been changed to `packages/flutter_inappwebview_web/assets/web/web_support.js`
 
 ## 6.0.0-beta.28
 
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index bb9ccad5..cc96cd82 100755
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -70,7 +70,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.flutter_inappwebview.fileprovider"
+            android:authorities="${applicationId}.flutter_inappwebview_android.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/example/android/app/src/main/java/com/pichillilorenzo/flutterwebviewexample/EmbedderV1Activity.java b/example/android/app/src/main/java/com/pichillilorenzo/flutterwebviewexample/EmbedderV1Activity.java
index 1416a875..f87e8be1 100755
--- a/example/android/app/src/main/java/com/pichillilorenzo/flutterwebviewexample/EmbedderV1Activity.java
+++ b/example/android/app/src/main/java/com/pichillilorenzo/flutterwebviewexample/EmbedderV1Activity.java
@@ -1,7 +1,7 @@
 package com.pichillilorenzo.flutterwebviewexample;
 
 import android.os.Bundle;
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
 
 @SuppressWarnings("deprecation")
 public class EmbedderV1Activity extends io.flutter.app.FlutterActivity {
diff --git a/flutter_inappwebview_android/android/build.gradle b/flutter_inappwebview_android/android/build.gradle
index 5818c71b..2dfb9459 100755
--- a/flutter_inappwebview_android/android/build.gradle
+++ b/flutter_inappwebview_android/android/build.gradle
@@ -1,4 +1,4 @@
-group 'com.pichillilorenzo.flutter_inappwebview'
+group 'com.pichillilorenzo.flutter_inappwebview_android'
 version '1.0-SNAPSHOT'
 
 buildscript {
@@ -24,7 +24,7 @@ apply plugin: 'com.android.library'
 android {
     // Conditional for compatibility with AGP <4.2.
     if (project.android.hasProperty("namespace")) {
-        namespace 'com.pichillilorenzo.flutter_inappwebview'
+        namespace 'com.pichillilorenzo.flutter_inappwebview_android'
     }
     compileSdkVersion 33
 
diff --git a/flutter_inappwebview_android/android/proguard-rules.pro b/flutter_inappwebview_android/android/proguard-rules.pro
index eb0cfb4a..9918f23d 100755
--- a/flutter_inappwebview_android/android/proguard-rules.pro
+++ b/flutter_inappwebview_android/android/proguard-rules.pro
@@ -8,10 +8,10 @@
     public boolean *(android.webkit.WebView, java.lang.String);
     public void *(android.webkit.webView, jav.lang.String);
 }
--keepclassmembers class com.pichillilorenzo.flutter_inappwebview$JavaScriptBridgeInterface {
+-keepclassmembers class com.pichillilorenzo.flutter_inappwebview_android$JavaScriptBridgeInterface {
      <fields>;
      <methods>;
      public *;
      private *;
 }
--keep class com.pichillilorenzo.flutter_inappwebview.** { *; }
\ No newline at end of file
+-keep class com.pichillilorenzo.flutter_inappwebview_android.** { *; }
\ No newline at end of file
diff --git a/flutter_inappwebview_android/android/settings.gradle b/flutter_inappwebview_android/android/settings.gradle
index 62d7fc6d..5841fff0 100755
--- a/flutter_inappwebview_android/android/settings.gradle
+++ b/flutter_inappwebview_android/android/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'flutter_inappwebview'
+rootProject.name = 'flutter_inappwebview_android'
diff --git a/flutter_inappwebview_android/android/src/main/AndroidManifest.xml b/flutter_inappwebview_android/android/src/main/AndroidManifest.xml
index c509a1fe..c8036b21 100755
--- a/flutter_inappwebview_android/android/src/main/AndroidManifest.xml
+++ b/flutter_inappwebview_android/android/src/main/AndroidManifest.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.pichillilorenzo.flutter_inappwebview">
+    package="com.pichillilorenzo.flutter_inappwebview_android">
     <application>
         <activity
             android:theme="@style/AppTheme"
             android:exported="false"
-            android:name="com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserActivity"
+            android:name="com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density" />
         <activity
             android:theme="@style/ThemeTransparent"
             android:exported="false"
-            android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ChromeCustomTabsActivity" />
+            android:name="com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs.ChromeCustomTabsActivity" />
         <activity
             android:theme="@style/ThemeTransparent"
             android:exported="false"
-            android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.TrustedWebActivity" />
+            android:name="com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs.TrustedWebActivity" />
         <activity
             android:theme="@style/ThemeTransparent"
             android:exported="false"
-            android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ChromeCustomTabsActivitySingleInstance"
+            android:name="com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs.ChromeCustomTabsActivitySingleInstance"
             android:launchMode="singleInstance"/>
         <activity
             android:theme="@style/ThemeTransparent"
             android:exported="false"
-            android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.TrustedWebActivitySingleInstance"
+            android:name="com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs.TrustedWebActivitySingleInstance"
             android:launchMode="singleInstance"/>
         <receiver
-            android:name="com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ActionBroadcastReceiver"
+            android:name="com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs.ActionBroadcastReceiver"
             android:enabled="true"
             android:exported="false" />
         <meta-data
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/Disposable.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/Disposable.java
deleted file mode 100644
index 468ee1a5..00000000
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/Disposable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
-
-public interface Disposable {
-  void dispose();
-}
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ISettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/ISettings.java
similarity index 82%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ISettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/ISettings.java
index 82972ae3..c005c2ed 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/ISettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/ISettings.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview;
+package com.pichillilorenzo.flutter_inappwebview_android;
 
 import androidx.annotation.NonNull;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFileProvider.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/InAppWebViewFileProvider.java
similarity index 63%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFileProvider.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/InAppWebViewFileProvider.java
index 7322b8b5..3db86362 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFileProvider.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/InAppWebViewFileProvider.java
@@ -1,9 +1,9 @@
-package com.pichillilorenzo.flutter_inappwebview;
+package com.pichillilorenzo.flutter_inappwebview_android;
 
 import androidx.core.content.FileProvider;
 
 public class InAppWebViewFileProvider extends FileProvider {
 
-  public static final String fileProviderAuthorityExtension = "flutter_inappwebview.fileprovider";
+  public static final String fileProviderAuthorityExtension = "flutter_inappwebview_android.fileprovider";
 
 }
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFlutterPlugin.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/InAppWebViewFlutterPlugin.java
similarity index 86%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFlutterPlugin.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/InAppWebViewFlutterPlugin.java
index c6c6f037..56bd6ac8 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebViewFlutterPlugin.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/InAppWebViewFlutterPlugin.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview;
+package com.pichillilorenzo.flutter_inappwebview_android;
 
 import android.app.Activity;
 import android.content.Context;
@@ -7,17 +7,17 @@ import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs.ChromeSafariBrowserManager;
-import com.pichillilorenzo.flutter_inappwebview.credential_database.CredentialDatabaseHandler;
-import com.pichillilorenzo.flutter_inappwebview.headless_in_app_webview.HeadlessInAppWebViewManager;
-import com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserManager;
-import com.pichillilorenzo.flutter_inappwebview.print_job.PrintJobManager;
-import com.pichillilorenzo.flutter_inappwebview.process_global_config.ProcessGlobalConfigManager;
-import com.pichillilorenzo.flutter_inappwebview.proxy.ProxyManager;
-import com.pichillilorenzo.flutter_inappwebview.service_worker.ServiceWorkerManager;
-import com.pichillilorenzo.flutter_inappwebview.tracing.TracingControllerManager;
-import com.pichillilorenzo.flutter_inappwebview.webview.FlutterWebViewFactory;
-import com.pichillilorenzo.flutter_inappwebview.webview.InAppWebViewManager;
+import com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs.ChromeSafariBrowserManager;
+import com.pichillilorenzo.flutter_inappwebview_android.credential_database.CredentialDatabaseHandler;
+import com.pichillilorenzo.flutter_inappwebview_android.headless_in_app_webview.HeadlessInAppWebViewManager;
+import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserManager;
+import com.pichillilorenzo.flutter_inappwebview_android.print_job.PrintJobManager;
+import com.pichillilorenzo.flutter_inappwebview_android.process_global_config.ProcessGlobalConfigManager;
+import com.pichillilorenzo.flutter_inappwebview_android.proxy.ProxyManager;
+import com.pichillilorenzo.flutter_inappwebview_android.service_worker.ServiceWorkerManager;
+import com.pichillilorenzo.flutter_inappwebview_android.tracing.TracingControllerManager;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.FlutterWebViewFactory;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.InAppWebViewManager;
 
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyCookieManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/MyCookieManager.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyCookieManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/MyCookieManager.java
index d2e26a97..2b1e81e3 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyCookieManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/MyCookieManager.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview;
+package com.pichillilorenzo.flutter_inappwebview_android;
 
 import android.os.Build;
 import android.util.Log;
@@ -11,14 +11,12 @@ import androidx.annotation.Nullable;
 import androidx.webkit.CookieManagerCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
 
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyWebStorage.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/MyWebStorage.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyWebStorage.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/MyWebStorage.java
index 7e49bac8..d826b583 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyWebStorage.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/MyWebStorage.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview;
+package com.pichillilorenzo.flutter_inappwebview_android;
 
 import android.webkit.ValueCallback;
 import android.webkit.WebStorage;
@@ -6,7 +6,7 @@ import android.webkit.WebStorage;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/PlatformUtil.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/PlatformUtil.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/PlatformUtil.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/PlatformUtil.java
index 8f42e701..0ed6aa1f 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/PlatformUtil.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/PlatformUtil.java
@@ -1,11 +1,11 @@
-package com.pichillilorenzo.flutter_inappwebview;
+package com.pichillilorenzo.flutter_inappwebview_android;
 
 import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Util.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/Util.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Util.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/Util.java
index e85bb607..99205884 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/Util.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/Util.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview;
+package com.pichillilorenzo.flutter_inappwebview_android;
 
 import android.content.Context;
 import android.content.res.AssetManager;
@@ -23,8 +23,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import com.pichillilorenzo.flutter_inappwebview.types.Size2D;
-import com.pichillilorenzo.flutter_inappwebview.types.SyncBaseCallbackResultImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Size2D;
+import com.pichillilorenzo.flutter_inappwebview_android.types.SyncBaseCallbackResultImpl;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/WebViewFeatureManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/WebViewFeatureManager.java
similarity index 91%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/WebViewFeatureManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/WebViewFeatureManager.java
index 212e7a4f..f72c03c0 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/WebViewFeatureManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/WebViewFeatureManager.java
@@ -1,10 +1,10 @@
-package com.pichillilorenzo.flutter_inappwebview;
+package com.pichillilorenzo.flutter_inappwebview_android;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
 
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ActionBroadcastReceiver.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ActionBroadcastReceiver.java
similarity index 95%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ActionBroadcastReceiver.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ActionBroadcastReceiver.java
index abc5b31d..cf160c71 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ActionBroadcastReceiver.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ActionBroadcastReceiver.java
@@ -1,10 +1,9 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 
 import androidx.browser.customtabs.CustomTabsIntent;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsActivity.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsActivity.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsActivity.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsActivity.java
index c3aa5e2d..9cf0b9fe 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsActivity.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsActivity.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -9,7 +9,6 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.RemoteException;
 import android.widget.RemoteViews;
 
 import androidx.annotation.CallSuper;
@@ -22,19 +21,18 @@ import androidx.browser.customtabs.CustomTabsService;
 import androidx.browser.customtabs.CustomTabsSession;
 import androidx.browser.customtabs.EngagementSignalsCallback;
 
-import com.pichillilorenzo.flutter_inappwebview.R;
-import com.pichillilorenzo.flutter_inappwebview.types.AndroidResource;
-import com.pichillilorenzo.flutter_inappwebview.types.CustomTabsActionButton;
-import com.pichillilorenzo.flutter_inappwebview.types.CustomTabsMenuItem;
-import com.pichillilorenzo.flutter_inappwebview.types.CustomTabsSecondaryToolbar;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.R;
+import com.pichillilorenzo.flutter_inappwebview_android.types.AndroidResource;
+import com.pichillilorenzo.flutter_inappwebview_android.types.CustomTabsActionButton;
+import com.pichillilorenzo.flutter_inappwebview_android.types.CustomTabsMenuItem;
+import com.pichillilorenzo.flutter_inappwebview_android.types.CustomTabsSecondaryToolbar;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import io.flutter.Log;
 import io.flutter.plugin.common.MethodChannel;
 
 public class ChromeCustomTabsActivity extends Activity implements Disposable {
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsActivitySingleInstance.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsActivitySingleInstance.java
similarity index 69%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsActivitySingleInstance.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsActivitySingleInstance.java
index 8554edac..73d6de79 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsActivitySingleInstance.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsActivitySingleInstance.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 public class ChromeCustomTabsActivitySingleInstance extends ChromeCustomTabsActivity {
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsChannelDelegate.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsChannelDelegate.java
index aabfb159..511768db 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsChannelDelegate.java
@@ -1,20 +1,17 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.RemoteException;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.browser.customtabs.CustomTabsService;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.CustomTabsActionButton;
-import com.pichillilorenzo.flutter_inappwebview.types.CustomTabsSecondaryToolbar;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.CustomTabsSecondaryToolbar;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsSettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsSettings.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsSettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsSettings.java
index 8be604a0..b512cf48 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeCustomTabsSettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeCustomTabsSettings.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import android.content.Intent;
 
@@ -8,8 +8,8 @@ import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.browser.trusted.ScreenOrientation;
 import androidx.browser.trusted.TrustedWebActivityDisplayMode;
 
-import com.pichillilorenzo.flutter_inappwebview.ISettings;
-import com.pichillilorenzo.flutter_inappwebview.types.AndroidResource;
+import com.pichillilorenzo.flutter_inappwebview_android.ISettings;
+import com.pichillilorenzo.flutter_inappwebview_android.types.AndroidResource;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeSafariBrowserManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeSafariBrowserManager.java
similarity index 93%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeSafariBrowserManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeSafariBrowserManager.java
index 768d1b51..1fab2799 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ChromeSafariBrowserManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ChromeSafariBrowserManager.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -8,10 +8,9 @@ import androidx.annotation.Nullable;
 import androidx.browser.customtabs.CustomTabsClient;
 import androidx.browser.customtabs.CustomTabsIntent;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.headless_in_app_webview.HeadlessInAppWebView;
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/CustomTabActivityHelper.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/CustomTabActivityHelper.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/CustomTabActivityHelper.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/CustomTabActivityHelper.java
index 75964cc6..61d759c8 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/CustomTabActivityHelper.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/CustomTabActivityHelper.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/CustomTabsHelper.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/CustomTabsHelper.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/CustomTabsHelper.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/CustomTabsHelper.java
index f49e3470..6e3a216b 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/CustomTabsHelper.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/CustomTabsHelper.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/KeepAliveService.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/KeepAliveService.java
similarity index 84%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/KeepAliveService.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/KeepAliveService.java
index b1302f99..87dc3af8 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/KeepAliveService.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/KeepAliveService.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ServiceConnection.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ServiceConnection.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ServiceConnection.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ServiceConnection.java
index 33c3058f..de236154 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ServiceConnection.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ServiceConnection.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import android.content.ComponentName;
 import androidx.browser.customtabs.CustomTabsClient;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ServiceConnectionCallback.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ServiceConnectionCallback.java
similarity index 85%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ServiceConnectionCallback.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ServiceConnectionCallback.java
index 6f792300..3212b2f6 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/ServiceConnectionCallback.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/ServiceConnectionCallback.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import androidx.browser.customtabs.CustomTabsClient;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/TrustedWebActivity.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/TrustedWebActivity.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/TrustedWebActivity.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/TrustedWebActivity.java
index 2b1dff68..d5f70156 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/TrustedWebActivity.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/TrustedWebActivity.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 import android.content.Intent;
 import android.graphics.Color;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/TrustedWebActivitySingleInstance.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/TrustedWebActivitySingleInstance.java
similarity index 67%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/TrustedWebActivitySingleInstance.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/TrustedWebActivitySingleInstance.java
index 15017510..d77c6782 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/chrome_custom_tabs/TrustedWebActivitySingleInstance.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/chrome_custom_tabs/TrustedWebActivitySingleInstance.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.chrome_custom_tabs;
+package com.pichillilorenzo.flutter_inappwebview_android.chrome_custom_tabs;
 
 public class TrustedWebActivitySingleInstance extends TrustedWebActivity {
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlocker.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlocker.java
similarity index 95%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlocker.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlocker.java
index 21c4af73..55421962 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlocker.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlocker.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.content_blocker;
+package com.pichillilorenzo.flutter_inappwebview_android.content_blocker;
 
 import androidx.annotation.NonNull;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerAction.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerAction.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerAction.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerAction.java
index 072413c0..1c2f38b1 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerAction.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerAction.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.content_blocker;
+package com.pichillilorenzo.flutter_inappwebview_android.content_blocker;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerActionType.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerActionType.java
similarity index 91%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerActionType.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerActionType.java
index 8ed16c8f..89825a21 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerActionType.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerActionType.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.content_blocker;
+package com.pichillilorenzo.flutter_inappwebview_android.content_blocker;
 
 public enum ContentBlockerActionType {
     BLOCK ("block"),
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerHandler.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerHandler.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerHandler.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerHandler.java
index b159173a..9e622897 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerHandler.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerHandler.java
@@ -1,17 +1,16 @@
-package com.pichillilorenzo.flutter_inappwebview.content_blocker;
+package com.pichillilorenzo.flutter_inappwebview_android.content_blocker;
 
 import android.os.Build;
 import android.os.Handler;
 import android.text.TextUtils;
-import android.util.Log;
 import android.webkit.WebResourceResponse;
 
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceRequestExt;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceRequestExt;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebView;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerTrigger.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerTrigger.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerTrigger.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerTrigger.java
index f47ea7b5..8efb3c07 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerTrigger.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerTrigger.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.content_blocker;
+package com.pichillilorenzo.flutter_inappwebview_android.content_blocker;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerTriggerResourceType.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerTriggerResourceType.java
similarity index 92%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerTriggerResourceType.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerTriggerResourceType.java
index 0f63196d..25eb60b5 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/content_blocker/ContentBlockerTriggerResourceType.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/content_blocker/ContentBlockerTriggerResourceType.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.content_blocker;
+package com.pichillilorenzo.flutter_inappwebview_android.content_blocker;
 
 public enum ContentBlockerTriggerResourceType {
     DOCUMENT ("document"),
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/CredentialDatabase.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/CredentialDatabase.java
similarity index 93%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/CredentialDatabase.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/CredentialDatabase.java
index c85a4d60..5d83b7e6 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/CredentialDatabase.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/CredentialDatabase.java
@@ -1,9 +1,9 @@
-package com.pichillilorenzo.flutter_inappwebview.credential_database;
+package com.pichillilorenzo.flutter_inappwebview_android.credential_database;
 
 import android.content.Context;
 
-import com.pichillilorenzo.flutter_inappwebview.types.URLCredential;
-import com.pichillilorenzo.flutter_inappwebview.types.URLProtectionSpace;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLCredential;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLProtectionSpace;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/CredentialDatabaseHandler.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/CredentialDatabaseHandler.java
similarity index 93%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/CredentialDatabaseHandler.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/CredentialDatabaseHandler.java
index eb1df65d..23052a18 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/CredentialDatabaseHandler.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/CredentialDatabaseHandler.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.credential_database;
+package com.pichillilorenzo.flutter_inappwebview_android.credential_database;
 
 import android.os.Build;
 import android.webkit.WebViewDatabase;
@@ -7,10 +7,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.URLCredential;
-import com.pichillilorenzo.flutter_inappwebview.types.URLProtectionSpace;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLCredential;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLProtectionSpace;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/CredentialDatabaseHelper.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/CredentialDatabaseHelper.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/CredentialDatabaseHelper.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/CredentialDatabaseHelper.java
index 3a0abc11..ff67e280 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/CredentialDatabaseHelper.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/CredentialDatabaseHelper.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.credential_database;
+package com.pichillilorenzo.flutter_inappwebview_android.credential_database;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLCredentialContract.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLCredentialContract.java
similarity index 86%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLCredentialContract.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLCredentialContract.java
index 1b301970..d837b557 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLCredentialContract.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLCredentialContract.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.credential_database;
+package com.pichillilorenzo.flutter_inappwebview_android.credential_database;
 
 import android.provider.BaseColumns;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLCredentialDao.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLCredentialDao.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLCredentialDao.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLCredentialDao.java
index 7f299cac..2c39a41e 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLCredentialDao.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLCredentialDao.java
@@ -1,9 +1,9 @@
-package com.pichillilorenzo.flutter_inappwebview.credential_database;
+package com.pichillilorenzo.flutter_inappwebview_android.credential_database;
 
 import android.content.ContentValues;
 import android.database.Cursor;
 
-import com.pichillilorenzo.flutter_inappwebview.types.URLCredential;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLCredential;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLProtectionSpaceContract.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLProtectionSpaceContract.java
similarity index 87%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLProtectionSpaceContract.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLProtectionSpaceContract.java
index 0d1e73d9..347ab5fd 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLProtectionSpaceContract.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLProtectionSpaceContract.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.credential_database;
+package com.pichillilorenzo.flutter_inappwebview_android.credential_database;
 
 import android.provider.BaseColumns;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLProtectionSpaceDao.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLProtectionSpaceDao.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLProtectionSpaceDao.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLProtectionSpaceDao.java
index d23644cc..db85276f 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/credential_database/URLProtectionSpaceDao.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/credential_database/URLProtectionSpaceDao.java
@@ -1,10 +1,10 @@
-package com.pichillilorenzo.flutter_inappwebview.credential_database;
+package com.pichillilorenzo.flutter_inappwebview_android.credential_database;
 
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.pichillilorenzo.flutter_inappwebview.types.URLProtectionSpace;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLProtectionSpace;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/find_interaction/FindInteractionChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/find_interaction/FindInteractionChannelDelegate.java
similarity index 92%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/find_interaction/FindInteractionChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/find_interaction/FindInteractionChannelDelegate.java
index 530ec760..a0be164c 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/find_interaction/FindInteractionChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/find_interaction/FindInteractionChannelDelegate.java
@@ -1,10 +1,10 @@
-package com.pichillilorenzo.flutter_inappwebview.find_interaction;
+package com.pichillilorenzo.flutter_inappwebview_android.find_interaction;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.FindSession;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.FindSession;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/find_interaction/FindInteractionController.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/find_interaction/FindInteractionController.java
similarity index 82%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/find_interaction/FindInteractionController.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/find_interaction/FindInteractionController.java
index 2628ef31..64f93427 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/find_interaction/FindInteractionController.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/find_interaction/FindInteractionController.java
@@ -1,12 +1,12 @@
-package com.pichillilorenzo.flutter_inappwebview.find_interaction;
+package com.pichillilorenzo.flutter_inappwebview_android.find_interaction;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
-import com.pichillilorenzo.flutter_inappwebview.types.FindSession;
-import com.pichillilorenzo.flutter_inappwebview.webview.InAppWebViewInterface;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.types.FindSession;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.InAppWebViewInterface;
 
 import io.flutter.plugin.common.MethodChannel;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/find_interaction/FindInteractionSettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/find_interaction/FindInteractionSettings.java
similarity index 85%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/find_interaction/FindInteractionSettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/find_interaction/FindInteractionSettings.java
index 621f3c1b..1b4d0c6a 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/find_interaction/FindInteractionSettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/find_interaction/FindInteractionSettings.java
@@ -1,9 +1,8 @@
-package com.pichillilorenzo.flutter_inappwebview.find_interaction;
+package com.pichillilorenzo.flutter_inappwebview_android.find_interaction;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.ISettings;
+import com.pichillilorenzo.flutter_inappwebview_android.ISettings;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessInAppWebView.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/headless_in_app_webview/HeadlessInAppWebView.java
similarity index 92%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessInAppWebView.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/headless_in_app_webview/HeadlessInAppWebView.java
index bbac9f45..129c1925 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessInAppWebView.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/headless_in_app_webview/HeadlessInAppWebView.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.headless_in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.headless_in_app_webview;
 
 import android.app.Activity;
 import android.view.View;
@@ -8,11 +8,11 @@ import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
-import com.pichillilorenzo.flutter_inappwebview.types.Size2D;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.FlutterWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Size2D;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.FlutterWebView;
 
 import java.util.Map;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessInAppWebViewManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/headless_in_app_webview/HeadlessInAppWebViewManager.java
similarity index 90%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessInAppWebViewManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/headless_in_app_webview/HeadlessInAppWebViewManager.java
index c5175950..619e174f 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessInAppWebViewManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/headless_in_app_webview/HeadlessInAppWebViewManager.java
@@ -19,16 +19,16 @@
  *
  */
 
-package com.pichillilorenzo.flutter_inappwebview.headless_in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.headless_in_app_webview;
 
 import android.content.Context;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.NonNull;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.FlutterWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.FlutterWebView;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessWebViewChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/headless_in_app_webview/HeadlessWebViewChannelDelegate.java
similarity index 88%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessWebViewChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/headless_in_app_webview/HeadlessWebViewChannelDelegate.java
index 5a31ff3f..96d922c3 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/headless_in_app_webview/HeadlessWebViewChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/headless_in_app_webview/HeadlessWebViewChannelDelegate.java
@@ -1,10 +1,10 @@
-package com.pichillilorenzo.flutter_inappwebview.headless_in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.headless_in_app_webview;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.Size2D;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Size2D;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/ActivityResultListener.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/ActivityResultListener.java
similarity index 73%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/ActivityResultListener.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/ActivityResultListener.java
index 92665260..a50f333d 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/ActivityResultListener.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/ActivityResultListener.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.in_app_browser;
+package com.pichillilorenzo.flutter_inappwebview_android.in_app_browser;
 
 import android.content.Intent;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserActivity.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserActivity.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserActivity.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserActivity.java
index 9f9c5aea..94f997e5 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserActivity.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserActivity.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.in_app_browser;
+package com.pichillilorenzo.flutter_inappwebview_android.in_app_browser;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -25,20 +25,20 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.menu.MenuBuilder;
 
-import com.pichillilorenzo.flutter_inappwebview.R;
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.find_interaction.FindInteractionController;
-import com.pichillilorenzo.flutter_inappwebview.pull_to_refresh.PullToRefreshChannelDelegate;
-import com.pichillilorenzo.flutter_inappwebview.pull_to_refresh.PullToRefreshLayout;
-import com.pichillilorenzo.flutter_inappwebview.pull_to_refresh.PullToRefreshSettings;
-import com.pichillilorenzo.flutter_inappwebview.types.AndroidResource;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
-import com.pichillilorenzo.flutter_inappwebview.types.InAppBrowserMenuItem;
-import com.pichillilorenzo.flutter_inappwebview.types.URLRequest;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScript;
-import com.pichillilorenzo.flutter_inappwebview.webview.WebViewChannelDelegate;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebViewSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.R;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.find_interaction.FindInteractionController;
+import com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh.PullToRefreshChannelDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh.PullToRefreshLayout;
+import com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh.PullToRefreshSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.types.AndroidResource;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.types.InAppBrowserMenuItem;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLRequest;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScript;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.WebViewChannelDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebViewSettings;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserChannelDelegate.java
similarity index 80%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserChannelDelegate.java
index 4976d6e6..7f4ec377 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserChannelDelegate.java
@@ -1,9 +1,9 @@
-package com.pichillilorenzo.flutter_inappwebview.in_app_browser;
+package com.pichillilorenzo.flutter_inappwebview_android.in_app_browser;
 
 import androidx.annotation.NonNull;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.InAppBrowserMenuItem;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.InAppBrowserMenuItem;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserDelegate.java
similarity index 86%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserDelegate.java
index a7bb8b2a..514866ff 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserDelegate.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.in_app_browser;
+package com.pichillilorenzo.flutter_inappwebview_android.in_app_browser;
 
 import android.app.Activity;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserManager.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserManager.java
index 15985036..b2d648ea 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserManager.java
@@ -19,7 +19,7 @@
  *
  */
 
-package com.pichillilorenzo.flutter_inappwebview.in_app_browser;
+package com.pichillilorenzo.flutter_inappwebview_android.in_app_browser;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -35,8 +35,8 @@ import android.webkit.MimeTypeMap;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserSettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserSettings.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserSettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserSettings.java
index c002f4c4..bdec8217 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/in_app_browser/InAppBrowserSettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/in_app_browser/InAppBrowserSettings.java
@@ -1,10 +1,10 @@
-package com.pichillilorenzo.flutter_inappwebview.in_app_browser;
+package com.pichillilorenzo.flutter_inappwebview_android.in_app_browser;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.ISettings;
-import com.pichillilorenzo.flutter_inappwebview.R;
+import com.pichillilorenzo.flutter_inappwebview_android.ISettings;
+import com.pichillilorenzo.flutter_inappwebview_android.R;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/ConsoleLogJS.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/ConsoleLogJS.java
similarity index 86%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/ConsoleLogJS.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/ConsoleLogJS.java
index 69323cb9..479f89bd 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/ConsoleLogJS.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/ConsoleLogJS.java
@@ -1,7 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js;
+package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js;
 
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
 
 public class ConsoleLogJS {
   public static final String CONSOLE_LOG_JS_PLUGIN_SCRIPT_GROUP_NAME = "IN_APP_WEBVIEW_CONSOLE_LOG_JS_PLUGIN_SCRIPT";
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/InterceptAjaxRequestJS.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/InterceptAjaxRequestJS.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/InterceptAjaxRequestJS.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/InterceptAjaxRequestJS.java
index f4a0dfa2..c36bf256 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/InterceptAjaxRequestJS.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/InterceptAjaxRequestJS.java
@@ -1,7 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js;
+package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js;
 
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
 
 public class InterceptAjaxRequestJS {
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/InterceptFetchRequestJS.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/InterceptFetchRequestJS.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/InterceptFetchRequestJS.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/InterceptFetchRequestJS.java
index 3555228c..eebff12c 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/InterceptFetchRequestJS.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/InterceptFetchRequestJS.java
@@ -1,7 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js;
+package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js;
 
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
 
 public class InterceptFetchRequestJS {
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/JavaScriptBridgeJS.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/JavaScriptBridgeJS.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/JavaScriptBridgeJS.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/JavaScriptBridgeJS.java
index cfdf656d..ad79b6a5 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/JavaScriptBridgeJS.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/JavaScriptBridgeJS.java
@@ -1,7 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js;
+package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js;
 
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
 
 public class JavaScriptBridgeJS {
   public static final String JAVASCRIPT_BRIDGE_NAME = "flutter_inappwebview";
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/OnLoadResourceJS.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/OnLoadResourceJS.java
similarity index 87%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/OnLoadResourceJS.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/OnLoadResourceJS.java
index 1b93e0cd..b386bd7d 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/OnLoadResourceJS.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/OnLoadResourceJS.java
@@ -1,7 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js;
+package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js;
 
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
 
 public class OnLoadResourceJS {
   public static final String ON_LOAD_RESOURCE_JS_PLUGIN_SCRIPT_GROUP_NAME = "IN_APP_WEBVIEW_ON_LOAD_RESOURCE_JS_PLUGIN_SCRIPT";
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/OnWindowBlurEventJS.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/OnWindowBlurEventJS.java
similarity index 77%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/OnWindowBlurEventJS.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/OnWindowBlurEventJS.java
index f5e095b4..746f8782 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/OnWindowBlurEventJS.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/OnWindowBlurEventJS.java
@@ -1,7 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js;
+package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js;
 
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
 
 public class OnWindowBlurEventJS {
   public static final String ON_WINDOW_BLUR_EVENT_JS_PLUGIN_SCRIPT_GROUP_NAME = "IN_APP_WEBVIEW_ON_WINDOW_BLUR_EVENT_JS_PLUGIN_SCRIPT";
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/OnWindowFocusEventJS.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/OnWindowFocusEventJS.java
similarity index 77%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/OnWindowFocusEventJS.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/OnWindowFocusEventJS.java
index f1aa8feb..cfdae9a2 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/OnWindowFocusEventJS.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/OnWindowFocusEventJS.java
@@ -1,7 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js;
+package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js;
 
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
 
 public class OnWindowFocusEventJS {
   public static final String ON_WINDOW_FOCUS_EVENT_JS_PLUGIN_SCRIPT_GROUP_NAME = "IN_APP_WEBVIEW_ON_WINDOW_FOCUS_EVENT_JS_PLUGIN_SCRIPT";
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/PluginScriptsUtil.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/PluginScriptsUtil.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/PluginScriptsUtil.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/PluginScriptsUtil.java
index c3358ea5..e00820d3 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/PluginScriptsUtil.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/PluginScriptsUtil.java
@@ -1,8 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js;
+package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js;
 
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserContentController;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
 
 public class PluginScriptsUtil {
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/PrintJS.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/PrintJS.java
similarity index 76%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/PrintJS.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/PrintJS.java
index c35a258e..bb108481 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/PrintJS.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/PrintJS.java
@@ -1,7 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js;
+package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js;
 
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
 
 public class PrintJS {
   public static final String PRINT_JS_PLUGIN_SCRIPT_GROUP_NAME = "IN_APP_WEBVIEW_PRINT_JS_PLUGIN_SCRIPT";
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/PromisePolyfillJS.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/PromisePolyfillJS.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/PromisePolyfillJS.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/PromisePolyfillJS.java
index bc3618f7..af10c5d8 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/plugin_scripts_js/PromisePolyfillJS.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/PromisePolyfillJS.java
@@ -1,7 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js;
+package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js;
 
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
 
 public class PromisePolyfillJS {
   public static final String PROMISE_POLYFILL_JS_PLUGIN_SCRIPT_GROUP_NAME = "IN_APP_WEBVIEW_PROMISE_POLYFILL_JS_PLUGIN_SCRIPT";
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobChannelDelegate.java
similarity index 88%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobChannelDelegate.java
index 0984174b..1a216567 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobChannelDelegate.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.print_job;
+package com.pichillilorenzo.flutter_inappwebview_android.print_job;
 
 import android.os.Build;
 
@@ -6,8 +6,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.PrintJobInfoExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PrintJobInfoExt;
 
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobController.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobController.java
similarity index 88%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobController.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobController.java
index b5c6a521..2283e44f 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobController.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobController.java
@@ -1,15 +1,14 @@
-package com.pichillilorenzo.flutter_inappwebview.print_job;
+package com.pichillilorenzo.flutter_inappwebview_android.print_job;
 
 import android.os.Build;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
-import com.pichillilorenzo.flutter_inappwebview.types.PrintJobInfoExt;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PrintJobInfoExt;
 
 import io.flutter.plugin.common.MethodChannel;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobManager.java
similarity index 88%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobManager.java
index 13efa7e2..581130c7 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobManager.java
@@ -19,7 +19,7 @@
  *
  */
 
-package com.pichillilorenzo.flutter_inappwebview.print_job;
+package com.pichillilorenzo.flutter_inappwebview_android.print_job;
 
 import android.os.Build;
 
@@ -27,8 +27,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobSettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobSettings.java
similarity index 90%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobSettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobSettings.java
index 25464c04..7df47bbb 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/print_job/PrintJobSettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/print_job/PrintJobSettings.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.print_job;
+package com.pichillilorenzo.flutter_inappwebview_android.print_job;
 
 import android.os.Build;
 
@@ -6,9 +6,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import com.pichillilorenzo.flutter_inappwebview.ISettings;
-import com.pichillilorenzo.flutter_inappwebview.types.MediaSizeExt;
-import com.pichillilorenzo.flutter_inappwebview.types.ResolutionExt;
+import com.pichillilorenzo.flutter_inappwebview_android.ISettings;
+import com.pichillilorenzo.flutter_inappwebview_android.types.MediaSizeExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ResolutionExt;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/process_global_config/ProcessGlobalConfigManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/process_global_config/ProcessGlobalConfigManager.java
similarity index 79%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/process_global_config/ProcessGlobalConfigManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/process_global_config/ProcessGlobalConfigManager.java
index d87244cd..a69c6b1a 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/process_global_config/ProcessGlobalConfigManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/process_global_config/ProcessGlobalConfigManager.java
@@ -1,13 +1,11 @@
-package com.pichillilorenzo.flutter_inappwebview.process_global_config;
+package com.pichillilorenzo.flutter_inappwebview_android.process_global_config;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.webkit.ProcessGlobalConfig;
-import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.pull_to_refresh.PullToRefreshSettings;
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
 
 import java.util.Map;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/process_global_config/ProcessGlobalConfigSettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/process_global_config/ProcessGlobalConfigSettings.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/process_global_config/ProcessGlobalConfigSettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/process_global_config/ProcessGlobalConfigSettings.java
index d8b70752..0736be34 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/process_global_config/ProcessGlobalConfigSettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/process_global_config/ProcessGlobalConfigSettings.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.process_global_config;
+package com.pichillilorenzo.flutter_inappwebview_android.process_global_config;
 
 import android.content.Context;
 
@@ -7,7 +7,7 @@ import androidx.annotation.Nullable;
 import androidx.webkit.ProcessGlobalConfig;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.ISettings;
+import com.pichillilorenzo.flutter_inappwebview_android.ISettings;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/proxy/ProxyManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/proxy/ProxyManager.java
similarity index 92%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/proxy/ProxyManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/proxy/ProxyManager.java
index 16e609ae..a576cfe7 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/proxy/ProxyManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/proxy/ProxyManager.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.proxy;
+package com.pichillilorenzo.flutter_inappwebview_android.proxy;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -6,9 +6,9 @@ import androidx.webkit.ProxyConfig;
 import androidx.webkit.ProxyController;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.ProxyRuleExt;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ProxyRuleExt;
 
 import java.util.HashMap;
 import java.util.concurrent.Executor;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/proxy/ProxySettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/proxy/ProxySettings.java
similarity index 93%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/proxy/ProxySettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/proxy/ProxySettings.java
index 953834d2..4834131f 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/proxy/ProxySettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/proxy/ProxySettings.java
@@ -1,10 +1,10 @@
-package com.pichillilorenzo.flutter_inappwebview.proxy;
+package com.pichillilorenzo.flutter_inappwebview_android.proxy;
 
 import androidx.annotation.NonNull;
 import androidx.webkit.ProxyConfig;
 
-import com.pichillilorenzo.flutter_inappwebview.ISettings;
-import com.pichillilorenzo.flutter_inappwebview.types.ProxyRuleExt;
+import com.pichillilorenzo.flutter_inappwebview_android.ISettings;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ProxyRuleExt;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/pull_to_refresh/PullToRefreshChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/pull_to_refresh/PullToRefreshChannelDelegate.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/pull_to_refresh/PullToRefreshChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/pull_to_refresh/PullToRefreshChannelDelegate.java
index ffb5e656..8ec3eb57 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/pull_to_refresh/PullToRefreshChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/pull_to_refresh/PullToRefreshChannelDelegate.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.pull_to_refresh;
+package com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh;
 
 import android.graphics.Color;
 
@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/pull_to_refresh/PullToRefreshLayout.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/pull_to_refresh/PullToRefreshLayout.java
similarity index 89%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/pull_to_refresh/PullToRefreshLayout.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/pull_to_refresh/PullToRefreshLayout.java
index 28e172f6..dfbc0bfd 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/pull_to_refresh/PullToRefreshLayout.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/pull_to_refresh/PullToRefreshLayout.java
@@ -1,20 +1,17 @@
-package com.pichillilorenzo.flutter_inappwebview.pull_to_refresh;
+package com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh;
 
 import android.content.Context;
 import android.graphics.Color;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
-
-import java.util.Arrays;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebView;
 
 import io.flutter.plugin.common.MethodChannel;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/pull_to_refresh/PullToRefreshSettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/pull_to_refresh/PullToRefreshSettings.java
similarity index 93%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/pull_to_refresh/PullToRefreshSettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/pull_to_refresh/PullToRefreshSettings.java
index e7cad855..866ed890 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/pull_to_refresh/PullToRefreshSettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/pull_to_refresh/PullToRefreshSettings.java
@@ -1,9 +1,9 @@
-package com.pichillilorenzo.flutter_inappwebview.pull_to_refresh;
+package com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.ISettings;
+import com.pichillilorenzo.flutter_inappwebview_android.ISettings;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/service_worker/ServiceWorkerChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/service_worker/ServiceWorkerChannelDelegate.java
similarity index 90%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/service_worker/ServiceWorkerChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/service_worker/ServiceWorkerChannelDelegate.java
index 9a6ff479..19a4ea38 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/service_worker/ServiceWorkerChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/service_worker/ServiceWorkerChannelDelegate.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.service_worker;
+package com.pichillilorenzo.flutter_inappwebview_android.service_worker;
 
 import android.os.Build;
 
@@ -9,12 +9,12 @@ import androidx.webkit.ServiceWorkerControllerCompat;
 import androidx.webkit.ServiceWorkerWebSettingsCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.types.BaseCallbackResultImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.SyncBaseCallbackResultImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceRequestExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceResponseExt;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.types.BaseCallbackResultImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.SyncBaseCallbackResultImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceRequestExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceResponseExt;
 
 import java.util.Map;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/service_worker/ServiceWorkerManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/service_worker/ServiceWorkerManager.java
similarity index 90%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/service_worker/ServiceWorkerManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/service_worker/ServiceWorkerManager.java
index 567e593a..932e988a 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/service_worker/ServiceWorkerManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/service_worker/ServiceWorkerManager.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.service_worker;
+package com.pichillilorenzo.flutter_inappwebview_android.service_worker;
 
 import android.os.Build;
 import android.webkit.WebResourceRequest;
@@ -11,10 +11,10 @@ import androidx.webkit.ServiceWorkerClientCompat;
 import androidx.webkit.ServiceWorkerControllerCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceRequestExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceResponseExt;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceRequestExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceResponseExt;
 
 import java.io.ByteArrayInputStream;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/tracing/TracingControllerChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/tracing/TracingControllerChannelDelegate.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/tracing/TracingControllerChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/tracing/TracingControllerChannelDelegate.java
index 92293875..e6b957a5 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/tracing/TracingControllerChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/tracing/TracingControllerChannelDelegate.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.tracing;
+package com.pichillilorenzo.flutter_inappwebview_android.tracing;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -6,7 +6,7 @@ import androidx.webkit.TracingConfig;
 import androidx.webkit.TracingController;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/tracing/TracingControllerManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/tracing/TracingControllerManager.java
similarity index 88%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/tracing/TracingControllerManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/tracing/TracingControllerManager.java
index 80595c99..6c48c5bb 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/tracing/TracingControllerManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/tracing/TracingControllerManager.java
@@ -1,13 +1,12 @@
-package com.pichillilorenzo.flutter_inappwebview.tracing;
+package com.pichillilorenzo.flutter_inappwebview_android.tracing;
 
 import androidx.annotation.Nullable;
-import androidx.webkit.ProxyController;
 import androidx.webkit.TracingConfig;
 import androidx.webkit.TracingController;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
 
 import io.flutter.plugin.common.MethodChannel;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/tracing/TracingSettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/tracing/TracingSettings.java
similarity index 91%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/tracing/TracingSettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/tracing/TracingSettings.java
index fd434799..bcf0bd55 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/tracing/TracingSettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/tracing/TracingSettings.java
@@ -1,10 +1,10 @@
-package com.pichillilorenzo.flutter_inappwebview.tracing;
+package com.pichillilorenzo.flutter_inappwebview_android.tracing;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.webkit.TracingController;
 
-import com.pichillilorenzo.flutter_inappwebview.ISettings;
+import com.pichillilorenzo.flutter_inappwebview_android.ISettings;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/AndroidResource.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/AndroidResource.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/AndroidResource.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/AndroidResource.java
index 86353dee..6db0d083 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/AndroidResource.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/AndroidResource.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.content.Context;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/BaseCallbackResultImpl.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/BaseCallbackResultImpl.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/BaseCallbackResultImpl.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/BaseCallbackResultImpl.java
index 4a31fdfb..bd23e53a 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/BaseCallbackResultImpl.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/BaseCallbackResultImpl.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ChannelDelegateImpl.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ChannelDelegateImpl.java
similarity index 92%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ChannelDelegateImpl.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ChannelDelegateImpl.java
index adeada5c..450a61b0 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ChannelDelegateImpl.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ChannelDelegateImpl.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ClientCertChallenge.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ClientCertChallenge.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ClientCertChallenge.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ClientCertChallenge.java
index adba57b0..1bb5afeb 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ClientCertChallenge.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ClientCertChallenge.java
@@ -1,11 +1,10 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ClientCertResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ClientCertResponse.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ClientCertResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ClientCertResponse.java
index ba604dcb..cbd4349d 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ClientCertResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ClientCertResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ContentWorld.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ContentWorld.java
similarity index 95%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ContentWorld.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ContentWorld.java
index f10a8e58..8c1fd25a 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ContentWorld.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ContentWorld.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CreateWindowAction.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CreateWindowAction.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CreateWindowAction.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CreateWindowAction.java
index 6a1703e0..d12b225f 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CreateWindowAction.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CreateWindowAction.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import java.util.Map;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomSchemeResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomSchemeResponse.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomSchemeResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomSchemeResponse.java
index 05d3e737..50bac102 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomSchemeResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomSchemeResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomTabsActionButton.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomTabsActionButton.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomTabsActionButton.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomTabsActionButton.java
index b95b764c..b408d32f 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomTabsActionButton.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomTabsActionButton.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomTabsMenuItem.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomTabsMenuItem.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomTabsMenuItem.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomTabsMenuItem.java
index c00b4da0..34cf9970 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomTabsMenuItem.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomTabsMenuItem.java
@@ -1,9 +1,8 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import java.util.Arrays;
 import java.util.Map;
 
 public class CustomTabsMenuItem {
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomTabsSecondaryToolbar.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomTabsSecondaryToolbar.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomTabsSecondaryToolbar.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomTabsSecondaryToolbar.java
index 6a21267d..7db298ec 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/CustomTabsSecondaryToolbar.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/CustomTabsSecondaryToolbar.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/Disposable.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/Disposable.java
new file mode 100644
index 00000000..0cd54c0d
--- /dev/null
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/Disposable.java
@@ -0,0 +1,5 @@
+package com.pichillilorenzo.flutter_inappwebview_android.types;
+
+public interface Disposable {
+  void dispose();
+}
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/DownloadStartRequest.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/DownloadStartRequest.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/DownloadStartRequest.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/DownloadStartRequest.java
index 504fb693..3dd8d3b1 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/DownloadStartRequest.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/DownloadStartRequest.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/FindSession.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/FindSession.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/FindSession.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/FindSession.java
index 5e5ddea4..a4df7d73 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/FindSession.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/FindSession.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/GeolocationPermissionShowPromptResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/GeolocationPermissionShowPromptResponse.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/GeolocationPermissionShowPromptResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/GeolocationPermissionShowPromptResponse.java
index 4ec0a321..14340e9a 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/GeolocationPermissionShowPromptResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/GeolocationPermissionShowPromptResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/HitTestResult.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/HitTestResult.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/HitTestResult.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/HitTestResult.java
index 058fd442..87615fa5 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/HitTestResult.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/HitTestResult.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.webkit.WebView;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/HttpAuthResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/HttpAuthResponse.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/HttpAuthResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/HttpAuthResponse.java
index 06a0ba4a..123a1b02 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/HttpAuthResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/HttpAuthResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/HttpAuthenticationChallenge.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/HttpAuthenticationChallenge.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/HttpAuthenticationChallenge.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/HttpAuthenticationChallenge.java
index a365528c..66edfa4a 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/HttpAuthenticationChallenge.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/HttpAuthenticationChallenge.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ICallbackResult.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ICallbackResult.java
similarity index 84%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ICallbackResult.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ICallbackResult.java
index af515221..02515fca 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ICallbackResult.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ICallbackResult.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/IChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/IChannelDelegate.java
similarity index 77%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/IChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/IChannelDelegate.java
index b050788a..4d1ca8f8 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/IChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/IChannelDelegate.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/InAppBrowserMenuItem.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/InAppBrowserMenuItem.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/InAppBrowserMenuItem.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/InAppBrowserMenuItem.java
index b975da11..85bba6e3 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/InAppBrowserMenuItem.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/InAppBrowserMenuItem.java
@@ -1,9 +1,9 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsAlertResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsAlertResponse.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsAlertResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsAlertResponse.java
index da4ddb14..6f3f0925 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsAlertResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsAlertResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsBeforeUnloadResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsBeforeUnloadResponse.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsBeforeUnloadResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsBeforeUnloadResponse.java
index 75a5d163..ead00e00 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsBeforeUnloadResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsBeforeUnloadResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsConfirmResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsConfirmResponse.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsConfirmResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsConfirmResponse.java
index 4b8916ea..af65e41a 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsConfirmResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsConfirmResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsPromptResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsPromptResponse.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsPromptResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsPromptResponse.java
index f7146c20..fb63aef7 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/JsPromptResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/JsPromptResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/MarginsExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/MarginsExt.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/MarginsExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/MarginsExt.java
index 1af1ce8b..161254d5 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/MarginsExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/MarginsExt.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.os.Build;
 import android.print.PrintAttributes;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/MediaSizeExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/MediaSizeExt.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/MediaSizeExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/MediaSizeExt.java
index 552d71f6..cd2618f2 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/MediaSizeExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/MediaSizeExt.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.os.Build;
 import android.print.PrintAttributes;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/NavigationAction.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/NavigationAction.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/NavigationAction.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/NavigationAction.java
index c6e6fef8..faf5e596 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/NavigationAction.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/NavigationAction.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/NavigationActionPolicy.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/NavigationActionPolicy.java
similarity index 91%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/NavigationActionPolicy.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/NavigationActionPolicy.java
index cae8c91a..c6e0fbba 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/NavigationActionPolicy.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/NavigationActionPolicy.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 public enum NavigationActionPolicy {
   CANCEL(0),
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PermissionResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PermissionResponse.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PermissionResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PermissionResponse.java
index 9b38c9da..f3848dd7 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PermissionResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PermissionResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PluginScript.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PluginScript.java
similarity index 95%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PluginScript.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PluginScript.java
index b0ee99ff..b16f2280 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PluginScript.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PluginScript.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PreferredContentModeOptionType.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PreferredContentModeOptionType.java
similarity index 90%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PreferredContentModeOptionType.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PreferredContentModeOptionType.java
index a284c69c..bb5bfa0a 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PreferredContentModeOptionType.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PreferredContentModeOptionType.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 public enum PreferredContentModeOptionType {
   RECOMMENDED (0),
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PrintAttributesExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PrintAttributesExt.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PrintAttributesExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PrintAttributesExt.java
index afbce7b2..77b65528 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PrintAttributesExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PrintAttributesExt.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.os.Build;
 import android.print.PrintAttributes;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PrintJobInfoExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PrintJobInfoExt.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PrintJobInfoExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PrintJobInfoExt.java
index 8c1305b0..e58d851a 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/PrintJobInfoExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/PrintJobInfoExt.java
@@ -1,7 +1,6 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.os.Build;
-import android.print.PrintAttributes;
 import android.print.PrintJobInfo;
 
 import androidx.annotation.NonNull;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ProxyRuleExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ProxyRuleExt.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ProxyRuleExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ProxyRuleExt.java
index 25ec9fd9..52081a38 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ProxyRuleExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ProxyRuleExt.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ResolutionExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ResolutionExt.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ResolutionExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ResolutionExt.java
index f4dffe8c..daca1117 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ResolutionExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ResolutionExt.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.os.Build;
 import android.print.PrintAttributes;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SafeBrowsingResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SafeBrowsingResponse.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SafeBrowsingResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SafeBrowsingResponse.java
index 73b2fa85..765fe258 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SafeBrowsingResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SafeBrowsingResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ServerTrustAuthResponse.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ServerTrustAuthResponse.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ServerTrustAuthResponse.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ServerTrustAuthResponse.java
index 5568dff0..eebf7bd9 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ServerTrustAuthResponse.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ServerTrustAuthResponse.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ServerTrustChallenge.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ServerTrustChallenge.java
similarity index 81%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ServerTrustChallenge.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ServerTrustChallenge.java
index c7212c27..17616453 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/ServerTrustChallenge.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/ServerTrustChallenge.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 public class ServerTrustChallenge extends URLAuthenticationChallenge {
   public ServerTrustChallenge(URLProtectionSpace protectionSpace) {
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/Size2D.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/Size2D.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/Size2D.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/Size2D.java
index 2956a91c..da512690 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/Size2D.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/Size2D.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SslCertificateExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SslCertificateExt.java
similarity index 95%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SslCertificateExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SslCertificateExt.java
index e8736b24..32087459 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SslCertificateExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SslCertificateExt.java
@@ -1,11 +1,11 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.net.http.SslCertificate;
 import android.os.Build;
 
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
 
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SslErrorExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SslErrorExt.java
similarity index 95%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SslErrorExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SslErrorExt.java
index 6e4c22bc..f8831320 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SslErrorExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SslErrorExt.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.net.http.SslCertificate;
 import android.net.http.SslError;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SyncBaseCallbackResultImpl.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SyncBaseCallbackResultImpl.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SyncBaseCallbackResultImpl.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SyncBaseCallbackResultImpl.java
index a9d65884..1fd2ee7e 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/SyncBaseCallbackResultImpl.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/SyncBaseCallbackResultImpl.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLAuthenticationChallenge.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLAuthenticationChallenge.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLAuthenticationChallenge.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLAuthenticationChallenge.java
index 4348f6c4..7d015071 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLAuthenticationChallenge.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLAuthenticationChallenge.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLCredential.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLCredential.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLCredential.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLCredential.java
index 4804b41b..0bf72519 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLCredential.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLCredential.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLProtectionSpace.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLProtectionSpace.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLProtectionSpace.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLProtectionSpace.java
index 89b39537..a27e97fe 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLProtectionSpace.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLProtectionSpace.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.net.http.SslCertificate;
 import android.net.http.SslError;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLRequest.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLRequest.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLRequest.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLRequest.java
index 986a96cc..d9d598d2 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/URLRequest.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/URLRequest.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/UserContentController.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/UserContentController.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/UserContentController.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/UserContentController.java
index 9218b355..f51dd1b9 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/UserContentController.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/UserContentController.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
@@ -10,9 +10,9 @@ import androidx.webkit.ScriptHandler;
 import androidx.webkit.WebViewCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.PluginScriptsUtil;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.PluginScriptsUtil;
 
 import org.json.JSONObject;
 
@@ -25,8 +25,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import io.flutter.Log;
-
 @SuppressLint("RestrictedApi")
 public class UserContentController implements Disposable {
   protected static final String LOG_TAG = "UserContentController";
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/UserScript.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/UserScript.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/UserScript.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/UserScript.java
index 2b03effa..1f8e5604 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/UserScript.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/UserScript.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/UserScriptInjectionTime.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/UserScriptInjectionTime.java
similarity index 90%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/UserScriptInjectionTime.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/UserScriptInjectionTime.java
index 2ead9b8b..bfceeb85 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/UserScriptInjectionTime.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/UserScriptInjectionTime.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 public enum UserScriptInjectionTime {
   AT_DOCUMENT_START (0),
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessage.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessage.java
similarity index 85%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessage.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessage.java
index 497c3ca3..21ed0f03 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessage.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessage.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.Nullable;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessageCompatExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessageCompatExt.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessageCompatExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessageCompatExt.java
index fca69bb8..b635b3c4 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessageCompatExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessageCompatExt.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessagePort.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessagePort.java
similarity index 92%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessagePort.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessagePort.java
index 2684fd39..a9b6cdf2 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessagePort.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessagePort.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.text.TextUtils;
 import android.webkit.ValueCallback;
@@ -6,10 +6,10 @@ import android.webkit.ValueCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.webview.InAppWebViewInterface;
-import com.pichillilorenzo.flutter_inappwebview.webview.web_message.WebMessageChannel;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.InAppWebViewInterface;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.web_message.WebMessageChannel;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessagePortCompatExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessagePortCompatExt.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessagePortCompatExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessagePortCompatExt.java
index db7c3b49..a03e4d65 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebMessagePortCompatExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebMessagePortCompatExt.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebResourceErrorExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebResourceErrorExt.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebResourceErrorExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebResourceErrorExt.java
index 007f26d6..bf23cc73 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebResourceErrorExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebResourceErrorExt.java
@@ -1,8 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.os.Build;
 import android.webkit.WebResourceError;
-import android.webkit.WebView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebResourceRequestExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebResourceRequestExt.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebResourceRequestExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebResourceRequestExt.java
index f866c78c..b33d8072 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebResourceRequestExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebResourceRequestExt.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.os.Build;
 import android.webkit.WebResourceRequest;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebResourceResponseExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebResourceResponseExt.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebResourceResponseExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebResourceResponseExt.java
index e867a2c4..824ccc0f 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebResourceResponseExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebResourceResponseExt.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.os.Build;
 import android.webkit.WebResourceResponse;
@@ -6,7 +6,7 @@ import android.webkit.WebResourceResponse;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebViewAssetLoaderExt.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebViewAssetLoaderExt.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebViewAssetLoaderExt.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebViewAssetLoaderExt.java
index a41d08b6..c15cfa5f 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/types/WebViewAssetLoaderExt.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/types/WebViewAssetLoaderExt.java
@@ -1,16 +1,15 @@
-package com.pichillilorenzo.flutter_inappwebview.types;
+package com.pichillilorenzo.flutter_inappwebview_android.types;
 
 import android.content.Context;
 import android.os.Build;
-import android.util.Log;
 import android.webkit.WebResourceResponse;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.webkit.WebViewAssetLoader;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/ContextMenuSettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/ContextMenuSettings.java
similarity index 89%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/ContextMenuSettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/ContextMenuSettings.java
index 825513f1..fb0f1946 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/ContextMenuSettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/ContextMenuSettings.java
@@ -1,8 +1,8 @@
-package com.pichillilorenzo.flutter_inappwebview.webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview;
 
 import androidx.annotation.NonNull;
 
-import com.pichillilorenzo.flutter_inappwebview.ISettings;
+import com.pichillilorenzo.flutter_inappwebview_android.ISettings;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/FlutterWebViewFactory.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/FlutterWebViewFactory.java
similarity index 85%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/FlutterWebViewFactory.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/FlutterWebViewFactory.java
index ec89937b..6acd91e4 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/FlutterWebViewFactory.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/FlutterWebViewFactory.java
@@ -1,13 +1,13 @@
-package com.pichillilorenzo.flutter_inappwebview.webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview;
 
 import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.headless_in_app_webview.HeadlessInAppWebView;
-import com.pichillilorenzo.flutter_inappwebview.headless_in_app_webview.HeadlessInAppWebViewManager;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.FlutterWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.headless_in_app_webview.HeadlessInAppWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.headless_in_app_webview.HeadlessInAppWebViewManager;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.FlutterWebView;
 
 import java.util.HashMap;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/InAppWebViewInterface.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/InAppWebViewInterface.java
similarity index 80%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/InAppWebViewInterface.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/InAppWebViewInterface.java
index 60bf917d..ece31292 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/InAppWebViewInterface.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/InAppWebViewInterface.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview;
 
 import android.content.Context;
 import android.net.Uri;
@@ -10,16 +10,16 @@ import android.webkit.WebView;
 
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserDelegate;
-import com.pichillilorenzo.flutter_inappwebview.print_job.PrintJobSettings;
-import com.pichillilorenzo.flutter_inappwebview.types.ContentWorld;
-import com.pichillilorenzo.flutter_inappwebview.types.HitTestResult;
-import com.pichillilorenzo.flutter_inappwebview.types.URLRequest;
-import com.pichillilorenzo.flutter_inappwebview.types.UserContentController;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebViewSettings;
-import com.pichillilorenzo.flutter_inappwebview.webview.web_message.WebMessageChannel;
-import com.pichillilorenzo.flutter_inappwebview.webview.web_message.WebMessageListener;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.print_job.PrintJobSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ContentWorld;
+import com.pichillilorenzo.flutter_inappwebview_android.types.HitTestResult;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLRequest;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserContentController;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebViewSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.web_message.WebMessageChannel;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.web_message.WebMessageListener;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -92,7 +92,7 @@ public interface InAppWebViewInterface {
   WebMessageChannel createCompatWebMessageChannel();
   WebMessageChannel createWebMessageChannel(ValueCallback<WebMessageChannel> callback);
   void postWebMessage(WebMessage message, Uri targetOrigin);
-  void postWebMessage(com.pichillilorenzo.flutter_inappwebview.types.WebMessage message, Uri targetOrigin, ValueCallback<String> callback) throws Exception;
+  void postWebMessage(com.pichillilorenzo.flutter_inappwebview_android.types.WebMessage message, Uri targetOrigin, ValueCallback<String> callback) throws Exception;
   void addWebMessageListener(WebMessageListener webMessageListener) throws Exception;
   boolean canScrollVertically();
   boolean canScrollHorizontally();
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/InAppWebViewManager.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/InAppWebViewManager.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/InAppWebViewManager.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/InAppWebViewManager.java
index 8e5e7f0c..98280fc5 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/InAppWebViewManager.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/InAppWebViewManager.java
@@ -1,8 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Message;
 import android.view.View;
@@ -16,10 +15,9 @@ import androidx.annotation.Nullable;
 import androidx.webkit.WebViewCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.headless_in_app_webview.HeadlessInAppWebView;
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.FlutterWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.FlutterWebView;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/JavaScriptBridgeInterface.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/JavaScriptBridgeInterface.java
similarity index 91%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/JavaScriptBridgeInterface.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/JavaScriptBridgeInterface.java
index bfe947f9..a805b519 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/JavaScriptBridgeInterface.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/JavaScriptBridgeInterface.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview;
 
 import android.os.Build;
 import android.os.Handler;
@@ -9,13 +9,10 @@ import android.webkit.ValueCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.print_job.PrintJobController;
-import com.pichillilorenzo.flutter_inappwebview.print_job.PrintJobManager;
-import com.pichillilorenzo.flutter_inappwebview.print_job.PrintJobSettings;
-import com.pichillilorenzo.flutter_inappwebview.webview.WebViewChannelDelegate;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebViewChromeClient;
+import com.pichillilorenzo.flutter_inappwebview_android.print_job.PrintJobController;
+import com.pichillilorenzo.flutter_inappwebview_android.print_job.PrintJobSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/PlatformWebView.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/PlatformWebView.java
similarity index 74%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/PlatformWebView.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/PlatformWebView.java
index a756ec4b..93ae83fa 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/PlatformWebView.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/PlatformWebView.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview;
 
 import java.util.HashMap;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/WebViewChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/WebViewChannelDelegate.java
similarity index 92%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/WebViewChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/WebViewChannelDelegate.java
index 6324159f..cb1baacd 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/WebViewChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/WebViewChannelDelegate.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview;
 
 import android.net.Uri;
 import android.os.Build;
@@ -12,47 +12,46 @@ import androidx.webkit.WebMessagePortCompat;
 import androidx.webkit.WebViewCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.find_interaction.FindInteractionChannelDelegate;
-import com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserActivity;
-import com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserSettings;
-import com.pichillilorenzo.flutter_inappwebview.print_job.PrintJobSettings;
-import com.pichillilorenzo.flutter_inappwebview.types.BaseCallbackResultImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.ClientCertChallenge;
-import com.pichillilorenzo.flutter_inappwebview.types.ClientCertResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.ContentWorld;
-import com.pichillilorenzo.flutter_inappwebview.types.CreateWindowAction;
-import com.pichillilorenzo.flutter_inappwebview.types.CustomSchemeResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.DownloadStartRequest;
-import com.pichillilorenzo.flutter_inappwebview.types.GeolocationPermissionShowPromptResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.HitTestResult;
-import com.pichillilorenzo.flutter_inappwebview.types.HttpAuthResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.HttpAuthenticationChallenge;
-import com.pichillilorenzo.flutter_inappwebview.types.JsAlertResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.JsBeforeUnloadResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.JsConfirmResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.JsPromptResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.NavigationAction;
-import com.pichillilorenzo.flutter_inappwebview.types.NavigationActionPolicy;
-import com.pichillilorenzo.flutter_inappwebview.types.PermissionResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.SafeBrowsingResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.ServerTrustAuthResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.ServerTrustChallenge;
-import com.pichillilorenzo.flutter_inappwebview.types.SslCertificateExt;
-import com.pichillilorenzo.flutter_inappwebview.types.SyncBaseCallbackResultImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.URLRequest;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScript;
-import com.pichillilorenzo.flutter_inappwebview.types.WebMessageCompatExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebMessagePort;
-import com.pichillilorenzo.flutter_inappwebview.types.WebMessagePortCompatExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceErrorExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceRequestExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceResponseExt;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebViewSettings;
-import com.pichillilorenzo.flutter_inappwebview.webview.web_message.WebMessageChannel;
-import com.pichillilorenzo.flutter_inappwebview.webview.web_message.WebMessageListener;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.find_interaction.FindInteractionChannelDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserActivity;
+import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.print_job.PrintJobSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.types.BaseCallbackResultImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ClientCertChallenge;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ClientCertResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ContentWorld;
+import com.pichillilorenzo.flutter_inappwebview_android.types.CreateWindowAction;
+import com.pichillilorenzo.flutter_inappwebview_android.types.CustomSchemeResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.DownloadStartRequest;
+import com.pichillilorenzo.flutter_inappwebview_android.types.GeolocationPermissionShowPromptResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.HitTestResult;
+import com.pichillilorenzo.flutter_inappwebview_android.types.HttpAuthResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.HttpAuthenticationChallenge;
+import com.pichillilorenzo.flutter_inappwebview_android.types.JsAlertResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.JsBeforeUnloadResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.JsConfirmResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.JsPromptResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.NavigationAction;
+import com.pichillilorenzo.flutter_inappwebview_android.types.NavigationActionPolicy;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PermissionResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.SafeBrowsingResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ServerTrustAuthResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ServerTrustChallenge;
+import com.pichillilorenzo.flutter_inappwebview_android.types.SslCertificateExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.SyncBaseCallbackResultImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLRequest;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebMessageCompatExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebMessagePortCompatExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceErrorExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceRequestExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceResponseExt;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebViewSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.web_message.WebMessageChannel;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.web_message.WebMessageListener;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/WebViewChannelDelegateMethods.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/WebViewChannelDelegateMethods.java
similarity index 95%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/WebViewChannelDelegateMethods.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/WebViewChannelDelegateMethods.java
index d87954f6..049a6a59 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/WebViewChannelDelegateMethods.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/WebViewChannelDelegateMethods.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview;
 
 public enum WebViewChannelDelegateMethods {
   getUrl,
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/DisplayListenerProxy.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/DisplayListenerProxy.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/DisplayListenerProxy.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/DisplayListenerProxy.java
index eb92c83f..ebe487ef 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/DisplayListenerProxy.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/DisplayListenerProxy.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview;
 
 import static android.hardware.display.DisplayManager.DisplayListener;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/FlutterWebView.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/FlutterWebView.java
similarity index 88%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/FlutterWebView.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/FlutterWebView.java
index e2f5153c..b7666768 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/FlutterWebView.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/FlutterWebView.java
@@ -1,32 +1,26 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.hardware.display.DisplayManager;
-import android.os.Build;
 import android.os.Message;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
 import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.webkit.WebViewCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.find_interaction.FindInteractionController;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
-import com.pichillilorenzo.flutter_inappwebview.pull_to_refresh.PullToRefreshLayout;
-import com.pichillilorenzo.flutter_inappwebview.pull_to_refresh.PullToRefreshSettings;
-import com.pichillilorenzo.flutter_inappwebview.webview.PlatformWebView;
-import com.pichillilorenzo.flutter_inappwebview.types.URLRequest;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScript;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.find_interaction.FindInteractionController;
+import com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh.PullToRefreshLayout;
+import com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh.PullToRefreshSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.PlatformWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLRequest;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScript;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebView.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebView.java
similarity index 95%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebView.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebView.java
index 0d10d254..dd56b1d8 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebView.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebView.java
@@ -1,7 +1,7 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview;
 
 import static android.content.Context.INPUT_METHOD_SERVICE;
-import static com.pichillilorenzo.flutter_inappwebview.types.PreferredContentModeOptionType.fromValue;
+import static com.pichillilorenzo.flutter_inappwebview_android.types.PreferredContentModeOptionType.fromValue;
 
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
@@ -62,42 +62,42 @@ import androidx.webkit.WebSettingsCompat;
 import androidx.webkit.WebViewCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.R;
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.content_blocker.ContentBlocker;
-import com.pichillilorenzo.flutter_inappwebview.content_blocker.ContentBlockerAction;
-import com.pichillilorenzo.flutter_inappwebview.content_blocker.ContentBlockerHandler;
-import com.pichillilorenzo.flutter_inappwebview.content_blocker.ContentBlockerTrigger;
-import com.pichillilorenzo.flutter_inappwebview.find_interaction.FindInteractionController;
-import com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserDelegate;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.ConsoleLogJS;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.InterceptAjaxRequestJS;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.InterceptFetchRequestJS;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.OnLoadResourceJS;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.OnWindowBlurEventJS;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.OnWindowFocusEventJS;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.PluginScriptsUtil;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.PrintJS;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.PromisePolyfillJS;
-import com.pichillilorenzo.flutter_inappwebview.print_job.PrintJobController;
-import com.pichillilorenzo.flutter_inappwebview.print_job.PrintJobSettings;
-import com.pichillilorenzo.flutter_inappwebview.pull_to_refresh.PullToRefreshLayout;
-import com.pichillilorenzo.flutter_inappwebview.types.ContentWorld;
-import com.pichillilorenzo.flutter_inappwebview.types.DownloadStartRequest;
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.PreferredContentModeOptionType;
-import com.pichillilorenzo.flutter_inappwebview.types.URLRequest;
-import com.pichillilorenzo.flutter_inappwebview.types.UserContentController;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScript;
-import com.pichillilorenzo.flutter_inappwebview.types.WebViewAssetLoaderExt;
-import com.pichillilorenzo.flutter_inappwebview.webview.ContextMenuSettings;
-import com.pichillilorenzo.flutter_inappwebview.webview.InAppWebViewInterface;
-import com.pichillilorenzo.flutter_inappwebview.webview.JavaScriptBridgeInterface;
-import com.pichillilorenzo.flutter_inappwebview.webview.WebViewChannelDelegate;
-import com.pichillilorenzo.flutter_inappwebview.webview.web_message.WebMessageChannel;
-import com.pichillilorenzo.flutter_inappwebview.webview.web_message.WebMessageListener;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.R;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.content_blocker.ContentBlocker;
+import com.pichillilorenzo.flutter_inappwebview_android.content_blocker.ContentBlockerAction;
+import com.pichillilorenzo.flutter_inappwebview_android.content_blocker.ContentBlockerHandler;
+import com.pichillilorenzo.flutter_inappwebview_android.content_blocker.ContentBlockerTrigger;
+import com.pichillilorenzo.flutter_inappwebview_android.find_interaction.FindInteractionController;
+import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.ConsoleLogJS;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.InterceptAjaxRequestJS;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.InterceptFetchRequestJS;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.OnLoadResourceJS;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.OnWindowBlurEventJS;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.OnWindowFocusEventJS;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.PluginScriptsUtil;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.PrintJS;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.PromisePolyfillJS;
+import com.pichillilorenzo.flutter_inappwebview_android.print_job.PrintJobController;
+import com.pichillilorenzo.flutter_inappwebview_android.print_job.PrintJobSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh.PullToRefreshLayout;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ContentWorld;
+import com.pichillilorenzo.flutter_inappwebview_android.types.DownloadStartRequest;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PreferredContentModeOptionType;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLRequest;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserContentController;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebViewAssetLoaderExt;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.ContextMenuSettings;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.InAppWebViewInterface;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.JavaScriptBridgeInterface;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.WebViewChannelDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.web_message.WebMessageChannel;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.web_message.WebMessageListener;
 
 import org.json.JSONObject;
 
@@ -108,7 +108,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
@@ -551,8 +550,8 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
     setOnLongClickListener(new OnLongClickListener() {
       @Override
       public boolean onLongClick(View v) {
-        com.pichillilorenzo.flutter_inappwebview.types.HitTestResult hitTestResult =
-                com.pichillilorenzo.flutter_inappwebview.types.HitTestResult.fromWebViewHitTestResult(getHitTestResult());
+        com.pichillilorenzo.flutter_inappwebview_android.types.HitTestResult hitTestResult =
+                com.pichillilorenzo.flutter_inappwebview_android.types.HitTestResult.fromWebViewHitTestResult(getHitTestResult());
         if (channelDelegate != null) channelDelegate.onLongPressHitTestResult(hitTestResult);
         return false;
       }
@@ -1461,8 +1460,8 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
   }
 
   private void sendOnCreateContextMenuEvent() {
-    com.pichillilorenzo.flutter_inappwebview.types.HitTestResult hitTestResult =
-            com.pichillilorenzo.flutter_inappwebview.types.HitTestResult.fromWebViewHitTestResult(getHitTestResult());
+    com.pichillilorenzo.flutter_inappwebview_android.types.HitTestResult hitTestResult =
+            com.pichillilorenzo.flutter_inappwebview_android.types.HitTestResult.fromWebViewHitTestResult(getHitTestResult());
     if (channelDelegate != null) channelDelegate.onCreateContextMenu(hitTestResult);
   }
 
@@ -1911,7 +1910,7 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
   }
 
   @Override
-  public void postWebMessage(com.pichillilorenzo.flutter_inappwebview.types.WebMessage message, Uri targetOrigin, ValueCallback<String> callback) throws Exception {
+  public void postWebMessage(com.pichillilorenzo.flutter_inappwebview_android.types.WebMessage message, Uri targetOrigin, ValueCallback<String> callback) throws Exception {
     throw new UnsupportedOperationException();
   }
 
@@ -1997,8 +1996,8 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
   }
 
   @Override
-  public void getHitTestResult(ValueCallback<com.pichillilorenzo.flutter_inappwebview.types.HitTestResult> callback) {
-    callback.onReceiveValue(com.pichillilorenzo.flutter_inappwebview.types.HitTestResult.fromWebViewHitTestResult(getHitTestResult()));
+  public void getHitTestResult(ValueCallback<com.pichillilorenzo.flutter_inappwebview_android.types.HitTestResult> callback) {
+    callback.onReceiveValue(com.pichillilorenzo.flutter_inappwebview_android.types.HitTestResult.fromWebViewHitTestResult(getHitTestResult()));
   }
 
   @Nullable
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewChromeClient.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewChromeClient.java
similarity index 96%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewChromeClient.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewChromeClient.java
index 75f1fcf5..6940eafd 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewChromeClient.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewChromeClient.java
@@ -1,9 +1,8 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview;
 
 import android.Manifest;
 import android.annotation.TargetApi;
 import android.app.Activity;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -20,7 +19,6 @@ import android.os.Parcelable;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -36,8 +34,6 @@ import android.webkit.WebView;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -46,19 +42,19 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFileProvider;
-import com.pichillilorenzo.flutter_inappwebview.types.CreateWindowAction;
-import com.pichillilorenzo.flutter_inappwebview.in_app_browser.ActivityResultListener;
-import com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserDelegate;
-import com.pichillilorenzo.flutter_inappwebview.InAppWebViewFlutterPlugin;
-import com.pichillilorenzo.flutter_inappwebview.types.GeolocationPermissionShowPromptResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.JsAlertResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.JsBeforeUnloadResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.JsConfirmResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.JsPromptResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.PermissionResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.URLRequest;
-import com.pichillilorenzo.flutter_inappwebview.webview.WebViewChannelDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFileProvider;
+import com.pichillilorenzo.flutter_inappwebview_android.types.CreateWindowAction;
+import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.ActivityResultListener;
+import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFlutterPlugin;
+import com.pichillilorenzo.flutter_inappwebview_android.types.GeolocationPermissionShowPromptResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.JsAlertResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.JsBeforeUnloadResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.JsConfirmResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.JsPromptResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PermissionResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLRequest;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.WebViewChannelDelegate;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -66,9 +62,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 import io.flutter.plugin.common.PluginRegistry;
 
@@ -1200,9 +1194,18 @@ public class InAppWebViewChromeClient extends WebChromeClient implements PluginR
     // for versions 6.0+ (23) we use the FileProvider to avoid runtime permissions
     String fileProviderAuthority = activity.getApplicationContext().getPackageName() + "." +
             InAppWebViewFileProvider.fileProviderAuthorityExtension;
-    return FileProvider.getUriForFile(activity.getApplicationContext(),
-            fileProviderAuthority,
-            capturedFile);
+    try {
+      return FileProvider.getUriForFile(activity.getApplicationContext(),
+              fileProviderAuthority,
+              capturedFile);
+    } catch (Exception e) {
+      e.printStackTrace();
+      String errorMessage = e.getMessage();
+      if (errorMessage != null) {
+        Log.e(LOG_TAG, errorMessage);
+      }
+    }
+    return null;
   }
 
   @Nullable
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewClient.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewClient.java
similarity index 93%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewClient.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewClient.java
index 7e52593c..ba2ba48c 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewClient.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewClient.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -29,26 +29,26 @@ import androidx.annotation.RequiresApi;
 import androidx.webkit.WebResourceRequestCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.credential_database.CredentialDatabase;
-import com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserDelegate;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
-import com.pichillilorenzo.flutter_inappwebview.types.ClientCertChallenge;
-import com.pichillilorenzo.flutter_inappwebview.types.ClientCertResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.CustomSchemeResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.HttpAuthResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.HttpAuthenticationChallenge;
-import com.pichillilorenzo.flutter_inappwebview.types.NavigationAction;
-import com.pichillilorenzo.flutter_inappwebview.types.NavigationActionPolicy;
-import com.pichillilorenzo.flutter_inappwebview.types.ServerTrustAuthResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.ServerTrustChallenge;
-import com.pichillilorenzo.flutter_inappwebview.types.URLCredential;
-import com.pichillilorenzo.flutter_inappwebview.types.URLProtectionSpace;
-import com.pichillilorenzo.flutter_inappwebview.types.URLRequest;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceErrorExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceRequestExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceResponseExt;
-import com.pichillilorenzo.flutter_inappwebview.webview.WebViewChannelDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.credential_database.CredentialDatabase;
+import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ClientCertChallenge;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ClientCertResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.CustomSchemeResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.HttpAuthResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.HttpAuthenticationChallenge;
+import com.pichillilorenzo.flutter_inappwebview_android.types.NavigationAction;
+import com.pichillilorenzo.flutter_inappwebview_android.types.NavigationActionPolicy;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ServerTrustAuthResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ServerTrustChallenge;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLCredential;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLProtectionSpace;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLRequest;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceErrorExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceRequestExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceResponseExt;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.WebViewChannelDelegate;
 
 import java.io.ByteArrayInputStream;
 import java.net.URI;
@@ -588,7 +588,7 @@ public class InAppWebViewClient extends WebViewClient {
     final InAppWebView webView = (InAppWebView) view;
     final WebViewChannelDelegate.SafeBrowsingHitCallback resultCallback = new WebViewChannelDelegate.SafeBrowsingHitCallback() {
       @Override
-      public boolean nonNullSuccess(@NonNull com.pichillilorenzo.flutter_inappwebview.types.SafeBrowsingResponse response) {
+      public boolean nonNullSuccess(@NonNull com.pichillilorenzo.flutter_inappwebview_android.types.SafeBrowsingResponse response) {
         Integer action = response.getAction();
         if (action != null) {
           boolean report = response.isReport();
@@ -611,7 +611,7 @@ public class InAppWebViewClient extends WebViewClient {
       }
 
       @Override
-      public void defaultBehaviour(@Nullable com.pichillilorenzo.flutter_inappwebview.types.SafeBrowsingResponse result) {
+      public void defaultBehaviour(@Nullable com.pichillilorenzo.flutter_inappwebview_android.types.SafeBrowsingResponse result) {
         InAppWebViewClient.super.onSafeBrowsingHit(view, request, threatType, callback);
       }
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewClientCompat.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewClientCompat.java
similarity index 93%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewClientCompat.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewClientCompat.java
index 64d858b4..2c4e0201 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewClientCompat.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewClientCompat.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -29,26 +29,26 @@ import androidx.webkit.WebResourceRequestCompat;
 import androidx.webkit.WebViewClientCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.credential_database.CredentialDatabase;
-import com.pichillilorenzo.flutter_inappwebview.in_app_browser.InAppBrowserDelegate;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
-import com.pichillilorenzo.flutter_inappwebview.types.ClientCertChallenge;
-import com.pichillilorenzo.flutter_inappwebview.types.ClientCertResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.CustomSchemeResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.HttpAuthResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.HttpAuthenticationChallenge;
-import com.pichillilorenzo.flutter_inappwebview.types.NavigationAction;
-import com.pichillilorenzo.flutter_inappwebview.types.NavigationActionPolicy;
-import com.pichillilorenzo.flutter_inappwebview.types.ServerTrustAuthResponse;
-import com.pichillilorenzo.flutter_inappwebview.types.ServerTrustChallenge;
-import com.pichillilorenzo.flutter_inappwebview.types.URLCredential;
-import com.pichillilorenzo.flutter_inappwebview.types.URLProtectionSpace;
-import com.pichillilorenzo.flutter_inappwebview.types.URLRequest;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceErrorExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceRequestExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebResourceResponseExt;
-import com.pichillilorenzo.flutter_inappwebview.webview.WebViewChannelDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.credential_database.CredentialDatabase;
+import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ClientCertChallenge;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ClientCertResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.CustomSchemeResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.HttpAuthResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.HttpAuthenticationChallenge;
+import com.pichillilorenzo.flutter_inappwebview_android.types.NavigationAction;
+import com.pichillilorenzo.flutter_inappwebview_android.types.NavigationActionPolicy;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ServerTrustAuthResponse;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ServerTrustChallenge;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLCredential;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLProtectionSpace;
+import com.pichillilorenzo.flutter_inappwebview_android.types.URLRequest;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceErrorExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceRequestExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebResourceResponseExt;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.WebViewChannelDelegate;
 
 import java.io.ByteArrayInputStream;
 import java.net.URI;
@@ -603,7 +603,7 @@ public class InAppWebViewClientCompat extends WebViewClientCompat {
     final InAppWebView webView = (InAppWebView) view;
     final WebViewChannelDelegate.SafeBrowsingHitCallback resultCallback = new WebViewChannelDelegate.SafeBrowsingHitCallback() {
       @Override
-      public boolean nonNullSuccess(@NonNull com.pichillilorenzo.flutter_inappwebview.types.SafeBrowsingResponse response) {
+      public boolean nonNullSuccess(@NonNull com.pichillilorenzo.flutter_inappwebview_android.types.SafeBrowsingResponse response) {
         Integer action = response.getAction();
         if (action != null) {
           boolean report = response.isReport();
@@ -638,7 +638,7 @@ public class InAppWebViewClientCompat extends WebViewClientCompat {
       }
 
       @Override
-      public void defaultBehaviour(@Nullable com.pichillilorenzo.flutter_inappwebview.types.SafeBrowsingResponse result) {
+      public void defaultBehaviour(@Nullable com.pichillilorenzo.flutter_inappwebview_android.types.SafeBrowsingResponse result) {
         InAppWebViewClientCompat.super.onSafeBrowsingHit(view, request, threatType, callback);
       }
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewRenderProcessClient.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewRenderProcessClient.java
similarity index 94%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewRenderProcessClient.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewRenderProcessClient.java
index 4db53aa1..1fe8c509 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewRenderProcessClient.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewRenderProcessClient.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview;
 
 import android.util.Log;
 import android.webkit.WebView;
@@ -9,7 +9,7 @@ import androidx.webkit.WebViewFeature;
 import androidx.webkit.WebViewRenderProcess;
 import androidx.webkit.WebViewRenderProcessClient;
 
-import com.pichillilorenzo.flutter_inappwebview.webview.WebViewChannelDelegate;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.WebViewChannelDelegate;
 
 public class InAppWebViewRenderProcessClient extends WebViewRenderProcessClient {
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewSettings.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewSettings.java
similarity index 98%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewSettings.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewSettings.java
index ecc08969..d1d08a9e 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewSettings.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewSettings.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview;
 
 import static android.webkit.WebSettings.LayoutAlgorithm.NARROW_COLUMNS;
 import static android.webkit.WebSettings.LayoutAlgorithm.NORMAL;
@@ -13,9 +13,9 @@ import androidx.annotation.Nullable;
 import androidx.webkit.WebSettingsCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.ISettings;
-import com.pichillilorenzo.flutter_inappwebview.types.PreferredContentModeOptionType;
-import com.pichillilorenzo.flutter_inappwebview.webview.InAppWebViewInterface;
+import com.pichillilorenzo.flutter_inappwebview_android.ISettings;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PreferredContentModeOptionType;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.InAppWebViewInterface;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InputAwareWebView.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InputAwareWebView.java
similarity index 99%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InputAwareWebView.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InputAwareWebView.java
index 0613f133..e4c5e96d 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InputAwareWebView.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InputAwareWebView.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview;
 
 import static android.content.Context.INPUT_METHOD_SERVICE;
 
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/ThreadedInputConnectionProxyAdapterView.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/ThreadedInputConnectionProxyAdapterView.java
similarity index 97%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/ThreadedInputConnectionProxyAdapterView.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/ThreadedInputConnectionProxyAdapterView.java
index bf401488..91a45465 100755
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/ThreadedInputConnectionProxyAdapterView.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/ThreadedInputConnectionProxyAdapterView.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview;
 
 import android.os.Handler;
 import android.os.IBinder;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageChannel.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageChannel.java
similarity index 90%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageChannel.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageChannel.java
index b5e15e26..b7d059c2 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageChannel.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageChannel.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.web_message;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.web_message;
 
 import android.webkit.ValueCallback;
 
@@ -9,13 +9,13 @@ import androidx.webkit.WebMessagePortCompat;
 import androidx.webkit.WebViewCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
-import com.pichillilorenzo.flutter_inappwebview.types.WebMessageCompatExt;
-import com.pichillilorenzo.flutter_inappwebview.types.WebMessagePortCompatExt;
-import com.pichillilorenzo.flutter_inappwebview.webview.InAppWebViewInterface;
-import com.pichillilorenzo.flutter_inappwebview.types.WebMessagePort;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebMessageCompatExt;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebMessagePortCompatExt;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.InAppWebViewInterface;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebMessagePort;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,7 +23,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 
 public class WebMessageChannel implements Disposable {
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageChannelChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageChannelChannelDelegate.java
similarity index 86%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageChannelChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageChannelChannelDelegate.java
index cbc538d5..f801a82d 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageChannelChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageChannelChannelDelegate.java
@@ -1,12 +1,11 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.web_message;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.web_message;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
-import com.pichillilorenzo.flutter_inappwebview.types.WebMessageCompatExt;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebMessageCompatExt;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebView;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageListener.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageListener.java
similarity index 92%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageListener.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageListener.java
index 5cb35a80..fe7326f7 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageListener.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageListener.java
@@ -1,4 +1,4 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.web_message;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.web_message;
 
 import android.net.Uri;
 import android.text.TextUtils;
@@ -11,14 +11,14 @@ import androidx.webkit.WebMessageCompat;
 import androidx.webkit.WebViewCompat;
 import androidx.webkit.WebViewFeature;
 
-import com.pichillilorenzo.flutter_inappwebview.Util;
-import com.pichillilorenzo.flutter_inappwebview.plugin_scripts_js.JavaScriptBridgeJS;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
-import com.pichillilorenzo.flutter_inappwebview.types.WebMessageCompatExt;
-import com.pichillilorenzo.flutter_inappwebview.webview.InAppWebViewInterface;
-import com.pichillilorenzo.flutter_inappwebview.types.PluginScript;
-import com.pichillilorenzo.flutter_inappwebview.types.UserScriptInjectionTime;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.Util;
+import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS;
+import com.pichillilorenzo.flutter_inappwebview_android.types.Disposable;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebMessageCompatExt;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.InAppWebViewInterface;
+import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript;
+import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebView;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -27,7 +27,6 @@ import java.util.Map;
 import java.util.Set;
 
 import io.flutter.plugin.common.BinaryMessenger;
-import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 
 public class WebMessageListener implements Disposable {
diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageListenerChannelDelegate.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageListenerChannelDelegate.java
similarity index 76%
rename from flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageListenerChannelDelegate.java
rename to flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageListenerChannelDelegate.java
index c0f8ada8..92c7aaae 100644
--- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/web_message/WebMessageListenerChannelDelegate.java
+++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/web_message/WebMessageListenerChannelDelegate.java
@@ -1,14 +1,11 @@
-package com.pichillilorenzo.flutter_inappwebview.webview.web_message;
+package com.pichillilorenzo.flutter_inappwebview_android.webview.web_message;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.webkit.WebMessageCompat;
 
-import com.pichillilorenzo.flutter_inappwebview.headless_in_app_webview.HeadlessInAppWebView;
-import com.pichillilorenzo.flutter_inappwebview.types.ChannelDelegateImpl;
-import com.pichillilorenzo.flutter_inappwebview.types.Disposable;
-import com.pichillilorenzo.flutter_inappwebview.types.WebMessageCompatExt;
-import com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView;
+import com.pichillilorenzo.flutter_inappwebview_android.types.ChannelDelegateImpl;
+import com.pichillilorenzo.flutter_inappwebview_android.types.WebMessageCompatExt;
+import com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebView;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/flutter_inappwebview_android/android/src/main/res/layout/activity_web_view.xml b/flutter_inappwebview_android/android/src/main/res/layout/activity_web_view.xml
index 7dcc1374..d7d7e21a 100755
--- a/flutter_inappwebview_android/android/src/main/res/layout/activity_web_view.xml
+++ b/flutter_inappwebview_android/android/src/main/res/layout/activity_web_view.xml
@@ -7,18 +7,18 @@
     android:layout_height="match_parent"
     android:clickable="true"
     android:focusableInTouchMode="true"
-    tools:context=".in_app_browser.InAppBrowserActivity"
+    tools:context="com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserActivity"
     android:focusable="true">
 
-    <com.pichillilorenzo.flutter_inappwebview.pull_to_refresh.PullToRefreshLayout
+    <com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh.PullToRefreshLayout
         android:id="@+id/pullToRefresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <com.pichillilorenzo.flutter_inappwebview.webview.in_app_webview.InAppWebView
+        <com.pichillilorenzo.flutter_inappwebview_android.webview.in_app_webview.InAppWebView
             android:id="@+id/webView"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
-    </com.pichillilorenzo.flutter_inappwebview.pull_to_refresh.PullToRefreshLayout>
+    </com.pichillilorenzo.flutter_inappwebview_android.pull_to_refresh.PullToRefreshLayout>
 
     <ProgressBar
         android:id="@+id/progressBar"
diff --git a/flutter_inappwebview_android/android/src/main/res/menu/menu_main.xml b/flutter_inappwebview_android/android/src/main/res/menu/menu_main.xml
index acb3e94a..2bff50bf 100755
--- a/flutter_inappwebview_android/android/src/main/res/menu/menu_main.xml
+++ b/flutter_inappwebview_android/android/src/main/res/menu/menu_main.xml
@@ -3,7 +3,7 @@
     xmlns:appcompat="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".in_app_browser.InAppBrowserActivity">
+    tools:context="com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserActivity">
 
     <item
         android:id="@+id/action_go_back"
diff --git a/flutter_inappwebview_android/example/pubspec.lock b/flutter_inappwebview_android/example/pubspec.lock
index 86d6e013..85294694 100644
--- a/flutter_inappwebview_android/example/pubspec.lock
+++ b/flutter_inappwebview_android/example/pubspec.lock
@@ -81,7 +81,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.0.1"
+    version: "1.0.0"
   flutter_inappwebview_internal_annotations:
     dependency: transitive
     description:
@@ -96,7 +96,7 @@ packages:
       path: "../../flutter_inappwebview_platform_interface"
       relative: true
     source: path
-    version: "0.0.1"
+    version: "1.0.0"
   flutter_lints:
     dependency: "direct dev"
     description:
diff --git a/flutter_inappwebview_android/pubspec.yaml b/flutter_inappwebview_android/pubspec.yaml
index aabcf3b2..c9eee724 100644
--- a/flutter_inappwebview_android/pubspec.yaml
+++ b/flutter_inappwebview_android/pubspec.yaml
@@ -46,7 +46,7 @@ flutter:
     implements: flutter_inappwebview
     platforms:
       android:
-        package: com.pichillilorenzo.flutter_inappwebview
+        package: com.pichillilorenzo.flutter_inappwebview_android
         pluginClass: InAppWebViewFlutterPlugin
         dartPluginClass: AndroidInAppWebViewPlatform