Socket re-organisation