Generator re-structure