Refactored all files, updated the gemspec to a new verision