cleanup generator package
more package refactoring