Second pass at refactoring GAVs, packages etc