Groups controller added and few changes around model