Gemspec and organization fixes