Gemfile reorganization and cleanup