diff --git a/androidtests/build.gradle b/androidtests/build.gradle
index c6cef0a3..83f92218 100644
--- a/androidtests/build.gradle
+++ b/androidtests/build.gradle
@@ -29,6 +29,7 @@ android {
     useLibrary 'android.test.runner'
     useLibrary 'android.test.base'
     useLibrary 'android.test.mock'
+    namespace 'me.jahnen.libaums.core.androidtests'
 }
 
 dependencies {
diff --git a/androidtests/src/main/AndroidManifest.xml b/androidtests/src/main/AndroidManifest.xml
index 73473a0d..c7e7078d 100644
--- a/androidtests/src/main/AndroidManifest.xml
+++ b/androidtests/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="me.jahnen.libaums.core.androidtests">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index d7b11b72..8a9f3c9f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,6 +21,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'me.jahnen.libaums.core.usbfileman'
 
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 733165f5..b6a49779 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,7 @@
  */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="me.jahnen.libaums.core.usbfileman" >
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/build.gradle b/build.gradle
index b5851f2e..20b3f011 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
 
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b38b21e2..671bd50a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Sep 11 11:27:30 CEST 2019
+#Tue Nov 22 10:59:55 CET 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/httpserver/build.gradle b/httpserver/build.gradle
index 40d91e88..92f36728 100644
--- a/httpserver/build.gradle
+++ b/httpserver/build.gradle
@@ -33,6 +33,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'me.jahnen.libaums.core.httpserver'
 }
 
 
diff --git a/httpserver/src/main/AndroidManifest.xml b/httpserver/src/main/AndroidManifest.xml
index dd69d2d3..a42ae6c6 100644
--- a/httpserver/src/main/AndroidManifest.xml
+++ b/httpserver/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="me.jahnen.libaums.core.httpserver">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/javafs/build.gradle b/javafs/build.gradle
index 25baaed8..9c8f239f 100644
--- a/javafs/build.gradle
+++ b/javafs/build.gradle
@@ -20,6 +20,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'me.jahnen.libaums.javafs'
 }
 
 dependencies {
diff --git a/javafs/src/main/AndroidManifest.xml b/javafs/src/main/AndroidManifest.xml
index de37b82e..1079a487 100644
--- a/javafs/src/main/AndroidManifest.xml
+++ b/javafs/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="me.jahnen.libaums.javafs">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:allowBackup="true"
         android:supportsRtl="true">
diff --git a/libaums/build.gradle b/libaums/build.gradle
index 78aaf8c4..640fd86b 100644
--- a/libaums/build.gradle
+++ b/libaums/build.gradle
@@ -68,6 +68,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'me.jahnen.libaums.core'
 }
 
 dependencies {
diff --git a/libaums/src/main/AndroidManifest.xml b/libaums/src/main/AndroidManifest.xml
index acde9fa2..2a35e9d0 100644
--- a/libaums/src/main/AndroidManifest.xml
+++ b/libaums/src/main/AndroidManifest.xml
@@ -15,6 +15,6 @@
  * limitations under the License.
  */
 -->
-<manifest package="me.jahnen.libaums.core">
+<manifest>
 
 </manifest>
diff --git a/libusbcommunication/build.gradle b/libusbcommunication/build.gradle
index 105faa86..985c923f 100644
--- a/libusbcommunication/build.gradle
+++ b/libusbcommunication/build.gradle
@@ -45,6 +45,7 @@ android {
             path "CMakeLists.txt"
         }
     }
+    namespace 'me.jahnen.libaums.libusbcommunication'
 
 }
 
diff --git a/libusbcommunication/src/main/AndroidManifest.xml b/libusbcommunication/src/main/AndroidManifest.xml
index 9144bf7e..cc947c56 100644
--- a/libusbcommunication/src/main/AndroidManifest.xml
+++ b/libusbcommunication/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="me.jahnen.libaums.libusbcommunication" />
+<manifest />
diff --git a/storageprovider/build.gradle b/storageprovider/build.gradle
index 7b535612..e954ab81 100644
--- a/storageprovider/build.gradle
+++ b/storageprovider/build.gradle
@@ -32,6 +32,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'me.jahnen.libaums.storageprovider'
 }
 
 dependencies {
diff --git a/storageprovider/src/main/AndroidManifest.xml b/storageprovider/src/main/AndroidManifest.xml
index d17c1b25..c511ceb7 100644
--- a/storageprovider/src/main/AndroidManifest.xml
+++ b/storageprovider/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="me.jahnen.libaums.storageprovider">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature
         android:name="android.hardware.usb.host"