some refactoring - to squash
Removed gen folder.