Update countries and opt-countries; move mexico

Move Mexico from central america to north america