Items 3-6. Package refactor.