Correcting the file structure for validators