updated and reorganized cv
renamed files
fixed conflicts