add server groups, improved validation on AOs, change manifest structure,