Fixes to make directory names correct and make clean remove all intermediate files
Starting work on trace heatmaps