diff --git a/plugin.xml b/plugin.xml
index ff998dd6..44102f99 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -105,7 +105,7 @@
               android:grantUriPermissions="true": Grant temporary access to files
             -->
             <provider
-                android:name="de.appplant.cordova.plugin.localnotification.notification.util.PluginFileProvider"
+                android:name="de.appplant.cordova.plugin.localnotification.util.PluginFileProvider"
                 android:authorities="${applicationId}.localnotifications.provider"
                 android:exported="false"
                 android:grantUriPermissions="true">
@@ -123,16 +123,16 @@
             
             <!-- A notification will be triggered/shown -->
             <receiver
-                android:name="de.appplant.cordova.plugin.localnotification.notification.receiver.TriggerReceiver"
+                android:name="de.appplant.cordova.plugin.localnotification.receiver.TriggerReceiver"
                 android:exported="false" />
 
             <!-- Notification cleared by the user -->
             <receiver
-                android:name="de.appplant.cordova.plugin.localnotification.notification.receiver.ClearReceiver"
+                android:name="de.appplant.cordova.plugin.localnotification.receiver.ClearReceiver"
                 android:exported="false" />
 
             <receiver
-                android:name="de.appplant.cordova.plugin.localnotification.notification.receiver.RestoreReceiver"
+                android:name="de.appplant.cordova.plugin.localnotification.receiver.RestoreReceiver"
                 android:exported="false" >
                 <intent-filter>
                     <!--
@@ -187,68 +187,68 @@
             target-dir="src/de/appplant/cordova/plugin/localnotification" />
 
         <source-file
-            src="src/android/notification/receiver/ClearReceiver.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/receiver" />
+            src="src/android/receiver/ClearReceiver.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/receiver" />
 
         <source-file
-            src="src/android/notification/receiver/RestoreReceiver.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/receiver" />
+            src="src/android/receiver/RestoreReceiver.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/receiver" />
 
         <source-file
-            src="src/android/notification/receiver/TriggerReceiver.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/receiver" />
+            src="src/android/receiver/TriggerReceiver.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/receiver" />
 
         <source-file
-            src="src/android/notification/action/Action.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/action" />
+            src="src/android/action/Action.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/action" />
 
         <source-file
-            src="src/android/notification/action/ActionGroup.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/action" />
+            src="src/android/action/ActionGroup.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/action" />
 
         <source-file
-            src="src/android/notification/trigger/DateTrigger.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/trigger" />
+            src="src/android/trigger/DateTrigger.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/trigger" />
 
         <source-file
-            src="src/android/notification/trigger/IntervalTrigger.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/trigger" />
+            src="src/android/trigger/IntervalTrigger.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/trigger" />
 
         <source-file
-            src="src/android/notification/trigger/MatchTrigger.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/trigger" />
+            src="src/android/trigger/MatchTrigger.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/trigger" />
 
         <source-file
-            src="src/android/notification/util/PluginFileProvider.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/util" />
+            src="src/android/util/PluginFileProvider.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/util" />
 
         <source-file
-            src="src/android/notification/util/AssetUtil.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/util" />
+            src="src/android/util/AssetUtil.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/util" />
 
         <source-file
-            src="src/android/notification/util/CallbackContextUtil.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification/util" />
+            src="src/android/util/CallbackContextUtil.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification/util" />
 
         <source-file
-            src="src/android/notification/Builder.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification" />
+            src="src/android/Builder.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification" />
 
         <source-file
-            src="src/android/notification/Manager.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification" />
+            src="src/android/Manager.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification" />
 
         <source-file
-            src="src/android/notification/Notification.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification" />
+            src="src/android/Notification.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification" />
 
         <source-file
-            src="src/android/notification/Options.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification" />
+            src="src/android/Options.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification" />
 
         <source-file
-            src="src/android/notification/Request.java"
-            target-dir="src/de/appplant/cordova/plugin/localnotification/notification" />
+            src="src/android/Request.java"
+            target-dir="src/de/appplant/cordova/plugin/localnotification" />
     </platform>
 
 </plugin>
diff --git a/src/android/notification/Builder.java b/src/android/Builder.java
similarity index 97%
rename from src/android/notification/Builder.java
rename to src/android/Builder.java
index 643d07bc..1dc7c2e6 100644
--- a/src/android/notification/Builder.java
+++ b/src/android/Builder.java
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification;
+package de.appplant.cordova.plugin.localnotification;
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -39,12 +39,12 @@
 import java.util.List;
 import java.util.Random;
 
