Reorganisation of folder structure