change file locations and general renaming