Update to new generator-structure