moved jaxb generated code
moved jaxb generated code
improved exception handling
removed todo comment