mv mapsanddata/ -> maps-and-data/
rename maps-and-data template to be consistent