diff --git a/lib/bindings/bindings-android/lib/build.gradle.kts b/lib/bindings/bindings-android/lib/build.gradle.kts
index 396065b..582133d 100644
--- a/lib/bindings/bindings-android/lib/build.gradle.kts
+++ b/lib/bindings/bindings-android/lib/build.gradle.kts
@@ -31,6 +31,11 @@ android {
             withSourcesJar()
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
diff --git a/lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/build.gradle.kts b/lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/build.gradle.kts
index cc1ba3f..8947805 100644
--- a/lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/build.gradle.kts
+++ b/lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/build.gradle.kts
@@ -41,7 +41,7 @@ kotlin {
         it.compilations["main"].cinterops {
             create("breezCInterop") {
                 defFile(project.file("src/nativeInterop/cinterop/breez.def"))
-                includeDirs(project.file("src/nativeInterop/cinterop/headers/breez_liquid_sdk"), project.file("src/libs/$platform"))
+                includeDirs(project.file("src/nativeInterop/cinterop/headers/breez_liquid_sdk"), project.file("src/lib/$platform"))
             }
         }
     }
diff --git a/lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/nativeInterop/cinterop/breez.def b/lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/nativeInterop/cinterop/breez.def
index 2ba13bb..c344e04 100644
--- a/lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/nativeInterop/cinterop/breez.def
+++ b/lib/bindings/bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/nativeInterop/cinterop/breez.def
@@ -3,10 +3,10 @@ package = breez_liquid_sdk.cinterop
 
 staticLibraries = libbreez_liquid_sdk_bindings.a
 
-libraryPaths.ios_arm64 = src/libs/ios-arm64
-libraryPaths.ios_simulator_arm64 = src/libs/ios-simulator-arm64
-libraryPaths.ios_simulator_x64 = src/libs/ios-simulator-x64
-libraryPaths.ios_x64 = src/libs/ios-simulator-x64
+libraryPaths.ios_arm64 = src/lib/ios-arm64
+libraryPaths.ios_simulator_arm64 = src/lib/ios-simulator-arm64
+libraryPaths.ios_simulator_x64 = src/lib/ios-simulator-x64
+libraryPaths.ios_x64 = src/lib/ios-simulator-x64
 
 
 linkerOpts = -ios_simulator_version_min 14.0.0 -framework Security
\ No newline at end of file
diff --git a/lib/bindings/makefile b/lib/bindings/makefile
index b4481d8..58b4116 100644
--- a/lib/bindings/makefile
+++ b/lib/bindings/makefile
@@ -73,13 +73,13 @@ bindings-kotlin-multiplatform: ios-universal android
 
 	cp -r bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/jvmMain/kotlin bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/androidMain/
 
-	mkdir -p bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/libs/ios-arm64/
-	mkdir -p bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/libs/ios-simulator-arm64/
-	mkdir -p bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/libs/ios-simulator-x64/
+	mkdir -p bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-arm64/
+	mkdir -p bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-arm64/
+	mkdir -p bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-x64/
 
-	cp ../target/aarch64-apple-ios/release/libbreez_liquid_sdk_bindings.a bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/libs/ios-arm64/
-	cp ../target/aarch64-apple-ios-sim/release/libbreez_liquid_sdk_bindings.a bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/libs/ios-simulator-arm64/
-	cp ../target/x86_64-apple-ios/release/libbreez_liquid_sdk_bindings.a bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/libs/ios-simulator-x64/
+	cp ../target/aarch64-apple-ios/release/libbreez_liquid_sdk_bindings.a bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-arm64/
+	cp ../target/aarch64-apple-ios-sim/release/libbreez_liquid_sdk_bindings.a bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-arm64/
+	cp ../target/x86_64-apple-ios/release/libbreez_liquid_sdk_bindings.a bindings-kotlin-multiplatform/breez-liquid-sdk-kmp/src/lib/ios-simulator-x64/
 	cd bindings-kotlin-multiplatform && ./gradlew :breez-liquid-sdk-kmp:assemble
 
 ## Apple