Refactor gem to have correct file structure instead of generated file structure