updated naming conventions and added heatmapjs