better handling of data files for distribution