refactored XDM packages