fixed FileNames to return expect char, and correct file locations
Added back moved and renamed files