re-org and structure