package refactor fix