fix filenames, remove unneeded setup.R
fix cv code