Changed organization references to group in other classes