re-org and annotation