Refactor package of organization