SPH restructuring