Folk music or dance comes from a music genre that includes traditional folk music and the contemporary genre that evolved from the former during the 20th-century folk revival.