Refactored the DataSource to accomodate more than csv files. Also made some cleaning