Refactored gemspec, adjust to bundle gem