diff --git a/jme3-android-native/build.gradle b/jme3-android-native/build.gradle
index 7b135b573..bfeab559e 100644
--- a/jme3-android-native/build.gradle
+++ b/jme3-android-native/build.gradle
@@ -10,33 +10,6 @@
 // prefer. In this case NetBeans will not add these tasks but you may rely on
 // your own implementation.
 
-// // OpenAL Soft r1.15.1
-//String openALSoftUrl = 'http://repo.or.cz/w/openal-soft.git/snapshot/9b6a226da55a987cb883f425eeb568776ea12c8d.zip'
-// OpenAL Soft r1.15.1 + Android OpenSL Support
-String openALSoftUrl = 'http://repo.or.cz/w/openal-soft.git/snapshot/be25e6802dacad78876c6fa1d6a5c63797b8a9ed.zip'
-// OpenAL Soft r1.15.1 latest build (at the time)
-//String openALSoftUrl = 'http://repo.or.cz/w/openal-soft.git/snapshot/3f5914e0949ee12b504ee7254990e007ff8057ef.zip'
-
-// OpenAL Soft directory the download is extracted into
-// Typically, the downloaded OpenAL Soft zip file will extract to a directory
-// called "openal-soft"
-String openALSoftFolder = 'openal-soft'
-String openALSoftZipFile = 'OpenALSoft.zip'
-
-//Working directory for the ndk build.
-//Must be the parent directory of the jni directory
-//Libs directory (output of ndk) will be created in this directory as well
-String ndkWorkingPath = 'src/native'
-
-// jni folder path to build from
-String jniPath = ndkWorkingPath + '/jni'
-
-//Output directory of the NDK (do not change)
-String ndkOutputPath = ndkWorkingPath + '/libs'
-
-// jME Android Native source files path
-String jMEAndroidPath = 'src/native/android'
-
 if (!hasProperty('mainClass')) {
     ext.mainClass = ''
 }
