Reorganised block structures in spec.