Package refactored