Major refactor for python 3 and pyGI support
Remove old refactor
Fix typo