Reorganize spec structure
Make command parsing whitespace agnostic