- Transfer Location Api specific code to a separate class(es) - Do not depend on _Googles Play Location Service_ - Check for _GMS_ (_Google Play Services_), else use _AOSP Location Service_ - Optional: User setting: _Google Play Location Service_ or _Android Location Service_ - Optional: Build type/flavor without _GMS_ dependencies (for F-Droid)