Move cases into separate file.
Merge branch 'refactorParser' into alpha