Reorganizing specs