Move parsing functions into classes; rename classes to match xml tags