Refactor packages to reflect group name