CSV errors fixed + sources splitted