Reorganize Gemfile to make groups correctly included required gems