Move class data to data.yml, add class types