Refactoring to JAX-WS/JAXB Web service