@@ -44,7 +17,7 @@ if (!hasProperty('mainClass')) {
 sourceSets {
     main {
         java {
-            srcDir jMEAndroidPath
+            srcDir 'src/native'
         }
     }
 }
@@ -60,96 +33,21 @@ dependencies {
     compile project(':jme3-android')
 }
 
-// Download bullet if not available
-task downloadOpenALSoft(type: MyDownload) {
-    sourceUrl = openALSoftUrl
-    target = file(openALSoftZipFile)
-}
-
-// Unzip OpenALSoft
-task unzipOpenALSoft(type: Copy) {
-    def zipFile = file(openALSoftZipFile)
-    def outputDir = file(".")
+ext {
+    // stores the native project classpath to be used in each native
+    // build to generate native header files
+    projectClassPath = configurations.runtime.asFileTree.matching {
+        exclude ".gradle"
+    }.asPath
 
-    from zipTree(zipFile)
-    into outputDir
-}
-unzipOpenALSoft.dependsOn {
-    def zipFilePath = project.projectDir.absolutePath + File.separator + openALSoftZipFile
-    def zipFile = new File(zipFilePath)
-//    println "zipFile path: " + zipFile.absolutePath
-//    println "zipFile exists: " + zipFile.exists()
-    if (!zipFile.exists()) {
-        downloadOpenALSoft
-    }
-}
-
-// Copy OpenALSoft files to jni directory
-task copyOpenALSoft(type: Copy) {
-    def sourceDir = file(openALSoftFolder)
-    def outputDir = file(jniPath)
-
-    from sourceDir
-    into outputDir
-}
-copyOpenALSoft.dependsOn {
-    def openALSoftUnzipDir = new File(project.projectDir.absolutePath + File.separator + openALSoftFolder)
-//    println "openALSoftUnzipDir path: " + openALSoftUnzipDir.absolutePath
-//    println "openALSoftUnzipDir exists: " + openALSoftUnzipDir.isDirectory()
-    if (!openALSoftUnzipDir.isDirectory()) {
-        unzipOpenALSoft
-    }
+    // findNDK() is defined in the root project gradle.build so it
+    // can be visible to all subprojects that need to build an Android native lib
+    ndkCommandPath = findNDK()
 }
+//println "projectClassPath = " + projectClassPath
+//println "ndkCommandPath = " + ndkCommandPath
 
-// Copy jME Android native files to jni directory
-task copyJmeOpenALSoft(type: Copy, dependsOn:copyOpenALSoft) {
-    def sourceDir = file(jMEAndroidPath)
-    def outputDir = file(jniPath)
+// add each native lib build file
+apply from: file('openalsoft.gradle')
+//apply from: file('stb_image.gradle')
 
-    from sourceDir
-    into outputDir
-}
-
-task buildNative(type: Exec, dependsOn:copyJmeOpenALSoft) {
-    String ndkBuildFile = "ndk-build"
-    // if windows, use ndk-build.cmd instead
-    if (System.properties['os.name'].toLowerCase().contains('windows')) {
-        ndkBuildFile = "ndk-build.cmd"
-    }
-
-    // ndkPath is defined in the root project gradle.properties file
-    String ndkBuildPath = ndkPath + File.separator + ndkBuildFile
-    //Use the environment variable for the NDK location if defined
-    if (System.env.ANDROID_NDK != null) {
-        ndkBuildPath = System.env.ANDROID_NDK + File.separator + ndkBuildFile
-    }
-
-    // need to target android-9 so the ndk can pull in the opensl library
-    args 'TARGET_PLATFORM=android-9'
-    workingDir ndkWorkingPath
-    executable ndkBuildPath
-}
-
-jar.into("lib") { from ndkOutputPath }
-
-compileJava.dependsOn {
-    // ndkPath is defined in the root project gradle.properties file
-    def ndkDir = new File(ndkPath)
-    if (ndkDir.isDirectory()) {
-        buildNative
-    }
-}
-
-// Helper class to wrap ant dowload task
-class MyDownload extends DefaultTask {
-    @Input
-    String sourceUrl
-
-    @OutputFile
-    File target
-
-    @TaskAction
-    void download() {
-       ant.get(src: sourceUrl, dest: target)
-    }
-}
diff --git a/jme3-android-native/openalsoft.gradle b/jme3-android-native/openalsoft.gradle
new file mode 100644
index 000000000..9ba68cbfd
--- /dev/null
+++ b/jme3-android-native/openalsoft.gradle
@@ -0,0 +1,122 @@
+// OpenAL Soft r1.15.1
+//String openALSoftUrl = 'http://repo.or.cz/w/openal-soft.git/snapshot/9b6a226da55a987cb883f425eeb568776ea12c8d.zip'
+// OpenAL Soft r1.15.1 + Android OpenSL Support
+String openALSoftUrl = 'http://repo.or.cz/w/openal-soft.git/snapshot/be25e6802dacad78876c6fa1d6a5c63797b8a9ed.zip'
+// OpenAL Soft r1.15.1 latest build (at the time)
+//String openALSoftUrl = 'http://repo.or.cz/w/openal-soft.git/snapshot/3f5914e0949ee12b504ee7254990e007ff8057ef.zip'
+String openALSoftZipFile = 'OpenALSoft.zip'
+
+// OpenAL Soft directory the download is extracted into
+// Typically, the downloaded OpenAL Soft zip file will extract to a directory
+// called "openal-soft"
+String openALSoftFolder = 'openal-soft'
+
+//Working directory for the ndk build.
+//Must be the parent directory of the jni directory
+//Libs directory (output of ndk) will be created in this directory as well
+String openalsoftBuildDir = "${buildDir}" + File.separator + 'openalsoft'
+
+// jME Android Native source files path
+String openalsoftJmeAndroidPath = 'src/native/jme_openalsoft'
+
+// Download external source files if not available
+task downloadOpenALSoft(type: MyDownload) {
+    sourceUrl = openALSoftUrl
+    target = file(openALSoftZipFile)
+}
+
+// Unzip external source files
+task unzipOpenALSoft(type: Copy) {
+    def zipFile = file(openALSoftZipFile)
+    def outputDir = file(".")
+
+    from zipTree(zipFile)
+    into outputDir
+}
+unzipOpenALSoft.dependsOn {
+    def zipFilePath = project.projectDir.absolutePath + File.separator + openALSoftZipFile
+    def zipFile = new File(zipFilePath)
+//    println "zipFile path: " + zipFile.absolutePath
+//    println "zipFile exists: " + zipFile.exists()
+    if (!zipFile.exists()) {
+        downloadOpenALSoft
+    }
+}
+
+// Copy external source files to jni directory
+task copyOpenALSoft(type: Copy) {
+    def sourceDir = file(openALSoftFolder)
+    def outputDir = file(openalsoftBuildDir + File.separator + 'jni')
+//    println "copyOpenALSoft sourceDir: " + sourceDir
+//    println "copyOpenALSoft outputDir: " + outputDir
+
+    from sourceDir
+    into outputDir
+}
+copyOpenALSoft.dependsOn {
+    def openALSoftUnzipDir = new File(project.projectDir.absolutePath + File.separator + openALSoftFolder)
+//    println "openALSoftUnzipDir path: " + openALSoftUnzipDir.absolutePath
+//    println "openALSoftUnzipDir exists: " + openALSoftUnzipDir.isDirectory()
+    if (!openALSoftUnzipDir.isDirectory()) {
+        unzipOpenALSoft
+    }
+}
+
+// Copy jME Android native files to jni directory
+task copyJmeOpenALSoft(type: Copy, dependsOn:copyOpenALSoft) {
+    def sourceDir = file(openalsoftJmeAndroidPath)
+    def outputDir = file(openalsoftBuildDir + File.separator + 'jni')
+//    println "copyJmeOpenALSoft sourceDir: " + sourceDir
+//    println "copyJmeOpenALSoft outputDir: " + outputDir
+
+    from sourceDir
+    into outputDir
+}
+
+jar.into("lib") { from openalsoftBuildDir + File.separator + 'libs' }
+
+task generateOpenAlSoftHeaders(dependsOn:copyJmeOpenALSoft) {
+    String destDir = openalsoftBuildDir + File.separator + 'jni'
+
+    String classes = ""
+            .concat("com.jme3.audio.android.AndroidOpenALSoftAudioRenderer, ")
+//    println "openalsoft classes = " + classes
+//    println "openalsoft destDir = " + destDir
+//    println "openalsoft classpath = " + project.projectClassPath
+
+    ant.javah(
+        classpath: project.projectClassPath,
+        destdir: destDir,
+        class: classes
+    )
+
+}
+
+task buildOpenAlSoftNativeLib(type: Exec, dependsOn: generateOpenAlSoftHeaders) {
+//    println "openalsoft build dir: " + openalsoftBuildDir
+//    println "ndkCommandPath: " + project.ndkCommandPath
+    args 'TARGET_PLATFORM=android-9'
+    workingDir openalsoftBuildDir
+    executable project.ndkCommandPath
+}
+
+compileJava.dependsOn {
+    // ndkPath is defined in the root project gradle.properties file
+    if (ndkCommandPath != null && new File(ndkCommandPath).exists()) {
+        buildOpenAlSoftNativeLib
+    }
+}
+
+// Helper class to wrap ant dowload task
+class MyDownload extends DefaultTask {
+    @Input
+    String sourceUrl
+
+    @OutputFile
+    File target
+
+    @TaskAction
+    void download() {
+       ant.get(src: sourceUrl, dest: target)
+    }
+}
diff --git a/jme3-android-native/src/native/android/com_jme3_audio_android_AndroidOpenALSoftAudioRenderer.h b/jme3-android-native/src/native/android/com_jme3_audio_android_AndroidOpenALSoftAudioRenderer.h
deleted file mode 100644
index 508b79a00..000000000
--- a/jme3-android-native/src/native/android/com_jme3_audio_android_AndroidOpenALSoftAudioRenderer.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_jme3_audio_android_AndroidOpenALSoftAudioRenderer */
-
-#ifndef _Included_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
-#define _Included_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: logger */
-#undef com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_BUFFER_SIZE
-#define com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_BUFFER_SIZE 35280L
-#undef com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_STREAMING_BUFFER_COUNT
-#define com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_STREAMING_BUFFER_COUNT 5L
-#undef com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_MAX_NUM_CHANNELS
-#define com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_MAX_NUM_CHANNELS 64L
-#undef com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_UPDATE_RATE
-#define com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_UPDATE_RATE 0.05f
-/* Inaccessible static: _00024assertionsDisabled */
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alIsCreated
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alIsCreated
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alCreate
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alCreate
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alDestroy
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alDestroy
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alcGetString
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alcGetString
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alGetString
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alGetString
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alGenSources
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alGenSources
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alGetError
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alGetError
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alDeleteSources
- * Signature: (ILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alDeleteSources
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alGenBuffers
- * Signature: (ILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alGenBuffers
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alDeleteBuffers
- * Signature: (ILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alDeleteBuffers
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alSourceStop
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alSourceStop
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alSourcei
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alSourcei
-  (JNIEnv *, jclass, jint, jint, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alBufferData
- * Signature: (IILjava/nio/ByteBuffer;II)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alBufferData
-  (JNIEnv *, jclass, jint, jint, jobject, jint, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alSourcePlay
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alSourcePlay
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alSourcePause
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alSourcePause
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alSourcef
- * Signature: (IIF)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alSourcef
-  (JNIEnv *, jclass, jint, jint, jfloat);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alSource3f
- * Signature: (IIFFF)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alSource3f
-  (JNIEnv *, jclass, jint, jint, jfloat, jfloat, jfloat);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alGetSourcei
- * Signature: (II)I
- */
-JNIEXPORT jint JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alGetSourcei
-  (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alSourceUnqueueBuffers
- * Signature: (IILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alSourceUnqueueBuffers
-  (JNIEnv *, jclass, jint, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alSourceQueueBuffers
- * Signature: (IILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alSourceQueueBuffers
-  (JNIEnv *, jclass, jint, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alListener
- * Signature: (ILjava/nio/FloatBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alListener
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alListenerf
- * Signature: (IF)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alListenerf
-  (JNIEnv *, jclass, jint, jfloat);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alListener3f
- * Signature: (IFFF)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alListener3f
-  (JNIEnv *, jclass, jint, jfloat, jfloat, jfloat);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alcIsExtensionPresent
- * Signature: (Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alcIsExtensionPresent
-  (JNIEnv *, jclass, jstring);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alcGetInteger
- * Signature: (ILjava/nio/IntBuffer;I)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alcGetInteger
-  (JNIEnv *, jclass, jint, jobject, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alGenAuxiliaryEffectSlots
- * Signature: (ILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alGenAuxiliaryEffectSlots
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alGenEffects
- * Signature: (ILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alGenEffects
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alEffecti
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alEffecti
-  (JNIEnv *, jclass, jint, jint, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alAuxiliaryEffectSloti
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alAuxiliaryEffectSloti
-  (JNIEnv *, jclass, jint, jint, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alDeleteEffects
- * Signature: (ILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alDeleteEffects
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alDeleteAuxiliaryEffectSlots
- * Signature: (ILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alDeleteAuxiliaryEffectSlots
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alGenFilters
- * Signature: (ILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alGenFilters
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alFilteri
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alFilteri
-  (JNIEnv *, jclass, jint, jint, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alFilterf
- * Signature: (IIF)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alFilterf
-  (JNIEnv *, jclass, jint, jint, jfloat);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alSource3i
- * Signature: (IIIII)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alSource3i
-  (JNIEnv *, jclass, jint, jint, jint, jint, jint);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alDeleteFilters
- * Signature: (ILjava/nio/IntBuffer;)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alDeleteFilters
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer
- * Method:    alEffectf
- * Signature: (IIF)V
- */
-JNIEXPORT void JNICALL Java_com_jme3_audio_android_AndroidOpenALSoftAudioRenderer_alEffectf
-  (JNIEnv *, jclass, jint, jint, jfloat);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/jme3-android-native/src/native/android/Android.mk b/jme3-android-native/src/native/jme_openalsoft/Android.mk
similarity index 88%
rename from jme3-android-native/src/native/android/Android.mk
rename to jme3-android-native/src/native/jme_openalsoft/Android.mk
index 936bf3d49..428008320 100644
--- a/jme3-android-native/src/native/android/Android.mk
+++ b/jme3-android-native/src/native/jme_openalsoft/Android.mk
@@ -29,11 +29,9 @@ LOCAL_SRC_FILES  := OpenAL32/alAuxEffectSlot.c \
                     OpenAL32/alThunk.c         \
                     Alc/ALc.c                  \
                     Alc/ALu.c                  \
-                    Alc/alcChorus.c            \
                     Alc/alcConfig.c            \
                     Alc/alcDedicated.c         \
                     Alc/alcEcho.c              \
-                    Alc/alcFlanger.c           \
                     Alc/alcModulator.c         \
                     Alc/alcReverb.c            \
                     Alc/alcRing.c              \
@@ -43,13 +41,18 @@ LOCAL_SRC_FILES  := OpenAL32/alAuxEffectSlot.c \
                     Alc/panning.c              \
                     Alc/hrtf.c                 \
                     Alc/mixer.c                \
-                    Alc/mixer_c.c              \
+                    Alc/mixer_c.c                \
                     Alc/backends/loopback.c    \
                     Alc/backends/null.c        \
                     Alc/backends/opensl.c      \
                     com_jme3_audio_android_AndroidOpenALSoftAudioRenderer.cpp
 #                    Alc/backends/alsa.c        \
 #                    Alc/backends/android.c     \
+#                    Alc/alcChorus.c            \
+#                    Alc/alcFlanger.c           \
+#                    Alc/mixer_c.c              \
+#                    Alc/backends/loopback.c    \
+#                    Alc/backends/null.c        \
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/jme3-android-native/src/native/android/Application.mk b/jme3-android-native/src/native/jme_openalsoft/Application.mk
similarity index 100%
rename from jme3-android-native/src/native/android/Application.mk
rename to jme3-android-native/src/native/jme_openalsoft/Application.mk
diff --git a/jme3-android-native/src/native/android/com_jme3_audio_android_AndroidOpenALSoftAudioRenderer.cpp b/jme3-android-native/src/native/jme_openalsoft/com_jme3_audio_android_AndroidOpenALSoftAudioRenderer.cpp
similarity index 100%
rename from jme3-android-native/src/native/android/com_jme3_audio_android_AndroidOpenALSoftAudioRenderer.cpp
rename to jme3-android-native/src/native/jme_openalsoft/com_jme3_audio_android_AndroidOpenALSoftAudioRenderer.cpp
diff --git a/jme3-android-native/src/native/android/config.h b/jme3-android-native/src/native/jme_openalsoft/config.h
similarity index 100%
rename from jme3-android-native/src/native/android/config.h
rename to jme3-android-native/src/native/jme_openalsoft/config.h