more xsoftip restructinng