Reorganise the changelog