Reorganize specs a bit