Python3 and reorganisation project to clean up mess.