Made parser models easier to work with.
Put parser in a separate package.