Refactor XML generation into class
Rename classes to be nouns.