Make some specs more hierarchical