Reorganized gemspec