Moved GpsService Logic & added intent