add city and country, removed location_id from Classrooms