correction for new folder structure and addition of heatmap data