Reorganisation of paths and reference file name