move generators to extras