Move JAXB adapters to a better package