cleanup to vf_win and add xyz files to sample