Added Classes and Controller for Groups