Move the source sets to match the productFlavors in build.gradle
add location updates for creating geofences