Move lang to locale (and clean helper)