Finished modularization of generators