reorganize specs a wee bit