Initial work on making CsvDataSource modular.