Global package refactoring