removed some references to deprecated constructor
refactorings of generator package