Added icmphiccup; Rejigged structures again