Organizing specs better.