Reworked to better structure validation modules.