Changed organization to group
Changed organization references to group in other classes