Package refactoring changes