Reorganise the folder structure