re-org struct