-import de.appplant.cordova.plugin.localnotification.notification.action.Action;
-import de.appplant.cordova.plugin.localnotification.notification.util.AssetUtil;
+import de.appplant.cordova.plugin.localnotification.action.Action;
+import de.appplant.cordova.plugin.localnotification.util.AssetUtil;
 
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
-import static de.appplant.cordova.plugin.localnotification.notification.Notification.EXTRA_UPDATE;
-import static de.appplant.cordova.plugin.localnotification.notification.Options.LARGE_ICON_TYPE_CIRCLE;
+import static de.appplant.cordova.plugin.localnotification.Notification.EXTRA_UPDATE;
+import static de.appplant.cordova.plugin.localnotification.Options.LARGE_ICON_TYPE_CIRCLE;
 
 /**
  * Builder class for local notifications. Build fully configured local
diff --git a/src/android/ClickHandlerActivity.java b/src/android/ClickHandlerActivity.java
index 760fb1cb..e482d52e 100644
--- a/src/android/ClickHandlerActivity.java
+++ b/src/android/ClickHandlerActivity.java
@@ -32,11 +32,11 @@
 import org.json.JSONObject;
 
 import de.appplant.cordova.plugin.localnotification.LocalNotification;
-import de.appplant.cordova.plugin.localnotification.notification.Manager;
-import de.appplant.cordova.plugin.localnotification.notification.Notification;
-import de.appplant.cordova.plugin.localnotification.notification.Options;
-import de.appplant.cordova.plugin.localnotification.notification.Request;
-import de.appplant.cordova.plugin.localnotification.notification.action.Action;
+import de.appplant.cordova.plugin.localnotification.Manager;
+import de.appplant.cordova.plugin.localnotification.Notification;
+import de.appplant.cordova.plugin.localnotification.Options;
+import de.appplant.cordova.plugin.localnotification.Request;
+import de.appplant.cordova.plugin.localnotification.action.Action;
 
 /**
  * The receiver activity is triggered when a notification is clicked by a user.
diff --git a/src/android/LocalNotification.java b/src/android/LocalNotification.java
index ecdd99a9..27c51dca 100644
--- a/src/android/LocalNotification.java
+++ b/src/android/LocalNotification.java
@@ -54,16 +54,16 @@
 import java.util.Arrays;
 import java.util.List;
 
-import de.appplant.cordova.plugin.localnotification.notification.Manager;
-import de.appplant.cordova.plugin.localnotification.notification.Notification;
-import de.appplant.cordova.plugin.localnotification.notification.Options;
-import de.appplant.cordova.plugin.localnotification.notification.Request;
-import de.appplant.cordova.plugin.localnotification.notification.action.ActionGroup;
-import de.appplant.cordova.plugin.localnotification.notification.util.AssetUtil;
-import de.appplant.cordova.plugin.localnotification.notification.util.CallbackContextUtil;
-
-import static de.appplant.cordova.plugin.localnotification.notification.Notification.Type.SCHEDULED;
-import static de.appplant.cordova.plugin.localnotification.notification.Notification.Type.TRIGGERED;
+import de.appplant.cordova.plugin.localnotification.Manager;
+import de.appplant.cordova.plugin.localnotification.Notification;
+import de.appplant.cordova.plugin.localnotification.Options;
+import de.appplant.cordova.plugin.localnotification.Request;
+import de.appplant.cordova.plugin.localnotification.action.ActionGroup;
+import de.appplant.cordova.plugin.localnotification.util.AssetUtil;
+import de.appplant.cordova.plugin.localnotification.util.CallbackContextUtil;
+
+import static de.appplant.cordova.plugin.localnotification.Notification.Type.SCHEDULED;
+import static de.appplant.cordova.plugin.localnotification.Notification.Type.TRIGGERED;
 
 /**
  * This plugin utilizes the Android AlarmManager in combination with local
diff --git a/src/android/notification/Manager.java b/src/android/Manager.java
similarity index 97%
rename from src/android/notification/Manager.java
rename to src/android/Manager.java
index 397cc999..69ac3409 100644
--- a/src/android/notification/Manager.java
+++ b/src/android/Manager.java
@@ -22,7 +22,7 @@
 
 // codebeat:disable[TOO_MANY_FUNCTIONS]
 
-package de.appplant.cordova.plugin.localnotification.notification;
+package de.appplant.cordova.plugin.localnotification;
 
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
@@ -49,9 +49,9 @@
 import static android.os.Build.VERSION_CODES.O;
 import static android.os.Build.VERSION_CODES.P;
 import static android.os.Build.VERSION_CODES.S;
-import static de.appplant.cordova.plugin.localnotification.notification.Notification.PREF_KEY_ID;
-import static de.appplant.cordova.plugin.localnotification.notification.Notification.Type.TRIGGERED;
-import de.appplant.cordova.plugin.localnotification.notification.util.AssetUtil;
+import static de.appplant.cordova.plugin.localnotification.Notification.PREF_KEY_ID;
+import static de.appplant.cordova.plugin.localnotification.Notification.Type.TRIGGERED;
+import de.appplant.cordova.plugin.localnotification.util.AssetUtil;
 
 /**
  * Central way to access all or single local notifications set by specific
diff --git a/src/android/notification/Notification.java b/src/android/Notification.java
similarity index 98%
rename from src/android/notification/Notification.java
rename to src/android/Notification.java
index 611596da..76258099 100644
--- a/src/android/notification/Notification.java
+++ b/src/android/Notification.java
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification;
+package de.appplant.cordova.plugin.localnotification;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -50,7 +50,7 @@
 import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;
 import static android.os.Build.VERSION.SDK_INT;
 
-import de.appplant.cordova.plugin.localnotification.notification.receiver.TriggerReceiver;
+import de.appplant.cordova.plugin.localnotification.receiver.TriggerReceiver;
 
 /**
  * Wrapper class around OS notification class. Handles basic operations
diff --git a/src/android/notification/Options.java b/src/android/Options.java
similarity index 98%
rename from src/android/notification/Options.java
rename to src/android/Options.java
index 49884e34..dff3f550 100644
--- a/src/android/notification/Options.java
+++ b/src/android/Options.java
@@ -22,7 +22,7 @@
 
 // codebeat:disable[TOO_MANY_FUNCTIONS]
 
-package de.appplant.cordova.plugin.localnotification.notification;
+package de.appplant.cordova.plugin.localnotification;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -44,9 +44,9 @@
 import java.util.Date;
 import java.util.List;
 
-import de.appplant.cordova.plugin.localnotification.notification.action.Action;
-import de.appplant.cordova.plugin.localnotification.notification.action.ActionGroup;
-import de.appplant.cordova.plugin.localnotification.notification.util.AssetUtil;
+import de.appplant.cordova.plugin.localnotification.action.Action;
+import de.appplant.cordova.plugin.localnotification.action.ActionGroup;
+import de.appplant.cordova.plugin.localnotification.util.AssetUtil;
 
 import static android.app.AlarmManager.RTC_WAKEUP;
 import static androidx.core.app.NotificationCompat.DEFAULT_LIGHTS;
diff --git a/src/android/notification/Request.java b/src/android/Request.java
similarity index 92%
rename from src/android/notification/Request.java
rename to src/android/Request.java
index fbbcda1f..f4b98bef 100644
--- a/src/android/notification/Request.java
+++ b/src/android/Request.java
@@ -21,7 +21,7 @@
  * @APPPLANT_LICENSE_HEADER_END@
  */
 
