Adding and reorganizing specs.