fixed some issues with data file organization