revert back to movie_folder. CP not yet updated.