Move most validators into validator module.