clean up and reorganize 'Gemfile'