adding more xml files for generation
breaking things out into proper classes