Restructure spec by types
Merge pull request #2 from yvoyer/refactor/structure

Restructure spec by types