GAV and package refactor