After my commit this evening it is important to remove the old .pyc/.pyo files of the moved files.

So run

 make clean
 make

and all should be fine

Benny