Rolling back sphdata to live inside Sph.h; removed separated particle types