Refactoring out extra packages