fix groupId naming so they don't collide, organize them better