Project structure and Google Play Services update