Tidy up Parser

[russcam]

The logic inside Parser is a bit of a mess - it works for the most part but could do with some refactoring

• [x] Unify top level process loop with block process loop
• [x] Split out Parser into Sub Parsers / Block specific parsers
• [ ] Move away from parsing with Regular Expressions