diff --git a/android/build.gradle b/android/build.gradle
index f058512..c5f0960 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -94,7 +94,7 @@ android {
     // call source generation makefile target
     task genSources(type:Exec, dependsOn: 'genpEpEngineAsn1Sources') {
         workingDir '../src'
-        commandLine 'make', "-j${threadsToUse}", 'pEp.jar'
+        commandLine 'make', "-j${threadsToUse}", 'lib-java'
     }
 
     task genpEpEngineSyncSources(type:Exec) {
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 24a635b..abc0209 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -47,14 +47,14 @@ LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid pEpAdapter libsequ
 LOCAL_CPP_FEATURES += exceptions
 LOCAL_CPPFLAGS += -std=c++11 -DANDROID_STL=c++_shared -DHAVE_PTHREADS -DDISABLE_SYNC -fuse-ld=lld
 LOCAL_SRC_FILES  := \
-		  ../../src/foundation_pEp_jniadapter_AbstractEngine.cc \
-		  ../../src/foundation_pEp_jniadapter_Engine.cc \
-		  ../../src/foundation_pEp_jniadapter_Message.cc \
-		  ../../src/foundation_pEp_jniadapter__Blob.cc \
-		  ../../src/throw_pEp_exception.cc \
-		  ../../src/basic_api.cc \
-		  ../../src/identity_api.cc \
-		  ../../src/jniutils.cc
+		  ../../src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc \
+		  ../../src/cxx/foundation_pEp_jniadapter_Engine.cc \
+		  ../../src/cxx/foundation_pEp_jniadapter_Message.cc \
+		  ../../src/cxx/foundation_pEp_jniadapter__Blob.cc \
+		  ../../src/cxx/throw_pEp_exception.cc \
+		  ../../src/cxx/basic_api.cc \
+		  ../../src/cxx/identity_api.cc \
+		  ../../src/cxx/jniutils.cc
 
 LOCAL_C_INCLUDES += $(GPGBUILD)/$(TARGET_ARCH_ABI)/include
 LOCAL_C_INCLUDES += $(LIB_PEP_ADAPTER_PATH)/build-android/include $(SRC_PATH)/libpEpAdapter
diff --git a/android/src/foundation/pEp/jniadapter/AndroidHelper.java b/android/src/foundation/pEp/jniadapter/AndroidHelper.java
index f9e71b8..eaa52b0 100644
--- a/android/src/foundation/pEp/jniadapter/AndroidHelper.java
+++ b/android/src/foundation/pEp/jniadapter/AndroidHelper.java
@@ -10,6 +10,8 @@ import java.io.*;
 import java.lang.reflect.Method;
 import java.util.Scanner;
 
+import foundation.pEp.jniadapter.exceptions.pEpException;
+
 public class AndroidHelper {
     static {
         System.loadLibrary("pEpJNIAndroidHelper");