restructuring for xsoftip publication