Misc. updates to generated module structure