Re-organize a bit - constants in own file and parser->decoder