update Gemfile, rearrange config files