Renamed/refactored, pushed to RubyGems