Refactor: packaging