Further package refactoring