Refactor Google Maps and API services