Refactor oneof generator
Merge pull request #25 from phadej/oneof-refactor

Refactor oneof generator