refactored gem structure and updated gemspec file