Reorganize Gemfile
Update some gems