Improved detection of data_files dir