Minor package refactoring