Moving heatmap stuff to dataset package, added domain and rest beans