diff --git a/pythonforandroid/bootstraps/_sdl_common/build/src/main/java/org/kivy/android/GenericBroadcastReceiver.java b/pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/GenericBroadcastReceiver.java
similarity index 100%
rename from pythonforandroid/bootstraps/_sdl_common/build/src/main/java/org/kivy/android/GenericBroadcastReceiver.java
rename to pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/GenericBroadcastReceiver.java
diff --git a/pythonforandroid/bootstraps/_sdl_common/build/src/main/java/org/kivy/android/GenericBroadcastReceiverCallback.java b/pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/GenericBroadcastReceiverCallback.java
similarity index 100%
rename from pythonforandroid/bootstraps/_sdl_common/build/src/main/java/org/kivy/android/GenericBroadcastReceiverCallback.java
rename to pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/GenericBroadcastReceiverCallback.java
diff --git a/pythonforandroid/bootstraps/service_library/build/src/main/java/org/kivy/android/GenericBroadcastReceiver.java b/pythonforandroid/bootstraps/service_library/build/src/main/java/org/kivy/android/GenericBroadcastReceiver.java
deleted file mode 100644
index 58a1c5edf..000000000
--- a/pythonforandroid/bootstraps/service_library/build/src/main/java/org/kivy/android/GenericBroadcastReceiver.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.kivy.android;
-
-import android.content.BroadcastReceiver;
-import android.content.Intent;
-import android.content.Context;
-
-public class GenericBroadcastReceiver extends BroadcastReceiver {
-
-    GenericBroadcastReceiverCallback listener;
-
-    public GenericBroadcastReceiver(GenericBroadcastReceiverCallback listener) {
-        super();
-        this.listener = listener;
-    }
-
-    public void onReceive(Context context, Intent intent) {
-        this.listener.onReceive(context, intent);
-    }
-}
diff --git a/pythonforandroid/bootstraps/service_library/build/src/main/java/org/kivy/android/GenericBroadcastReceiverCallback.java b/pythonforandroid/bootstraps/service_library/build/src/main/java/org/kivy/android/GenericBroadcastReceiverCallback.java
deleted file mode 100644
index 1a87c98b2..000000000
--- a/pythonforandroid/bootstraps/service_library/build/src/main/java/org/kivy/android/GenericBroadcastReceiverCallback.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.kivy.android;
-
-import android.content.Intent;
-import android.content.Context;
-
-public interface GenericBroadcastReceiverCallback {
-    void onReceive(Context context, Intent intent);
-};
diff --git a/pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/GenericBroadcastReceiver.java b/pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/GenericBroadcastReceiver.java
deleted file mode 100644
index 58a1c5edf..000000000
--- a/pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/GenericBroadcastReceiver.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.kivy.android;
-
-import android.content.BroadcastReceiver;
-import android.content.Intent;
-import android.content.Context;
-
-public class GenericBroadcastReceiver extends BroadcastReceiver {
-
-    GenericBroadcastReceiverCallback listener;
-
-    public GenericBroadcastReceiver(GenericBroadcastReceiverCallback listener) {
-        super();
-        this.listener = listener;
-    }
-
-    public void onReceive(Context context, Intent intent) {
-        this.listener.onReceive(context, intent);
-    }
-}
diff --git a/pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/GenericBroadcastReceiverCallback.java b/pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/GenericBroadcastReceiverCallback.java
deleted file mode 100644
index 1a87c98b2..000000000
--- a/pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/GenericBroadcastReceiverCallback.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.kivy.android;
-
-import android.content.Intent;
-import android.content.Context;
-
-public interface GenericBroadcastReceiverCallback {
-    void onReceive(Context context, Intent intent);
-};