Use structure generator and add back the gl_generator dependency