Package refactor