merge parsetree.py into maketree.py