Second step of package refactoring.