merging mismerged folders

the folder move screwed up some references...