Forgot I removed Flatten_folders

and a few subtitle references