Merging m_event_controller and rename the Geolocation
merge
merge