updated for changed xdi2 structure and package names