begin reorg
removed from tree
convert old class based parser to functional version
more reorg