Refactor gemspec and simplify lib folder