Even more package refactoring