They were previously breaking the two-class-per-file rule.
Not sure why these aren't being detected on master right now - they should be...
Discern between the other class of the same name
Adds xmldoc in places too.