figures re-org