Merge "Move validators out to their own package"