Splitted code in more files
Initial work for validators support