consolidate grouping in gemfile