Add changes to organization model and group model
Fixing merge for incorrect path