Use structure generator and add back the gl_generator dependency
Merge pull request #5 from csherratt/master

Use structure generator and add back the gl_generator dependency