Global refactoring, all the motor is in PyTexSong