more package refactor changes