Refactoring: wrap packages