Refactor as package