Make the parser more manageable.

[Roflincopter]

Although the parser is in working order, it is a 160 line beast and should be split up in multiple parts if possible. The high recursive nature of the query language might not allow it but maybe it is worth looking in to.