Refactor package