reorganized and cleaned up the python files