WCAC-30 Android: refactoring all project