Restructure Gemfile.
Some more cleanup.