Renamed files, seperated validator