Supporting ruby 2.1
Reorganised specs
Removing unused code