Add encoding and some nodes, split out global jaxb stuff into separate file.