Adjusting spec structure for clarity

As I prepare for a demo, I want the feature specs to be very well
defined.