applied change of location to all files,
note, change code to centralize this alterartion, making testing quicker