package and GAV refactor