PayloadParser refactor

Need to refactor a few more tests. Otherwise, this is done.
Also we might want for multiple headers sections. But lets leave it for a future...