redefined code structure with GoogleMap API bundle