re-organize parser
Merge pull request #1 from tca/master

re-organize parser