Additional package refactoring