Minor fixes to prj structure + updates in JAXB annotations