Update artifact group name correctly this time.  Also update all imports to use the new package name.