package update and refactoring