More Castor to JAXB migrations

Only 61 files left.