reorganized gemfile slightly