Moved functions in reconstructmergetool.py to their respective classes, cleaned up code, etc