minor changes - data files located in data dir