Spec code reorganizing