massive changes round 2
confirm file name changes