re-org hierarchy