Renamed folders. Changes to Heatmap generation.
Plus some more changes ..