Make some specs more hierarchical

I would like to make these specs more hierarchical. Opinions ?