Package restructure
Update jni