- regexp parser goes into a separate file
- xml parser goes into a separate file
- improved tokenizer