Second time I'm closeting these
Misc changes, move some stuff
Experimental Cython-written video module