new organization for analysis and generation