Refactor / Added APK file
Fix DBTools.java