Some package refactoring