refactor package names
setup