More .spec reorgs