Moved aggregate methods into the main repository
Changed Group to GroupBy