changes to datadir and datafile nomanclature