Project refactoring: 2 packages division for common code and android
helper code