large refactoring to have diverging differential and baseline atlas but still allow some class templating
contrasts xml reformatted