ore reorganization
ore post-reorganization include and project changes