Renaming files and adjusting gem specifications
Cleaning up gemspec