re-arranged gemfile