Package refacto