fixes namespace issue
move Generators up in the module heirarchy