Move Mexico to North-America; version 2

Mexico belongs to North-America but of course not to the US.