Fix LocationClient for MapFragment and reorganize a little.