First pass at refactoring GAVs, packages etc