restructured gemfile