Move generator to separate section