reogranized some parser stuff
reorganized some items
type stub