Package refactors