Moving files. PW5 changes