-package de.appplant.cordova.plugin.localnotification.notification;
+package de.appplant.cordova.plugin.localnotification;
 
 import org.json.JSONObject;
 
@@ -30,12 +30,12 @@
 import java.util.Date;
 import java.util.List;
 
-import de.appplant.cordova.plugin.localnotification.notification.trigger.DateTrigger;
-import de.appplant.cordova.plugin.localnotification.notification.trigger.DateTrigger.Unit;
-import de.appplant.cordova.plugin.localnotification.notification.trigger.IntervalTrigger;
-import de.appplant.cordova.plugin.localnotification.notification.trigger.MatchTrigger;
+import de.appplant.cordova.plugin.localnotification.trigger.DateTrigger;
+import de.appplant.cordova.plugin.localnotification.trigger.DateTrigger.Unit;
+import de.appplant.cordova.plugin.localnotification.trigger.IntervalTrigger;
+import de.appplant.cordova.plugin.localnotification.trigger.MatchTrigger;
 
-import static de.appplant.cordova.plugin.localnotification.notification.trigger.IntervalTrigger.Unit;
+import static de.appplant.cordova.plugin.localnotification.trigger.IntervalTrigger.Unit;
 
 /**
  * An object you use to specify a notification’s content and the condition
diff --git a/src/android/notification/action/Action.java b/src/android/action/Action.java
similarity index 96%
rename from src/android/notification/action/Action.java
rename to src/android/action/Action.java
index 679bce1a..c46d5a9f 100644
--- a/src/android/notification/action/Action.java
+++ b/src/android/action/Action.java
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.action;
+package de.appplant.cordova.plugin.localnotification.action;
 
 import android.content.Context;
 import androidx.core.app.RemoteInput;
@@ -27,7 +27,7 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import de.appplant.cordova.plugin.localnotification.notification.util.AssetUtil;
+import de.appplant.cordova.plugin.localnotification.util.AssetUtil;
 
 /**
  * Holds the icon and title components that would be used in a
diff --git a/src/android/notification/action/ActionGroup.java b/src/android/action/ActionGroup.java
similarity index 98%
rename from src/android/notification/action/ActionGroup.java
rename to src/android/action/ActionGroup.java
index 793ded50..48304df7 100644
--- a/src/android/notification/action/ActionGroup.java
+++ b/src/android/action/ActionGroup.java
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.action;
+package de.appplant.cordova.plugin.localnotification.action;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/src/android/notification/receiver/ClearReceiver.java b/src/android/receiver/ClearReceiver.java
similarity index 88%
rename from src/android/notification/receiver/ClearReceiver.java
rename to src/android/receiver/ClearReceiver.java
index fca6bdb2..3db3036e 100644
--- a/src/android/notification/receiver/ClearReceiver.java
+++ b/src/android/receiver/ClearReceiver.java
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.receiver;
+package de.appplant.cordova.plugin.localnotification.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -28,9 +28,9 @@
 import android.os.Bundle;
 
 import de.appplant.cordova.plugin.localnotification.LocalNotification;
-import de.appplant.cordova.plugin.localnotification.notification.Manager;
-import de.appplant.cordova.plugin.localnotification.notification.Notification;
-import de.appplant.cordova.plugin.localnotification.notification.Request;
+import de.appplant.cordova.plugin.localnotification.Manager;
+import de.appplant.cordova.plugin.localnotification.Notification;
+import de.appplant.cordova.plugin.localnotification.Request;
 
 /**
  * The clear intent receiver is triggered when the user clears a
diff --git a/src/android/notification/receiver/RestoreReceiver.java b/src/android/receiver/RestoreReceiver.java
similarity index 90%
rename from src/android/notification/receiver/RestoreReceiver.java
rename to src/android/receiver/RestoreReceiver.java
index b250b2f5..c8e42e32 100644
--- a/src/android/notification/receiver/RestoreReceiver.java
+++ b/src/android/receiver/RestoreReceiver.java
@@ -21,7 +21,7 @@
  * @APPPLANT_LICENSE_HEADER_END@
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.receiver;
+package de.appplant.cordova.plugin.localnotification.receiver;
 
 import android.app.AlarmManager;
 import android.content.BroadcastReceiver;
@@ -33,10 +33,10 @@
 import java.util.List;
 
 import de.appplant.cordova.plugin.localnotification.ClickHandlerActivity;
-import de.appplant.cordova.plugin.localnotification.notification.Builder;
-import de.appplant.cordova.plugin.localnotification.notification.Manager;
-import de.appplant.cordova.plugin.localnotification.notification.Notification;
-import de.appplant.cordova.plugin.localnotification.notification.Request;
+import de.appplant.cordova.plugin.localnotification.Builder;
+import de.appplant.cordova.plugin.localnotification.Manager;
+import de.appplant.cordova.plugin.localnotification.Notification;
+import de.appplant.cordova.plugin.localnotification.Request;
 
 /**
  * This class is triggered, when the system has cleared the alarms and notifications,
diff --git a/src/android/notification/receiver/TriggerReceiver.java b/src/android/receiver/TriggerReceiver.java
similarity index 89%
rename from src/android/notification/receiver/TriggerReceiver.java
rename to src/android/receiver/TriggerReceiver.java
index ff5c30d2..8523f62f 100644
--- a/src/android/notification/receiver/TriggerReceiver.java
+++ b/src/android/receiver/TriggerReceiver.java
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.receiver;
+package de.appplant.cordova.plugin.localnotification.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -33,11 +33,11 @@
 
 import de.appplant.cordova.plugin.localnotification.ClickHandlerActivity;
 import de.appplant.cordova.plugin.localnotification.LocalNotification;
-import de.appplant.cordova.plugin.localnotification.notification.Builder;
-import de.appplant.cordova.plugin.localnotification.notification.Manager;
-import de.appplant.cordova.plugin.localnotification.notification.Notification;
-import de.appplant.cordova.plugin.localnotification.notification.Options;
-import de.appplant.cordova.plugin.localnotification.notification.Request;
+import de.appplant.cordova.plugin.localnotification.Builder;
+import de.appplant.cordova.plugin.localnotification.Manager;
+import de.appplant.cordova.plugin.localnotification.Notification;
+import de.appplant.cordova.plugin.localnotification.Options;
+import de.appplant.cordova.plugin.localnotification.Request;
 
 /**
  * The alarm receiver is triggered when a scheduled alarm is fired. This class
diff --git a/src/android/notification/trigger/DateTrigger.java b/src/android/trigger/DateTrigger.java
similarity index 96%
rename from src/android/notification/trigger/DateTrigger.java
rename to src/android/trigger/DateTrigger.java
index a6b67e98..24e9d7ee 100644
--- a/src/android/notification/trigger/DateTrigger.java
+++ b/src/android/trigger/DateTrigger.java
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.trigger;
+package de.appplant.cordova.plugin.localnotification.trigger;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/src/android/notification/trigger/IntervalTrigger.java b/src/android/trigger/IntervalTrigger.java
similarity index 97%
rename from src/android/notification/trigger/IntervalTrigger.java
rename to src/android/trigger/IntervalTrigger.java
index 1ec9a8f1..1839dd6d 100644
--- a/src/android/notification/trigger/IntervalTrigger.java
+++ b/src/android/trigger/IntervalTrigger.java
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.trigger;
+package de.appplant.cordova.plugin.localnotification.trigger;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/src/android/notification/trigger/MatchTrigger.java b/src/android/trigger/MatchTrigger.java
similarity index 94%
rename from src/android/notification/trigger/MatchTrigger.java
rename to src/android/trigger/MatchTrigger.java
index 08b1e138..be06517d 100644
--- a/src/android/notification/trigger/MatchTrigger.java
+++ b/src/android/trigger/MatchTrigger.java
@@ -19,18 +19,18 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.trigger;
+package de.appplant.cordova.plugin.localnotification.trigger;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-import static de.appplant.cordova.plugin.localnotification.notification.trigger.DateTrigger.Unit.DAY;
-import static de.appplant.cordova.plugin.localnotification.notification.trigger.DateTrigger.Unit.HOUR;
-import static de.appplant.cordova.plugin.localnotification.notification.trigger.DateTrigger.Unit.MINUTE;
-import static de.appplant.cordova.plugin.localnotification.notification.trigger.DateTrigger.Unit.MONTH;
-import static de.appplant.cordova.plugin.localnotification.notification.trigger.DateTrigger.Unit.WEEK;
-import static de.appplant.cordova.plugin.localnotification.notification.trigger.DateTrigger.Unit.YEAR;
+import static de.appplant.cordova.plugin.localnotification.trigger.DateTrigger.Unit.DAY;
+import static de.appplant.cordova.plugin.localnotification.trigger.DateTrigger.Unit.HOUR;
+import static de.appplant.cordova.plugin.localnotification.trigger.DateTrigger.Unit.MINUTE;
+import static de.appplant.cordova.plugin.localnotification.trigger.DateTrigger.Unit.MONTH;
+import static de.appplant.cordova.plugin.localnotification.trigger.DateTrigger.Unit.WEEK;
+import static de.appplant.cordova.plugin.localnotification.trigger.DateTrigger.Unit.YEAR;
 import static java.util.Calendar.DAY_OF_WEEK;
 import static java.util.Calendar.WEEK_OF_MONTH;
 import static java.util.Calendar.WEEK_OF_YEAR;
diff --git a/src/android/notification/util/AssetUtil.java b/src/android/util/AssetUtil.java
similarity index 99%
rename from src/android/notification/util/AssetUtil.java
rename to src/android/util/AssetUtil.java
index 43b665ed..da6b5f4f 100644
--- a/src/android/notification/util/AssetUtil.java
+++ b/src/android/util/AssetUtil.java
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.util;
+package de.appplant.cordova.plugin.localnotification.util;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/src/android/notification/util/CallbackContextUtil.java b/src/android/util/CallbackContextUtil.java
similarity index 97%
rename from src/android/notification/util/CallbackContextUtil.java
rename to src/android/util/CallbackContextUtil.java
index 3edead41..ac6735f0 100644
--- a/src/android/notification/util/CallbackContextUtil.java
+++ b/src/android/util/CallbackContextUtil.java
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.util;
+package de.appplant.cordova.plugin.localnotification.util;
 
 import java.util.HashMap;
 import java.util.Random;
diff --git a/src/android/notification/util/PluginFileProvider.java b/src/android/util/PluginFileProvider.java
similarity index 94%
rename from src/android/notification/util/PluginFileProvider.java
rename to src/android/util/PluginFileProvider.java
index a7fe5a6f..9d0e095d 100644
--- a/src/android/notification/util/PluginFileProvider.java
+++ b/src/android/util/PluginFileProvider.java
@@ -17,7 +17,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  under the License.
  */
 
-package de.appplant.cordova.plugin.localnotification.notification.util;
+package de.appplant.cordova.plugin.localnotification.util;
 
 import androidx.core.content.FileProvider;