structure re-org again