refactoring some stuff in the movie mover … untested :P