Change order of generate script calls