Reorganized gemfile