Refactoring OrgChart