WCAC-5 Android: change package name
- some refactoring