Rename main generator class
Some refactorings