rename package, remove and re-add android
indent