Reorganise files and folders