Refactor cli_spec with more structure.

Adding describe blocks and moving stuff around.
Merge pull request #487 from jonas054/cli_spec_structure

Refactor cli_spec with more structure.