rearranged classes.py and psl parser