Minor refactoring - moved case classes out of XML-reader objects for
easier importing.