refactor packages
refactor packages and references